BracesFixer - fix invalid code generation on alternative syntax

Author: SpacePossum

src/Fixer/Basic/BracesFixer.php

@@ -613,7 +613,8 @@ private function fixMissingControlBraces(Tokens $tokens)
             }
 
             $parenthesisEndIndex = $this->findParenthesisEnd($tokens, $index);
-            $tokenAfterParenthesis = $tokens[$tokens->getNextMeaningfulToken($parenthesisEndIndex)];
+            $nextAfterParenthesisEndIndex = $tokens->getNextMeaningfulToken($parenthesisEndIndex);
+            $tokenAfterParenthesis = $tokens[$nextAfterParenthesisEndIndex];
 
             // if Token after parenthesis is { then we do not need to insert brace, but to fix whitespace before it
             if ($tokenAfterParenthesis->equals('{') && self::LINE_SAME === $this->configuration['position_after_control_structures']) {
@@ -629,6 +630,19 @@ private function fixMissingControlBraces(Tokens $tokens)
                 continue;
             }
 
+            // do not add for short 'if' followed by alternative loop,
+            // for example: if ($a) while ($b): ? > X < ?php endwhile; ? >
+            if ($tokenAfterParenthesis->isGivenKind([T_FOR, T_FOREACH, T_SWITCH, T_WHILE])) {
+                $tokenAfterParenthesisBlockEnd = $tokens->findBlockEnd( // go to ')'
+                    Tokens::BLOCK_TYPE_PARENTHESIS_BRACE,
+                    $tokens->getNextMeaningfulToken($nextAfterParenthesisEndIndex)
+                );
+
+                if ($tokens[$tokens->getNextMeaningfulToken($tokenAfterParenthesisBlockEnd)]->equals(':')) {
+                    continue;
+                }
+            }
+
             $statementEndIndex = $this->findStatementEnd($tokens, $parenthesisEndIndex);
 
             // insert closing brace

tests/Fixer/Basic/BracesFixerTest.php

@@ -5263,4 +5263,83 @@ function example()
 }'
         );
     }
+
+    /**
+     * @param string      $expected
+     * @param null|string $input
+     *
+     * @dataProvider provideFixAlternativeSyntaxCases
+     */
+    public function testFixAlternativeSyntax($expected, $input = null)
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFixAlternativeSyntaxCases()
+    {
+        yield [
+            '<?php if (foo()) {
+    while (bar()) {
+    }
+}',
+            '<?php if (foo()) while (bar()) {}',
+        ];
+
+        yield [
+            '<?php if ($a) {
+    foreach ($b as $c) {
+    }
+}',
+            '<?php if ($a) foreach ($b as $c) {}',
+        ];
+
+        yield [
+            '<?php if ($a) foreach ($b as $c): ?> X <?php endforeach; ?>',
+        ];
+
+        yield [
+            '<?php if ($a) while ($b): ?> X <?php endwhile; ?>',
+        ];
+
+        yield [
+            '<?php if ($a) for (;;): ?> X <?php endfor; ?>',
+        ];
+
+        yield [
+            '<?php if ($a) switch ($a): case 1: ?> X <?php endswitch; ?>',
+        ];
+
+        yield [
+            '<?php if ($a): elseif ($b): for (;;): ?> X <?php endfor; endif; ?>',
+        ];
+
+        yield [
+            '<?php switch ($a): case 1: for (;;): ?> X <?php endfor; endswitch; ?>,',
+        ];
+
+        yield [
+            '<?php
+if ($a) foreach ($b as $c): ?>
+    <?php if ($a) for (;;): ?>
+        <?php if ($a) foreach ($b as $c): ?>
+            <?php if ($a) for (;;): ?>
+                <?php if ($a) while ($b): ?>
+                    <?php if ($a) while ($b): ?>
+                        <?php if ($a) foreach ($b as $c): ?>
+                            <?php if ($a) for (;;): ?>
+                                <?php if ($a) while ($b): ?>
+                                    <?php if ($a) while ($b): ?>
+
+                                    <?php endwhile; ?>
+                                <?php endwhile; ?>
+                            <?php endfor; ?>
+                        <?php endforeach; ?>
+                    <?php endwhile; ?>
+                <?php endwhile; ?>
+            <?php endfor; ?>
+        <?php endforeach; ?>
+    <?php endfor; ?>
+<?php endforeach; ?>',
+        ];
+    }
 }