fix: BracesPositionFixer - do not create two consecutive whitespace tokens (#8496)

kubawerlos · web-flow · commit fe85a5d9b0b1 · 2025-03-21T14:27:46.000Z
diff --git a/src/Fixer/Basic/BracesPositionFixer.php b/src/Fixer/Basic/BracesPositionFixer.php
@@ -362,13 +362,21 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                     }
                 }
 
-                for (; $openBraceIndex !== $moveBraceToIndex; $openBraceIndex += $delta) {
+                for ($i = $openBraceIndex; $i !== $moveBraceToIndex; $i += $delta) {
                     /** @var Token $siblingToken */
-                    $siblingToken = $tokens[$openBraceIndex + $delta];
-                    $tokens[$openBraceIndex] = $siblingToken;
+                    $siblingToken = $tokens[$i + $delta];
+                    $tokens[$i] = $siblingToken;
                 }
 
-                $tokens[$openBraceIndex] = $movedToken;
+                $tokens[$i] = $movedToken;
+
+                if ($tokens[$openBraceIndex]->isWhitespace() && $tokens[$openBraceIndex + 1]->isWhitespace()) {
+                    $tokens[$openBraceIndex] = new Token([
+                        T_WHITESPACE,
+                        $tokens[$openBraceIndex]->getContent().$tokens[$openBraceIndex + 1]->getContent(),
+                    ]);
+                    $tokens->clearAt($openBraceIndex + 1);
+                }
 
                 $openBraceIndex = $moveBraceToIndex;
             }
diff --git a/tests/Fixer/Basic/BracesPositionFixerTest.php b/tests/Fixer/Basic/BracesPositionFixerTest.php
@@ -741,6 +741,24 @@ public function example(){ // example
 }
 ',
         ];
+
+        yield [
+            <<<'PHP'
+                <?php
+                if ($x) {//
+
+                    f();
+                }
+                PHP,
+            <<<'PHP'
+                <?php
+                if ($x)//
+                {
+
+                    f();
+                }
+                PHP,
+        ];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -362,13 +362,21 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`- for (; $openBraceIndex !== $moveBraceToIndex; $openBraceIndex += $delta) {`
	`365`	`+ for ($i = $openBraceIndex; $i !== $moveBraceToIndex; $i += $delta) {`
`366`	`366`	`/** @var Token $siblingToken */`
`367`		`- $siblingToken = $tokens[$openBraceIndex + $delta];`
`368`		`- $tokens[$openBraceIndex] = $siblingToken;`
	`367`	`+ $siblingToken = $tokens[$i + $delta];`
	`368`	`+ $tokens[$i] = $siblingToken;`
`369`	`369`	`}`
`370`	`370`
`371`		`- $tokens[$openBraceIndex] = $movedToken;`
	`371`	`+ $tokens[$i] = $movedToken;`
	`372`	`+`
	`373`	`+ if ($tokens[$openBraceIndex]->isWhitespace() && $tokens[$openBraceIndex + 1]->isWhitespace()) {`
	`374`	`+ $tokens[$openBraceIndex] = new Token([`
	`375`	`+ T_WHITESPACE,`
	`376`	`+ $tokens[$openBraceIndex]->getContent().$tokens[$openBraceIndex + 1]->getContent(),`
	`377`	`+ ]);`
	`378`	`+ $tokens->clearAt($openBraceIndex + 1);`
	`379`	`+ }`
`372`	`380`
`373`	`381`	`$openBraceIndex = $moveBraceToIndex;`
`374`	`382`	`}`