bug: Fix indentation for comment at end of function followed by a com…

…ma (#6542)
PHP-CS-Fixer · Jan 29, 2023 · 2ed718a · 2ed718a
1 parent fa9cc9b
commit 2ed718a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -524,7 +524,7 @@ private function isCommentForControlSructureContinuation(Tokens $tokens, int $in
 
         $index = $tokens->getNextMeaningfulToken($index);
 
-        return null !== $index && $tokens[$index]->equalsAny([[T_ELSE], [T_ELSEIF], ',']);
+        return null !== $index && $tokens[$index]->isGivenKind([T_ELSE, T_ELSEIF]);
     }
 
     /**

diff --git a/tests/Fixer/Basic/BracesFixerTest.php b/tests/Fixer/Basic/BracesFixerTest.php
@@ -3035,14 +3035,7 @@ public static function provideFixCommentBeforeBraceCases(): iterable
     } else {
         echo "unknown API";
         // sth
-    }
-
-    return $this->guess($class, $property, function (Constraint $constraint) use ($guesser) {
-        return $guesser->guessRequiredForConstraint($constraint);
-    // Fallback to false...
-    // ... due to sth...
-    }, false);
-    ',
+    }',
             ],
             [
                 '<?php

diff --git a/tests/Fixer/Whitespace/StatementIndentationFixerTest.php b/tests/Fixer/Whitespace/StatementIndentationFixerTest.php
@@ -776,6 +776,14 @@ public function foo() {
     default:
 }',
         ];
+
+        yield 'function ending with a comment and followed by a comma' => [
+            '<?php
+foo(function () {
+    bar();
+    // comment
+}, );',
+        ];
     }
 
     /**