fix: OrderedImportsFixer - handle non-grouped list of const/function …

…imports (#7397)
PHP-CS-Fixer · Oct 30, 2023 · 10ef1b0 · 10ef1b0
1 parent 3291e9a
commit 10ef1b0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Fixer/Import/OrderedImportsFixer.php b/src/Fixer/Import/OrderedImportsFixer.php
@@ -569,8 +569,16 @@ private function setNewOrder(Tokens $tokens, array $usesOrder): void
                 $use['namespace']
             );
 
+            $numberOfInitialTokensToClear = 3; // clear `<?php use `
+            if (self::IMPORT_TYPE_CLASS !== $use['importType']) {
+                $prevIndex = $tokens->getPrevMeaningfulToken($index);
+                if ($tokens[$prevIndex]->equals(',')) {
+                    $numberOfInitialTokensToClear = 5; // clear `<?php use const ` or `<?php use function `
+                }
+            }
+
             $declarationTokens = Tokens::fromCode($code);
-            $declarationTokens->clearRange(0, 2); // clear `<?php use `
+            $declarationTokens->clearRange(0, $numberOfInitialTokensToClear - 1);
             $declarationTokens->clearAt(\count($declarationTokens) - 1); // clear `;`
             $declarationTokens->clearEmptyTokens();
 

diff --git a/tests/Fixer/Import/OrderedImportsFixerTest.php b/tests/Fixer/Import/OrderedImportsFixerTest.php
@@ -1137,6 +1137,16 @@ public function doSomething($foo)
                 'imports_order' => [OrderedImportsFixer::IMPORT_TYPE_CLASS, OrderedImportsFixer::IMPORT_TYPE_CONST, OrderedImportsFixer::IMPORT_TYPE_FUNCTION],
             ],
         ];
+
+        yield [
+            '<?php use const CONST_A, CONST_B, CONST_C;',
+            '<?php use const CONST_C, CONST_B, CONST_A;',
+        ];
+
+        yield [
+            '<?php use function Foo\A, Foo\B, Foo\C;',
+            '<?php use function Foo\B, Foo\C, Foo\A;',
+        ];
     }
 
     public function testUnknownOrderTypes(): void