Updated Rector to commit ee36fdd7f17a8da512450f07aa1c41455602d952

TomasVotruba · TomasVotruba · commit 69f087c611c3 · 2026-01-13T13:11:00.000Z
rectorphp/rector-src@ee36fdd [experiment-next] Remove leaveNode() calls on AbstractImmutableNodeTraverser (#7778)
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'f06b3589a61e31c31beef9374c4d83aaa40e6193';
+    public const PACKAGE_VERSION = 'ee36fdd7f17a8da512450f07aa1c41455602d952';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-13 03:42:40';
+    public const RELEASE_DATE = '2026-01-13 14:07:13';
     /**
      * @var int
      */
diff --git a/src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php b/src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php
@@ -85,10 +85,9 @@ protected function traverseNode(Node $node): void
                 continue;
             }
             $traverseChildren = \true;
-            $visitorIndex = -1;
             $currentNodeVisitors = $this->getVisitorsForNode($subNode);
-            foreach ($currentNodeVisitors as $visitorIndex => $visitor) {
-                $return = $visitor->enterNode($subNode);
+            foreach ($currentNodeVisitors as $currentNodeVisitor) {
+                $return = $currentNodeVisitor->enterNode($subNode);
                 if ($return !== null) {
                     if ($return instanceof Node) {
                         $originalSubNodeClass = get_class($subNode);
@@ -121,27 +120,6 @@ protected function traverseNode(Node $node): void
                     break;
                 }
             }
-            for (; $visitorIndex >= 0; --$visitorIndex) {
-                $visitor = $currentNodeVisitors[$visitorIndex];
-                $return = $visitor->leaveNode($subNode);
-                if ($return !== null) {
-                    if ($return instanceof Node) {
-                        $this->ensureReplacementReasonable($subNode, $return);
-                        $subNode = $return;
-                        $node->{$name} = $return;
-                    } elseif ($return === NodeVisitor::STOP_TRAVERSAL) {
-                        $this->stopTraversal = \true;
-                        break 2;
-                    } elseif ($return === NodeVisitor::REPLACE_WITH_NULL) {
-                        $node->{$name} = null;
-                        break;
-                    } elseif (\is_array($return)) {
-                        throw new LogicException('leaveNode() may only return an array if the parent structure is an array');
-                    } else {
-                        throw new LogicException('leaveNode() returned invalid value of type ' . gettype($return));
-                    }
-                }
-            }
         }
     }
     /**
@@ -159,10 +137,9 @@ protected function traverseArray(array $nodes): array
                 continue;
             }
             $traverseChildren = \true;
-            $visitorIndex = -1;
             $currentNodeVisitors = $this->getVisitorsForNode($node);
-            foreach ($currentNodeVisitors as $visitorIndex => $visitor) {
-                $return = $visitor->enterNode($node);
+            foreach ($currentNodeVisitors as $currentNodeVisitor) {
+                $return = $currentNodeVisitor->enterNode($node);
                 if ($return !== null) {
                     if ($return instanceof Node) {
                         $originalNodeNodeClass = get_class($node);
@@ -199,29 +176,6 @@ protected function traverseArray(array $nodes): array
                     break;
                 }
             }
-            for (; $visitorIndex >= 0; --$visitorIndex) {
-                $visitor = $currentNodeVisitors[$visitorIndex];
-                $return = $visitor->leaveNode($node);
-                if ($return !== null) {
-                    if ($return instanceof Node) {
-                        $this->ensureReplacementReasonable($node, $return);
-                        $nodes[$i] = $node = $return;
-                    } elseif (\is_array($return)) {
-                        $doNodes[] = [$i, $return];
-                        break;
-                    } elseif ($return === NodeVisitor::REMOVE_NODE) {
-                        $doNodes[] = [$i, []];
-                        break;
-                    } elseif ($return === NodeVisitor::STOP_TRAVERSAL) {
-                        $this->stopTraversal = \true;
-                        break 2;
-                    } elseif ($return === NodeVisitor::REPLACE_WITH_NULL) {
-                        throw new LogicException('REPLACE_WITH_NULL can not be used if the parent structure is an array');
-                    } else {
-                        throw new LogicException('leaveNode() returned invalid value of type ' . gettype($return));
-                    }
-                }
-            }
         }
         if ($doNodes !== []) {
             while ([$i, $replace] = array_pop($doNodes)) {
diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -127,6 +127,14 @@ final public function enterNode(Node $node)
         }
         return $this->postRefactorProcess($originalNode, $node, $refactoredNodeOrState, $filePath);
     }
+    /**
+     * @deprecated no longer used
+     * @return mixed[]|int|\PhpParser\Node|null
+     */
+    final public function leaveNode(Node $node)
+    {
+        return null;
+    }
     protected function isName(Node $node, string $name): bool
     {
         return $this->nodeNameResolver->isName($node, $name);

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,14 @@ final public function enterNode(Node $node)`
`127`	`127`	`}`
`128`	`128`	`return $this->postRefactorProcess($originalNode, $node, $refactoredNodeOrState, $filePath);`
`129`	`129`	`}`
	`130`	`+ /**`
	`131`	`+ * @deprecated no longer used`
	`132`	`+ * @return mixed[]\|int\|\PhpParser\Node\|null`
	`133`	`+ */`
	`134`	`+ final public function leaveNode(Node $node)`
	`135`	`+ {`
	`136`	`+ return null;`
	`137`	`+ }`
`130`	`138`	`protected function isName(Node $node, string $name): bool`
`131`	`139`	`{`
`132`	`140`	`return $this->nodeNameResolver->isName($node, $name);`