[AutoImport][Renaming] Handle same last name no namespace just rename…

…d auto import (#5248)

* [AutoImport][Renaming] Handle same last name no namespace just renamed auto import

* udpate fixture

* Fixed 🎉

* fix

* add namespaced fixture

* use in attrbiute

* fix

* fixed

* fix

* clean up

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <actions@github.com>

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php

@@ -6,11 +6,10 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
-use PhpParser\Node\Name\FullyQualified;
 use Rector\CodingStyle\ClassNameImport\ShortNameResolver;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
+use Rector\Core\Configuration\RenamedClassesDataCollector;
 use Rector\Core\ValueObject\Application\File;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 
 /**
@@ -25,7 +24,8 @@
 final class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface
 {
     public function __construct(
-        private readonly ShortNameResolver $shortNameResolver
+        private readonly ShortNameResolver $shortNameResolver,
+        private readonly RenamedClassesDataCollector $renamedClassesDataCollector
     ) {
     }
 
@@ -36,13 +36,11 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
         $shortNamesToFullyQualifiedNames = $this->shortNameResolver->resolveFromFile($file);
         $fullyQualifiedObjectTypeShortName = $fullyQualifiedObjectType->getShortName();
         $className = $fullyQualifiedObjectType->getClassName();
-        $justRenamed = $node instanceof FullyQualified && ! $node->hasAttribute(AttributeKey::ORIGINAL_NAME);
+        $removedUses = $this->renamedClassesDataCollector->getOldClasses();
 
         foreach ($shortNamesToFullyQualifiedNames as $shortName => $fullyQualifiedName) {
             if ($fullyQualifiedObjectTypeShortName !== $shortName) {
-                $shortName = str_starts_with($shortName, '\\')
-                    ? ltrim((string) Strings::after($shortName, '\\', -1))
-                    : $shortName;
+                $shortName = $this->cleanShortName($shortName);
             }
 
             if ($fullyQualifiedObjectTypeShortName !== $shortName) {
@@ -54,9 +52,16 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
                 return false;
             }
 
-            return ! $justRenamed;
+            return ! in_array($fullyQualifiedName, $removedUses, true);
         }
 
         return false;
     }
+
+    private function cleanShortName(string $shortName): string
+    {
+        return str_starts_with($shortName, '\\')
+            ? ltrim((string) Strings::after($shortName, '\\', -1))
+            : $shortName;
+    }
 }

rules/Renaming/Rector/Name/RenameClassRector.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Property;
 use Rector\Core\Configuration\RenamedClassesDataCollector;
@@ -80,11 +81,12 @@ public function getNodeTypes(): array
             Expression::class,
             ClassLike::class,
             Namespace_::class,
+            If_::class,
         ];
     }
 
     /**
-     * @param FunctionLike|Name|ClassLike|Expression|Namespace_|Property $node
+     * @param FunctionLike|Name|ClassLike|Expression|Namespace_|Property|If_ $node
      */
     public function refactor(Node $node): ?Node
     {

tests/Issues/AutoImport/Fixture/no_namespace_used_class_renamed.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+function NoNamespaceUsedClassRenamed(
+    // fqcn
+    \Some\Exception $e
+)
+{
+    // from root
+    $obj = new Exception();
+}
+
+?>
+-----
+<?php
+
+function NoNamespaceUsedClassRenamed(
+    // fqcn
+    \Some\Target\Exception $e
+)
+{
+    // from root
+    $obj = new Exception();
+}
+
+?>

tests/Issues/AutoImport/Fixture/with_namespace_used_class_renamed.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace App;
+
+function WithNamespaceUsedClassRenamed(
+    // fqcn
+    \Some\Exception $e
+)
+{
+    // from root namespace App
+    $obj = new Exception();
+}
+
+?>
+-----
+<?php
+
+namespace App;
+
+function WithNamespaceUsedClassRenamed(
+    // fqcn
+    \Some\Target\Exception $e
+)
+{
+    // from root namespace App
+    $obj = new Exception();
+}
+
+?>

tests/Issues/AutoImport/config/configured_rule.php

@@ -3,7 +3,11 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Renaming\Rector\Name\RenameClassRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->importNames();
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'Some\Exception' => 'Some\Target\Exception',
+    ]);
 };