Enable all options on trailing_comma_in_multiline

composer.json

@@ -7,7 +7,7 @@
     "homepage": "https://github.com/realodix/relax",
     "require": {
         "php": "^7.4 || ^8.0",
-        "friendsofphp/php-cs-fixer": "^3.61",
+        "friendsofphp/php-cs-fixer": "^3.63",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.21",
         "symfony/console": "^5.4.41 || ^6.0 || ^7.0"
     },

src/RuleSet/Sets/Relax.php

@@ -84,8 +84,7 @@ public function mainRules(): array
             'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
             'single_import_per_statement' => ['group_to_single_imports' => false],
             'space_after_semicolon' => ['remove_in_empty_for_expressions' => true],
-            // TODO: Add 'match' & 'parameters' when PHP 8.0+ is required
-            'trailing_comma_in_multiline' => ['elements' => ['arrays', 'arguments']],
+            'trailing_comma_in_multiline' => ['elements' => ['arguments', 'array_destructuring', 'arrays', 'match', 'parameters']],
             'unary_operator_spaces' => ['only_dec_inc' => true],
             'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
             'phpdoc_align' => [

tests/Fixtures/Ruleset/realodixspec_expected.php

@@ -53,7 +53,7 @@ class RealodixSpec
     public function __construct(
         public int $a,
         public ?int $b = 3600, // 1 hour...
-        public string $c = 'Hello World!'
+        public string $c = 'Hello World!',
     ) {}
 
     /**

tests/Fixtures/Ruleset/relax-commonbox_expected.php

@@ -227,7 +227,7 @@ public function getBar()
 class SingleLineEmptyBody
 {
     public function __construct(
-        int $ruleSet
+        int $ruleSet,
     ) {}
 
     public function basic__single_line_empty_body() {}

tests/Fixtures/Ruleset/relax_actual.php

@@ -793,6 +793,13 @@ public function control_structure__trailing_comma_in_multiline()
             2
         ];
 
+        // array_destructuring
+        $a = [11, 2, 3];
+        [
+            $c,
+            $d
+        ] = $a;
+
         // arguments
         foo(
             1,

tests/Fixtures/Ruleset/relax_expected.php

@@ -766,6 +766,13 @@ public function control_structure__trailing_comma_in_multiline()
             2,
         ];
 
+        // array_destructuring
+        $a = [11, 2, 3];
+        [
+            $c,
+            $d,
+        ] = $a;
+
         // arguments
         foo(
             1,
@@ -775,13 +782,13 @@ public function control_structure__trailing_comma_in_multiline()
         // parameters
         function foo_trailing_comma_in_multiline(
             $x,
-            $y
+            $y,
         ) {}
 
         // match
         match (true) {
             1 => '1',
-            2 => '2'
+            2 => '2',
         };
 
         // after_heredoc in array
@@ -821,7 +828,7 @@ function om_ensure_fully_multiline($a = 10,
         function om_ensure_single_line(
             $a = 10,
             $b = 20,
-            $c = 30
+            $c = 30,
         ) {}
         sample(
             1,