[AutoImport] Allow auto import same namespace with sub use with docbl…

…ock short name (#5763) * [AutoImport] Allow auto import same namespace with sub use with docblock short name * more fixtures * Fix non-docblock name * [ci-review] Rector Rectify * docblock is require FullyQualifiedObject due to generic * fix * fix comment * fix --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Mar 23, 2024 · e3e741e · e3e741e
1 parent c45f0e2
commit e3e741e
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 24 deletions.
diff --git a/...e/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php b/...e/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php
@@ -6,12 +6,9 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
-use PhpParser\Node\Name;
-use PhpParser\Node\Name\FullyQualified;
 use Rector\CodingStyle\ClassNameImport\ShortNameResolver;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
 use Rector\Configuration\RenamedClassesDataCollector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Rector\ValueObject\Application\File;
 
@@ -41,14 +38,6 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
         $className = $fullyQualifiedObjectType->getClassName();
         $removedUses = $this->renamedClassesDataCollector->getOldClasses();
 
-        $originalName = $node->getAttribute(AttributeKey::ORIGINAL_NAME);
-        $originalNameToAttribute = null;
-        if ($originalName instanceof Name && ! $originalName instanceof FullyQualified && $originalName->hasAttribute(
-            AttributeKey::PHP_ATTRIBUTE_NAME
-        )) {
-            $originalNameToAttribute = $originalName->getAttribute(AttributeKey::PHP_ATTRIBUTE_NAME);
-        }
-
         foreach ($shortNamesToFullyQualifiedNames as $shortName => $fullyQualifiedName) {
             if ($fullyQualifiedObjectTypeShortName !== $shortName) {
                 $shortName = $this->cleanShortName($shortName);
@@ -63,11 +52,7 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
                 return false;
             }
 
-            if (! in_array($fullyQualifiedName, $removedUses, true)) {
-                return $originalNameToAttribute == null || ! in_array($originalNameToAttribute, $removedUses, true);
-            }
-
-            return false;
+            return ! in_array($fullyQualifiedName, $removedUses, true);
         }
 
         return false;

diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php
@@ -193,9 +193,11 @@ private function fqnizeShortNames(array $shortNames, array $stmts): array
         foreach ($shortNames as $shortName) {
             $stmtsMatchedName = $this->useImportNameMatcher->matchNameWithStmts($shortName, $stmts);
 
-            $fullyQualifiedName = is_string($stmtsMatchedName) ? $stmtsMatchedName : $shortName;
+            if ($stmtsMatchedName == null) {
+                continue;
+            }
 
-            $shortNamesToFullyQualifiedNames[$shortName] = $fullyQualifiedName;
+            $shortNamesToFullyQualifiedNames[$shortName] = $stmtsMatchedName;
         }
 
         return $shortNamesToFullyQualifiedNames;

diff --git a/src/PostRector/Rector/ClassRenamingPostRector.php b/src/PostRector/Rector/ClassRenamingPostRector.php
@@ -106,16 +106,11 @@ private function resolveResultWithPhpAttributeName(
     ): ?FullyQualified {
         $phpAttributeName = $name->getAttribute(AttributeKey::PHP_ATTRIBUTE_NAME);
         if (is_string($phpAttributeName)) {
-            $result = $this->classRenamer->renameNode(
+            return $this->classRenamer->renameNode(
                 new FullyQualified($phpAttributeName, $name->getAttributes()),
                 $oldToNewClasses,
                 $scope
             );
-            if ($result instanceof FullyQualified) {
-                $result->setAttribute(AttributeKey::ORIGINAL_NAME, $name);
-            }
-
-            return $result;
         }
 
         return null;

diff --git a/tests/Issues/AutoImport/Fixture/DocBlock/union_equal_last_name_class_exists.php.inc b/tests/Issues/AutoImport/Fixture/DocBlock/union_equal_last_name_class_exists.php.inc
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+/**
+ * @param \stdClass|\Rector\Tests\Issues\AutoImport\Source\stdClass $param
+ */
+function unionEqualLastNameClassExists($param)
+{
+}
+
+?>
+-----
+<?php
+
+namespace App;
+
+use stdClass;
+/**
+ * @param stdClass|\Rector\Tests\Issues\AutoImport\Source\stdClass $param
+ */
+function unionEqualLastNameClassExists($param)
+{
+}
+
+?>
diff --git a/tests/Issues/AutoImport/Fixture/same_namespace_with_sub_use.php.inc b/tests/Issues/AutoImport/Fixture/same_namespace_with_sub_use.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Database;
+
+use Config\Database;
+
+/**
+ * @param Forge $forge
+ */
+function same_namespace_with_sub_use(\App\Database\Forge $forge)
+{
+
+}
+
+?>
+-----
+<?php
+
+namespace App\Database;
+
+use Config\Database;
+
+/**
+ * @param Forge $forge
+ */
+function same_namespace_with_sub_use(Forge $forge)
+{
+
+}
+
+?>
diff --git a/tests/Issues/AutoImport/Source/stdClass.php b/tests/Issues/AutoImport/Source/stdClass.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\AutoImport\Source;
+
+class stdClass
+{
+}