rename vairabe

packages-tests/NameImporting/NodeAnalyzer/UseAnalyzer/UseAnalyzerTest.php

@@ -5,8 +5,10 @@
 namespace Rector\Tests\NameImporting\NodeAnalyzer\UseAnalyzer;
 
 use Iterator;
+use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use Rector\NameImporting\NodeAnalyzer\UseAnalyzer;
@@ -32,18 +34,19 @@ protected function setUp(): void
     /**
      * @dataProvider provideData()
      *
-     * @param class-string<\PhpParser\Node> $parentNodeType
+     * @param class-string<Node> $parentNodeType
      */
     public function test(
         string $filePath,
         string $expectedShortName,
         int $position,
-        \PhpParser\Node $expectedNameNode,
+        Name|Identifier $expectedNameNode,
         string $parentNodeType
     ): void {
         $file = $this->testingParser->parseFilePathToFile($filePath);
+        $firstStmt = $file->getOldStmts()[1];
 
-        $namesAndParentsByShortName = $this->useAnalyzer->resolveUsedNameNodes($file);
+        $namesAndParentsByShortName = $this->useAnalyzer->resolveUsedNameNodes($firstStmt);
         $this->assertArrayHasKey($expectedShortName, $namesAndParentsByShortName);
 
         $namesAndParents = $namesAndParentsByShortName[$expectedShortName];

packages/NameImporting/NodeAnalyzer/UseAnalyzer.php

@@ -11,7 +11,6 @@
 use PhpParser\Node\Stmt\UseUse;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
-use Rector\Core\ValueObject\Application\File;
 use Rector\NameImporting\ValueObject\NameAndParent;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -30,24 +29,24 @@ public function __construct(
     /**
      * @return array<string, NameAndParent[]>
      */
-    public function resolveUsedNameNodes(File $file): array
+    public function resolveUsedNameNodes(Node $node): array
     {
-        $usedNamesByShortName = $this->resolveUsedNames($file);
-        $usedClassNamesByShortName = $this->resolveUsedClassNames($file);
-        $usedTraitNamesByShortName = $this->resolveTraitUseNames($file);
+        $usedNamesByShortName = $this->resolveUsedNames($node);
+        $usedClassNamesByShortName = $this->resolveUsedClassNames($node);
+        $usedTraitNamesByShortName = $this->resolveTraitUseNames($node);
 
         return array_merge($usedNamesByShortName, $usedClassNamesByShortName, $usedTraitNamesByShortName);
     }
 
     /**
      * @return array<string, NameAndParent[]>
      */
-    private function resolveUsedNames(File $file): array
+    private function resolveUsedNames(Node $node): array
     {
         $namesAndParentsByShortName = [];
 
         /** @var Name[] $names */
-        $names = $this->betterNodeFinder->findInstanceOf($file->getOldStmts(), Name::class);
+        $names = $this->betterNodeFinder->findInstanceOf($node, Name::class);
 
         foreach ($names as $name) {
             /** node name before becoming FQN - attribute from @see NameResolver */
@@ -71,12 +70,12 @@ private function resolveUsedNames(File $file): array
     /**
      * @return array<string, NameAndParent[]>
      */
-    private function resolveUsedClassNames(File $file): array
+    private function resolveUsedClassNames(Node $node): array
     {
         $namesAndParentsByShortName = [];
 
         /** @var ClassLike[] $classLikes */
-        $classLikes = $this->betterNodeFinder->findClassLikes($file->getOldStmts());
+        $classLikes = $this->betterNodeFinder->findClassLikes($node);
 
         foreach ($classLikes as $classLike) {
             $classLikeName = $classLike->name;
@@ -98,12 +97,12 @@ private function resolveUsedClassNames(File $file): array
     /**
      * @return array<string, NameAndParent[]>
      */
-    private function resolveTraitUseNames(File $file): array
+    private function resolveTraitUseNames(Node $node): array
     {
         $namesAndParentsByShortName = [];
 
         /** @var Identifier[] $identifiers */
-        $identifiers = $this->betterNodeFinder->findInstanceOf($file->getOldStmts(), Identifier::class);
+        $identifiers = $this->betterNodeFinder->findInstanceOf($node, Identifier::class);
 
         foreach ($identifiers as $identifier) {
             $parentNode = $identifier->getAttribute(AttributeKey::PARENT_NODE);

packages/Testing/TestingParser/TestingParser.php

@@ -51,18 +51,4 @@ public function parseFileToDecoratedNodes(string $file): array
         $file = new File($smartFileInfo, $smartFileInfo->getContents());
         return $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($file, $nodes);
     }
-<<<<<<< HEAD
-
-    public function parseFilePathToFile(string $filePath): File
-    {
-        $smartFileInfo = new SmartFileInfo($filePath);
-        $file = new File($smartFileInfo, $smartFileInfo->getContents());
-
-        $stmts = $this->rectorParser->parseFile($smartFileInfo);
-        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
-
-        return $file;
-    }
-=======
->>>>>>> b529e101b... add ShortNameResolverTest
 }

rules/CodingStyle/Node/DocAliasResolver.php

@@ -11,7 +11,6 @@
 use PHPStan\Type\UnionType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Core\ValueObject\Application\File;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
 
@@ -32,11 +31,11 @@ public function __construct(
     /**
      * @return string[]
      */
-    public function resolve(File $file): array
+    public function resolve(Node $node): array
     {
         $possibleDocAliases = [];
 
-        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($file->getNewStmts(), function (Node $node) use (
+        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($node, function (Node $node) use (
             &$possibleDocAliases
         ): void {
             $docComment = $node->getDocComment();

rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php

@@ -29,7 +29,7 @@ final class RemoveUnusedAliasRector extends AbstractRector
     /**
      * @var array<string, NameAndParent[]>
      */
-    private array $resolvedNodeNames = [];
+    private array $resolvedNamesAndParentsByShortName = [];
 
     /**
      * @var array<string, string[]>
@@ -43,7 +43,7 @@ final class RemoveUnusedAliasRector extends AbstractRector
 
     public function __construct(
         private DocAliasResolver $docAliasResolver,
-        private UseAnalyzer $useManipulator,
+        private UseAnalyzer $useAnalyzer,
         private UseNameAliasToNameResolver $useNameAliasToNameResolver,
         private NameRenamer $nameRenamer,
         private ClassNameImportSkipper $classNameImportSkipper,
@@ -94,15 +94,23 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $this->resolvedNodeNames = $this->useManipulator->resolveUsedNameNodes($this->file);
-        $this->resolvedDocPossibleAliases = $this->docAliasResolver->resolve($this->file);
+        $searchNode = $this->resolveSearchNode($node);
+        if (! $searchNode instanceof \PhpParser\Node) {
+            return null;
+        }
 
+        $this->resolvedNamesAndParentsByShortName = $this->useAnalyzer->resolveUsedNameNodes($searchNode);
+        $this->resolvedDocPossibleAliases = $this->docAliasResolver->resolve($searchNode);
         $this->useNamesAliasToName = $this->useNameAliasToNameResolver->resolve($this->file);
 
         // lowercase
         $this->resolvedDocPossibleAliases = $this->lowercaseArray($this->resolvedDocPossibleAliases);
 
-        $this->resolvedNodeNames = array_change_key_case($this->resolvedNodeNames, CASE_LOWER);
+        $this->resolvedNamesAndParentsByShortName = array_change_key_case(
+            $this->resolvedNamesAndParentsByShortName,
+            CASE_LOWER
+        );
+
         $this->useNamesAliasToName = array_change_key_case($this->useNamesAliasToName, CASE_LOWER);
 
         foreach ($node->uses as $use) {
@@ -120,7 +128,7 @@ public function refactor(Node $node): ?Node
             }
 
             // only last name is used → no need for alias
-            if (isset($this->resolvedNodeNames[$lowercasedLastName])) {
+            if (isset($this->resolvedNamesAndParentsByShortName[$lowercasedLastName])) {
                 $use->alias = null;
                 continue;
             }
@@ -158,7 +166,7 @@ private function shouldSkip(Use_ $use, string $lastName, string $aliasName): boo
         $loweredAliasName = strtolower($aliasName);
 
         // both are used → nothing to remove
-        if (isset($this->resolvedNodeNames[$loweredLastName], $this->resolvedNodeNames[$loweredAliasName])) {
+        if (isset($this->resolvedNamesAndParentsByShortName[$loweredLastName], $this->resolvedNamesAndParentsByShortName[$loweredAliasName])) {
             return true;
         }
 
@@ -191,11 +199,14 @@ private function refactorAliasName(Use_ $use, string $fullUseUseName, string $la
         }
 
         $loweredFullUseUseName = strtolower($fullUseUseName);
-        if (! isset($this->resolvedNodeNames[$loweredFullUseUseName])) {
+        if (! isset($this->resolvedNamesAndParentsByShortName[$loweredFullUseUseName])) {
             return;
         }
 
-        $this->nameRenamer->renameNameNode($this->resolvedNodeNames[$loweredFullUseUseName], $lastName);
+        $this->nameRenamer->renameNameNode(
+            $this->resolvedNamesAndParentsByShortName[$loweredFullUseUseName],
+            $lastName
+        );
         $useUse->alias = null;
     }
 
@@ -209,4 +220,14 @@ private function hasUseAlias(Use_ $use): bool
 
         return false;
     }
+
+    private function resolveSearchNode(Use_ $use): ?Node
+    {
+        $searchNode = $use->getAttribute(AttributeKey::PARENT_NODE);
+        if ($searchNode !== null) {
+            return $searchNode;
+        }
+
+        return $use->getAttribute(AttributeKey::NEXT_NODE);
+    }
 }