Fix: Configure no_trailing_comma_in_singleline instead of deprecated …

…no_trailing_comma_in_list_call, no_trailing_comma_in_singleline_array, and no_trailing_comma_in_singleline_function_call fixers
ergebnis · Sep 2, 2022 · 4bde5b4 · 4bde5b4
1 parent efa0035
commit 4bde5b4
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 18 deletions.
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,

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,

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,

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,

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,

diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php
@@ -351,9 +351,13 @@ final class Php81Test 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,