fix: TrailingCommaInMultilineFixer - handle trailing comma in langu…

…age constructs (#7989)
PHP-CS-Fixer · May 7, 2024 · 4b71d6d · 4b71d6d
1 parent c3af946
commit 4b71d6d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php b/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php
@@ -153,8 +153,9 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             if (
                 $fixParameters
                 && (
-                    $tokens[$prevIndex]->isGivenKind(T_STRING) && $tokens[$prevPrevIndex]->isGivenKind(T_FUNCTION)
-                    || $tokens[$prevIndex]->isGivenKind([T_FN, T_FUNCTION])
+                    $tokens[$prevIndex]->isGivenKind(T_STRING)
+                    && $tokens[$prevPrevIndex]->isGivenKind(T_FUNCTION)
+                    || $tokens[$prevIndex]->isGivenKind([T_FN, T_FUNCTION, T_ISSET, T_UNSET, T_LIST])
                 )
             ) {
                 $this->fixBlock($tokens, $index);

diff --git a/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php b/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php
@@ -674,6 +674,38 @@ public static function provideFix80Cases(): iterable
             ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_PARAMETERS]],
         ];
 
+        yield 'function-like language constructs' => [
+            '<?php
+isset(
+    $a,
+    $b,
+);
+unset(
+    $a,
+    $b,
+);
+list(
+    $a,
+    $b,
+) = $foo;
+            ',
+            '<?php
+isset(
+    $a,
+    $b
+);
+unset(
+    $a,
+    $b
+);
+list(
+    $a,
+    $b
+) = $foo;
+            ',
+            ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_PARAMETERS]],
+        ];
+
         yield 'match' => [
             '<?php
 $m = match ($a) {