UseImportsTraverser: don't deep traverse (#4994)

* UseImportsTraverser: don't deep traverse * Update UseImportsTraverser.php * Update UseImportsTraverser.php * UseImportsTraverser: don't deep traverse
rectorphp · Sep 11, 2023 · ed0be50 · ed0be50
1 parent 7b4858b
commit ed0be50
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php b/rules/CodingStyle/ClassNameImport/UseImportsTraverser.php
@@ -4,11 +4,14 @@
 
 namespace Rector\CodingStyle\ClassNameImport;
 
+use PhpParser\Node\Stmt\Namespace_;
+use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\GroupUse;
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\Stmt\UseUse;
+use PhpParser\NodeTraverser;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 
@@ -57,27 +60,24 @@ private function traverseForType(array $stmts, callable $callable, int $desiredT
             $callable,
             $desiredType
         ) {
-            if ($node instanceof Use_) {
-                // only import uses
-                if ($node->type !== $desiredType) {
-                    return null;
-                }
+            if ($node instanceof Namespace_ || $node instanceof FileWithoutNamespace) {
+                // traverse into namespaces
+                return null;
+            }
 
+            if ($node instanceof Use_ && $node->type === $desiredType) {
                 foreach ($node->uses as $useUse) {
                     $name = $this->nodeNameResolver->getName($useUse);
                     if ($name === null) {
                         continue;
                     }
-
                     $callable($useUse, $name);
                 }
-            }
-
-            if ($node instanceof GroupUse) {
+            } elseif ($node instanceof GroupUse) {
                 $this->processGroupUse($node, $desiredType, $callable);
             }
 
-            return null;
+            return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         });
     }