GroupImportFixer - fix breaking code when fixing root classes

PHP-CS-Fixer · Apr 6, 2021 · 486b598 · 486b598
1 parent 9bf2760
commit 486b598
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/Fixer/Import/GroupImportFixer.php b/src/Fixer/Import/GroupImportFixer.php
@@ -188,7 +188,12 @@ private function addGroupUseStatements(array $statements, Tokens $tokens)
      */
     private function getNamespaceNameWithSlash(NamespaceUseAnalysis $useDeclaration)
     {
-        return substr($useDeclaration->getFullName(), 0, strripos($useDeclaration->getFullName(), '\\') + 1);
+        $position = strrpos($useDeclaration->getFullName(), '\\');
+        if (false === $position || 0 === $position) {
+            return $useDeclaration->getFullName();
+        }
+
+        return substr($useDeclaration->getFullName(), 0, $position + 1);
     }
 
     /**

diff --git a/tests/Fixer/Import/GroupImportFixerTest.php b/tests/Fixer/Import/GroupImportFixerTest.php
@@ -217,6 +217,36 @@ public function provideFixCases()
 ',
                 '<?php
 use Foo\Bar;use Foo\Baz;\DontTouch::me();
+',
+            ],
+            [
+                '<?php
+
+use Foo\{Bar, Baz};
+use ReflectionClass;
+use ReflectionMethod;
+',
+                '<?php
+
+use Foo\Bar;
+use Foo\Baz;
+use ReflectionClass;
+use ReflectionMethod;
+',
+            ],
+            [
+                '<?php
+
+use Foo\{Bar, Baz};
+use \ReflectionClass;
+use \ReflectionMethod;
+',
+                '<?php
+
+use Foo\Bar;
+use Foo\Baz;
+use \ReflectionClass;
+use \ReflectionMethod;
 ',
             ],
         ];