[AutoImport] Fix conflict current namespace auto import (#5024)

rectorphp · Sep 15, 2023 · 0678674 · 0678674
1 parent f606358
commit 0678674
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php
@@ -151,6 +151,10 @@ private function shouldImport(
         }
 
         if (str_starts_with($identifierTypeNode->name, '\\')) {
+            if ($fullyQualifiedObjectType->getShortName() !== $fullyQualifiedObjectType->getClassName()) {
+                return $fullyQualifiedObjectType->getShortName() !== ltrim($identifierTypeNode->name, '\\');
+            }
+
             return true;
         }
 

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/AutoImportNamesTest.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/AutoImportNamesTest.php
@@ -16,11 +16,6 @@ final class AutoImportNamesTest extends AbstractRectorTestCase
     #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
-        if (str_ends_with($filePath, 'auto_import_conflict_name_all_fqcn_same_namespace.php.inc')) {
-            // @todo fix later
-            return;
-        }
-
         $this->doTestFile($filePath);
     }
 

diff --git a/...ssRector/FixtureAutoImportNames/auto_import_conflict_name_all_fqcn_same_namespace.php.inc b/...ssRector/FixtureAutoImportNames/auto_import_conflict_name_all_fqcn_same_namespace.php.inc
@@ -18,8 +18,6 @@ final class AutoImportConflictNameAllFqcnSameNamespace
 
 namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
 
-use Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames\SomeShort;
-
 final class AutoImportConflictNameAllFqcnSameNamespace
 {
     /**