Merge pull request #651 from ergebnis/dependabot/composer/friendsofph…

…p/php-cs-fixer-3.11.0 composer(deps): bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0
ergebnis · Sep 2, 2022 · a2c225e · a2c225e
2 parents 63fad6c + f10f0cb
commit a2c225e
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`4.7.0...main`][4.7.0...main].
+For a full diff see [`4.8.0...main`][4.8.0...main].
+
+## [`4.8.0`][4.8.0]
+
+For a full diff see [`4.7.0...4.8.0`][4.7.0...4.8.0].
+
+### Changed
+
+- Updated `friendsofphp/php-cs-fixer` ([#651]), by [@dependabot]
 
 ## [`4.7.0`][4.7.0]
 
@@ -546,6 +554,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.5.3
 [4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.6.0
 [4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.7.0
+[4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.8.0
 
 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0
 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0
@@ -593,7 +602,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [4.5.2...4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.2...4.5.3
 [4.5.3...4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.3...4.6.0
 [4.6.0...4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.6.0...4.7.0
-[4.7.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...main
+[4.7.0...4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...4.8.0
+[4.8.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.0...main
 
 [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
@@ -732,6 +742,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#644]: https://github.com/ergebnis/php-cs-fixer-config/pull/644
 [#645]: https://github.com/ergebnis/php-cs-fixer-config/pull/645
 [#646]: https://github.com/ergebnis/php-cs-fixer-config/pull/646
+[#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   "require": {
     "php": "^7.4 || ^8.0",
     "ext-filter": "*",
-    "friendsofphp/php-cs-fixer": "~3.10.0"
+    "friendsofphp/php-cs-fixer": "~3.11.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.28.3",

diff --git a/composer.lock b/composer.lock
diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -344,9 +344,13 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
             'allow_unused_params' => false,
             'remove_inheritdoc' => false,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_trailing_comma_in_singleline_function_call' => true,
+        'no_trailing_comma_in_singleline' => [
+            'elements' => [
+                'arguments',
+                'array',
+                'array_destructuring',
+            ],
+        ],
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
@@ -575,7 +579,31 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
                 'str',
             ],
         ],
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => [
+            'groups' => [
+                [
+                    'deprecated',
+                    'link',
+                    'see',
+                    'since',
+                ],
+                [
+                    'author',
+                    'copyright',
+                    'license',
+                ],
+                [
+                    'category',
+                    'package',
+                    'subpackage',
+                ],
+                [
+                    'property',
+                    'property-read',
+                    'property-write',
+                ],
+            ],
+        ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => [

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -345,9 +345,13 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
             'allow_unused_params' => false,
             'remove_inheritdoc' => false,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_trailing_comma_in_singleline_function_call' => true,
+        'no_trailing_comma_in_singleline' => [
+            'elements' => [
+                'arguments',
+                'array',
+                'array_destructuring',
+            ],
+        ],
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
@@ -576,7 +580,31 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
                 'str',
             ],
         ],
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => [
+            'groups' => [
+                [
+                    'deprecated',
+                    'link',
+                    'see',
+                    'since',
+                ],
+                [
+                    'author',
+                    'copyright',
+                    'license',
+                ],
+                [
+                    'category',
+                    'package',
+                    'subpackage',
+                ],
+                [
+                    'property',
+                    'property-read',
+                    'property-write',
+                ],
+            ],
+        ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => [

diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -345,9 +345,13 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
             'allow_unused_params' => false,
             'remove_inheritdoc' => false,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_trailing_comma_in_singleline_function_call' => true,
+        'no_trailing_comma_in_singleline' => [
+            'elements' => [
+                'arguments',
+                'array',
+                'array_destructuring',
+            ],
+        ],
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
@@ -577,7 +581,31 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
                 'str',
             ],
         ],
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => [
+            'groups' => [
+                [
+                    'deprecated',
+                    'link',
+                    'see',
+                    'since',
+                ],
+                [
+                    'author',
+                    'copyright',
+                    'license',
+                ],
+                [
+                    'category',
+                    'package',
+                    'subpackage',
+                ],
+                [
+                    'property',
+                    'property-read',
+                    'property-write',
+                ],
+            ],
+        ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => [

diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -350,9 +350,13 @@ final class Php74Test extends ExplicitRuleSetTestCase
             'allow_unused_params' => false,
             'remove_inheritdoc' => false,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_trailing_comma_in_singleline_function_call' => true,
+        'no_trailing_comma_in_singleline' => [
+            'elements' => [
+                'arguments',
+                'array',
+                'array_destructuring',
+            ],
+        ],
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
@@ -581,7 +585,31 @@ final class Php74Test extends ExplicitRuleSetTestCase
                 'str',
             ],
         ],
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => [
+            'groups' => [
+                [
+                    'deprecated',
+                    'link',
+                    'see',
+                    'since',
+                ],
+                [
+                    'author',
+                    'copyright',
+                    'license',
+                ],
+                [
+                    'category',
+                    'package',
+                    'subpackage',
+                ],
+                [
+                    'property',
+                    'property-read',
+                    'property-write',
+                ],
+            ],
+        ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => [

diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -351,9 +351,13 @@ final class Php80Test extends ExplicitRuleSetTestCase
             'allow_unused_params' => false,
             'remove_inheritdoc' => false,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_trailing_comma_in_singleline_function_call' => true,
+        'no_trailing_comma_in_singleline' => [
+            'elements' => [
+                'arguments',
+                'array',
+                'array_destructuring',
+            ],
+        ],
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
@@ -582,7 +586,31 @@ final class Php80Test extends ExplicitRuleSetTestCase
                 'str',
             ],
         ],
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => [
+            'groups' => [
+                [
+                    'deprecated',
+                    'link',
+                    'see',
+                    'since',
+                ],
+                [
+                    'author',
+                    'copyright',
+                    'license',
+                ],
+                [
+                    'category',
+                    'package',
+                    'subpackage',
+                ],
+                [
+                    'property',
+                    'property-read',
+                    'property-write',
+                ],
+            ],
+        ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => [