add enum support

PHP-CS-Fixer · Jan 9, 2024 · 7d84776 · 7d84776
1 parent 4b8cfdf
commit 7d84776
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php b/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php
@@ -270,9 +270,15 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             foreach (true === $this->configuration['import_symbols'] ? [true, false] : [false] as $discoverSymbolsPhase) {
                 $this->discoveredSymbols = $discoverSymbolsPhase ? [] : null;
 
+                $classyKinds = [T_CLASS, T_INTERFACE, T_TRAIT];
+                if (\defined('T_ENUM')) { // @TODO: drop condition when PHP 8.1+ is required
+                    $classyKinds[] = T_ENUM;
+                }
+
                 for ($index = $namespace->getScopeStartIndex(); $index < $namespace->getScopeEndIndex() + $indexDiff; ++$index) {
                     $origSize = \count($tokens);
-                    if ($discoverSymbolsPhase && $tokens[$index]->isGivenKind([T_CLASS, T_INTERFACE, T_TRAIT])) {
+
+                    if ($discoverSymbolsPhase && $tokens[$index]->isGivenKind($classyKinds)) {
                         $this->fixNextName($tokens, $index, $uses, $namespaceName);
                     } elseif ($tokens[$index]->isGivenKind(T_FUNCTION)) {
                         $this->fixFunction($functionsAnalyzer, $tokens, $index, $uses, $namespaceName);

diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -2114,6 +2114,21 @@ public function doSomethingMore(\Foo\Bar|B $foo): \Foo\Bar\Baz{}
     public function doSomethingElse(\Foo\Bar&\A\Z $foo): \Foo\Bar\Baz{}
 }',
         ];
+
+        yield 'import only if not already implicitly used by enum declaration' => [
+            <<<'EOD'
+                <?php
+
+                namespace Ns;
+
+                enum City
+                {
+                    public function f(\Ns2\City $city) {}
+                }
+                EOD,
+            null,
+            ['import_symbols' => true],
+        ];
     }
 
     /**