fix(SingleLineThrowFixer): fixer goes out of range on close tag (#7369)

PHP-CS-Fixer · Oct 11, 2023 · 0607649 · 0607649
1 parent d03e57e
commit 0607649
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Fixer/FunctionNotation/SingleLineThrowFixer.php b/src/Fixer/FunctionNotation/SingleLineThrowFixer.php
@@ -65,7 +65,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
 
             $endCandidateIndex = $tokens->getNextMeaningfulToken($index);
 
-            while (!$tokens[$endCandidateIndex]->equalsAny([')', ']', ',', ';'])) {
+            while (!$tokens[$endCandidateIndex]->equalsAny([')', ']', ',', ';', [T_CLOSE_TAG]])) {
                 $blockType = Tokens::detectBlockType($tokens[$endCandidateIndex]);
 
                 if (null !== $blockType) {

diff --git a/tests/Fixer/FunctionNotation/SingleLineThrowFixerTest.php b/tests/Fixer/FunctionNotation/SingleLineThrowFixerTest.php
@@ -289,6 +289,14 @@ function
             }
         ;',
         ];
+
+        yield [
+            '<?php throw new Exception("Foo.", 0)?>',
+            '<?php throw new Exception(
+                "Foo.",
+                0
+            )?>',
+        ];
     }
 
     /**