fix: NoUnneededBracesFixer - improve handling of global namespace (PH…

…P-CS-Fixer#7639) Co-authored-by: Greg Korba <[email protected]>
maxhelias · Dec 30, 2023 · 858cd04 · 858cd04
1 parent 99ea823
commit 858cd04
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Fixer/ControlStructure/NoUnneededBracesFixer.php b/src/Fixer/ControlStructure/NoUnneededBracesFixer.php
@@ -134,9 +134,17 @@ private function clearIfIsOverCompleteNamespaceBlock(Tokens $tokens): void
 
         $index = $tokens->getNextTokenOfKind(0, [[T_NAMESPACE]]);
 
-        do {
+        $namespaceIsNamed = false;
+
+        $index = $tokens->getNextMeaningfulToken($index);
+        while ($tokens[$index]->isGivenKind([T_STRING, T_NS_SEPARATOR])) {
             $index = $tokens->getNextMeaningfulToken($index);
-        } while ($tokens[$index]->isGivenKind([T_STRING, T_NS_SEPARATOR]));
+            $namespaceIsNamed = true;
+        }
+
+        if (!$namespaceIsNamed) {
+            return;
+        }
 
         if (!$tokens[$index]->equals('{')) {
             return; // `;`

diff --git a/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php b/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php
@@ -182,6 +182,27 @@ function Bar(){}
             } ?>",
             ['namespaces' => true],
         ];
+
+        yield [
+            '<?php
+            namespace A;
+                class X {}
+            ',
+            '<?php
+            namespace A {
+                class X {}
+            }',
+            ['namespaces' => true],
+        ];
+
+        yield [
+            '<?php
+            namespace {
+                class X {}
+            }',
+            null,
+            ['namespaces' => true],
+        ];
     }
 
     /**