Merge pull request #1103 from ergebnis/feature/trailing-comma-in-mult…

…iline Enhancement: Configure `trailing_comma_in_multiline` fixer to include `array_destructuring` in `elements` option
ergebnis · Sep 2, 2024 · dae1a07 · dae1a07
2 parents a1e033f + 23ed5f2
commit dae1a07
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ For a full diff see [`6.35.0...main`][6.35.0...main].
 
 - Updated `kubawerlos/php-cs-fixer-custom-fixers` ([#1095]), by [@dependabot]
 - Updated `friendsofphp/php-cs-fixer` ([#1102]), by [@dependabot]
+- Configured `trailing_comma_in_multiline` fixer to include `array_destructuring` in the `elements` option ([#1103]), by [@localheinz]
+
 
 ## [`6.35.0`][6.35.0]
 
@@ -1742,6 +1744,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#1093]: https://github.com/ergebnis/php-cs-fixer-config/pull/1093
 [#1095]: https://github.com/ergebnis/php-cs-fixer-config/pull/1095
 [#1102]: https://github.com/ergebnis/php-cs-fixer-config/pull/1102
+[#1103]: https://github.com/ergebnis/php-cs-fixer-config/pull/1103
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php
@@ -844,6 +844,7 @@ public static function create(): RuleSet
                 'trailing_comma_in_multiline' => [
                     'after_heredoc' => false,
                     'elements' => [
+                        'array_destructuring',
                         'arrays',
                     ],
                 ],

diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php
@@ -844,6 +844,7 @@ public static function create(): RuleSet
                 'trailing_comma_in_multiline' => [
                     'after_heredoc' => false,
                     'elements' => [
+                        'array_destructuring',
                         'arrays',
                     ],
                 ],

diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -845,6 +845,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                     ],
                 ],

diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -848,6 +848,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                     ],
                 ],

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -865,6 +865,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                         'match',
                         'parameters',

diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -868,6 +868,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                         'match',
                         'parameters',

diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php
@@ -868,6 +868,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                         'match',
                         'parameters',

diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php
@@ -868,6 +868,7 @@ public static function create(): RuleSet
                     'after_heredoc' => false,
                     'elements' => [
                         'arguments',
+                        'array_destructuring',
                         'arrays',
                         'match',
                         'parameters',

diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php
@@ -867,6 +867,7 @@ protected function expectedRules(): Rules
             'trailing_comma_in_multiline' => [
                 'after_heredoc' => false,
                 'elements' => [
+                    'array_destructuring',
                     'arrays',
                 ],
             ],

diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php
@@ -867,6 +867,7 @@ protected function expectedRules(): Rules
             'trailing_comma_in_multiline' => [
                 'after_heredoc' => false,
                 'elements' => [
+                    'array_destructuring',
                     'arrays',
                 ],
             ],

diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php
@@ -868,6 +868,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                 ],
             ],

diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -871,6 +871,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                 ],
             ],

diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -888,6 +888,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                     'match',
                     'parameters',

diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php
@@ -891,6 +891,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                     'match',
                     'parameters',

diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php
@@ -891,6 +891,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                     'match',
                     'parameters',

diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php
@@ -891,6 +891,7 @@ protected function expectedRules(): Rules
                 'after_heredoc' => false,
                 'elements' => [
                     'arguments',
+                    'array_destructuring',
                     'arrays',
                     'match',
                     'parameters',