PreviousConnectingVisitor: Utilize WeakReference (#730)

staabm · Dec 30, 2024 · 525a9fa · 525a9fa
1 parent 675388c
commit 525a9fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Ast/ExpressionFinder.php b/src/Ast/ExpressionFinder.php
@@ -134,6 +134,10 @@ private function findFirstPreviousOfNode(Node $node, callable $filter): ?Node
         // move to previous expression
         $previousStatement = $node->getAttribute(PreviousConnectingVisitor::ATTRIBUTE_PREVIOUS);
         if (null !== $previousStatement) {
+            if ($previousStatement instanceof \WeakReference) {
+                $previousStatement = $previousStatement->get();
+            }
+
             if (! $previousStatement instanceof Node) {
                 throw new ShouldNotHappenException();
             }

diff --git a/src/Ast/PreviousConnectingVisitor.php b/src/Ast/PreviousConnectingVisitor.php
@@ -39,7 +39,7 @@ public function enterNode(Node $node)
             && ! $this->previous instanceof Node\Stmt\ClassLike
             && ! $this->previous instanceof VirtualNode
         ) {
-            $node->setAttribute(self::ATTRIBUTE_PREVIOUS, $this->previous);
+            $node->setAttribute(self::ATTRIBUTE_PREVIOUS, \WeakReference::create($this->previous));
         }
 
         return null;