[CodingStyle] Remove parent lookup on ShortNameResolver (#4260)

rectorphp · Jun 17, 2023 · ad65e04 · ad65e04
1 parent 96dc306
commit ad65e04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...gStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php b/...gStyle/ClassNameImport/ClassNameImportSkipVoter/ClassLikeNameClassNameImportSkipVoter.php
@@ -28,7 +28,7 @@ public function __construct(
 
     public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
     {
-        $classLikeNames = $this->shortNameResolver->resolveShortClassLikeNamesForNode($node);
+        $classLikeNames = $this->shortNameResolver->resolveShortClassLikeNames($file);
         if ($classLikeNames === []) {
             return false;
         }

diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php
@@ -84,14 +84,19 @@ public function resolveFromFile(File $file): array
      * Collects all "class <SomeClass>", "trait <SomeTrait>" and "interface <SomeInterface>"
      * @return string[]
      */
-    public function resolveShortClassLikeNamesForNode(Node $node): array
+    public function resolveShortClassLikeNames(File $file): array
     {
-        $namespace = $this->betterNodeFinder->findParentType($node, Namespace_::class);
-        if (! $namespace instanceof Namespace_) {
-            // only handle namespace nodes
+        $newStmts = $file->getNewStmts();
+
+        /** @var Namespace_[] $namespaces */
+        $namespaces = array_filter($newStmts, static fn (Stmt $stmt): bool => $stmt instanceof Namespace_);
+        if (count($namespaces) !== 1) {
+            // only handle single namespace nodes
             return [];
         }
 
+        $namespace = current($namespaces);
+
         /** @var ClassLike[] $classLikes */
         $classLikes = $this->betterNodeFinder->findInstanceOf($namespace, ClassLike::class);