bug: Fix indentation after control structure in switch (#6473)

Fix indentation after control structure in switch
PHP-CS-Fixer · Jul 11, 2022 · 3b5d696 · 3b5d696
1 parent f0c46ff
commit 3b5d696
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -434,6 +434,12 @@ private function findCaseBlockEnd(Tokens $tokens, int $index): int
                 continue;
             }
 
+            if ($tokens[$index]->equals('{')) {
+                $index = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
+
+                continue;
+            }
+
             if ($tokens[$index]->equalsAny([[T_CASE], [T_DEFAULT]])) {
                 return $index;
             }

diff --git a/tests/Fixer/Whitespace/StatementIndentationFixerTest.php b/tests/Fixer/Whitespace/StatementIndentationFixerTest.php
@@ -622,6 +622,25 @@ public function foo(
     "foo" => $foo,
     "bar" => $bar,
 ]) {
+}',
+        ];
+
+        yield 'switch case with control structure' => [
+            '<?php
+switch ($foo) {
+    case true:
+        if ($bar) {
+            bar();
+        }
+        return true;
+}',
+            '<?php
+switch ($foo) {
+    case true:
+    if ($bar) {
+      bar();
+    }
+return true;
 }',
         ];
     }