[NodeTraverser] Clean up call ->addVisitor() after NodeTraverser crea…

…tion (#6690)
rectorphp · Jan 22, 2025 · d5d3bcd · d5d3bcd
1 parent 4a954af
commit d5d3bcd
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/src/Comments/NodeTraverser/CommentRemovingNodeTraverser.php b/src/Comments/NodeTraverser/CommentRemovingNodeTraverser.php
@@ -11,8 +11,6 @@ final class CommentRemovingNodeTraverser extends NodeTraverser
 {
     public function __construct(CommentRemovingNodeVisitor $commentRemovingNodeVisitor)
     {
-        parent::__construct();
-
-        $this->addVisitor($commentRemovingNodeVisitor);
+        parent::__construct($commentRemovingNodeVisitor);
     }
 }
diff --git a/src/NodeTypeResolver/NodeScopeAndMetadataDecorator.php b/src/NodeTypeResolver/NodeScopeAndMetadataDecorator.php
@@ -19,10 +19,8 @@ public function __construct(
         private PHPStanNodeScopeResolver $phpStanNodeScopeResolver,
         private FileWithoutNamespaceNodeTraverser $fileWithoutNamespaceNodeTraverser
     ) {
-        $this->nodeTraverser = new NodeTraverser();
-
         // needed for format preserving printing
-        $this->nodeTraverser->addVisitor($cloningVisitor);
+        $this->nodeTraverser = new NodeTraverser($cloningVisitor);
     }
 
     /**

diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -133,11 +133,7 @@ public function __construct(
         private NodeNameResolver $nodeNameResolver,
         private ClassAnalyzer $classAnalyzer
     ) {
-        $this->nodeTraverser = new NodeTraverser();
-
-        foreach ($nodeVisitors as $nodeVisitor) {
-            $this->nodeTraverser->addVisitor($nodeVisitor);
-        }
+        $this->nodeTraverser = new NodeTraverser(...$nodeVisitors);
     }
 
     /**

diff --git a/src/PhpDocParser/NodeTraverser/SimpleCallableNodeTraverser.php b/src/PhpDocParser/NodeTraverser/SimpleCallableNodeTraverser.php
@@ -23,10 +23,8 @@ public function traverseNodesWithCallable(Node | array | null $node, callable $c
             return;
         }
 
-        $nodeTraverser = new NodeTraverser();
-
         $callableNodeVisitor = new CallableNodeVisitor($callable);
-        $nodeTraverser->addVisitor($callableNodeVisitor);
+        $nodeTraverser = new NodeTraverser($callableNodeVisitor);
 
         $nodes = $node instanceof Node ? [$node] : $node;
         $nodeTraverser->traverse($nodes);

diff --git a/src/PhpParser/Parser/SimplePhpParser.php b/src/PhpParser/Parser/SimplePhpParser.php
@@ -24,8 +24,7 @@ public function __construct()
         $parserFactory = new ParserFactory();
         $this->phpParser = $parserFactory->createForNewestSupportedVersion();
 
-        $this->nodeTraverser = new NodeTraverser();
-        $this->nodeTraverser->addVisitor(new AssignedToNodeVisitor());
+        $this->nodeTraverser = new NodeTraverser(new AssignedToNodeVisitor());
     }
 
     /**

diff --git a/src/PostRector/Application/PostFileProcessor.php b/src/PostRector/Application/PostFileProcessor.php
@@ -58,8 +58,7 @@ public function traverse(array $stmts, File $file): array
                 continue;
             }
 
-            $nodeTraverser = new NodeTraverser();
-            $nodeTraverser->addVisitor($postRector);
+            $nodeTraverser = new NodeTraverser($postRector);
             $stmts = $nodeTraverser->traverse($stmts);
         }
 

diff --git a/tests/NodeManipulator/ClassDependencyManipulatorTest.php b/tests/NodeManipulator/ClassDependencyManipulatorTest.php
@@ -108,9 +108,8 @@ public function testConstantProperties(): void
     private function setNamespacedName(Class_ $class): void
     {
         $nameResolver = new NameResolver();
-        $nodeTraverser = new NodeTraverser();
+        $nodeTraverser = new NodeTraverser($nameResolver);
 
-        $nodeTraverser->addVisitor($nameResolver);
         $nodeTraverser->traverse([$class]);
     }