optimize AbstractImmutableNodeTraverser, remove deprecated constants

Author: TomasVotruba

src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php

@@ -10,29 +10,10 @@
 use PhpParser\Node\Stmt;
 use PhpParser\NodeTraverserInterface;
 use PhpParser\NodeVisitor;
+use Rector\Exception\ShouldNotHappenException;
 
 abstract class AbstractImmutableNodeTraverser implements NodeTraverserInterface
 {
-    /**
-     * @deprecated Use NodeVisitor::DONT_TRAVERSE_CHILDREN instead.
-     */
-    public const DONT_TRAVERSE_CHILDREN = NodeVisitor::DONT_TRAVERSE_CHILDREN;
-
-    /**
-     * @deprecated Use NodeVisitor::STOP_TRAVERSAL instead.
-     */
-    public const STOP_TRAVERSAL = NodeVisitor::STOP_TRAVERSAL;
-
-    /**
-     * @deprecated Use NodeVisitor::REMOVE_NODE instead.
-     */
-    public const REMOVE_NODE = NodeVisitor::REMOVE_NODE;
-
-    /**
-     * @deprecated Use NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN instead.
-     */
-    public const DONT_TRAVERSE_CURRENT_AND_CHILDREN = NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
-
     /**
      * @var list<NodeVisitor> Visitors
      */
@@ -63,15 +44,9 @@ public function addVisitor(NodeVisitor $visitor): void
         $this->visitors[] = $visitor;
     }
 
-    /**
-     * Removes an added visitor.
-     */
     public function removeVisitor(NodeVisitor $visitor): void
     {
-        $index = array_search($visitor, $this->visitors, true);
-        if ($index !== false) {
-            array_splice($this->visitors, $index, 1, []);
-        }
+        throw new ShouldNotHappenException('The immutable node traverser does not support removing visitors.');
     }
 
     /**
@@ -285,16 +260,20 @@ protected function traverseArray(array $nodes): array
 
     private function ensureReplacementReasonable(Node $old, Node $new): void
     {
-        if ($old instanceof Stmt && $new instanceof Expr) {
-            throw new LogicException(
-                sprintf('Trying to replace statement (%s) ', $old->getType()) . sprintf(
-                    'with expression (%s). Are you missing a ',
-                    $new->getType()
-                ) . 'Stmt_Expression wrapper?'
-            );
+        if ($old instanceof Stmt) {
+            if ($new instanceof Expr) {
+                throw new LogicException(
+                    sprintf('Trying to replace statement (%s) ', $old->getType()) . sprintf(
+                        'with expression (%s). Are you missing a ',
+                        $new->getType()
+                    ) . 'Stmt_Expression wrapper?'
+                );
+            }
+
+            return;
         }
 
-        if ($old instanceof Expr && $new instanceof Stmt) {
+        if ($new instanceof Stmt) {
             throw new LogicException(
                 sprintf('Trying to replace expression (%s) ', $old->getType()) . sprintf(
                     'with statement (%s)',

tests/PhpParser/NodeTraverser/RectorNodeTraverserTest.php

@@ -76,20 +76,4 @@ public function testGetVisitorsForNodeWhenAllVisitorsMatch(): void
 
         $this->assertEquals([$this->ruleUsingClassRector, $this->ruleUsingClassLikeRector], $visitors);
     }
-
-    public function testGetVisitorsForNodeUsesCachedValue(): void
-    {
-        $class = new Class_('test');
-        $this->rectorNodeTraverser->addVisitor($this->ruleUsingClassRector);
-        $this->rectorNodeTraverser->addVisitor($this->ruleUsingClassLikeRector);
-
-        $visitors = $this->rectorNodeTraverser->getVisitorsForNode($class);
-
-        $this->assertEquals([$this->ruleUsingClassRector, $this->ruleUsingClassLikeRector], $visitors);
-
-        $this->rectorNodeTraverser->removeVisitor($this->ruleUsingClassRector);
-        $visitors = $this->rectorNodeTraverser->getVisitorsForNode($class);
-
-        $this->assertEquals([$this->ruleUsingClassRector, $this->ruleUsingClassLikeRector], $visitors);
-    }
 }