From 737df4cfbcb62cb46c826ab02559163f871f3ff5 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Thu, 1 Jan 2026 12:14:00 +0100
Subject: [PATCH] Simplify MutatingScope->invalidateMethodsOnExpression()

---
 src/Analyser/MutatingScope.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index 4c2ddd449c..c78ce49de8 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -4520,21 +4520,18 @@ private function shouldInvalidateExpression(string $exprStringToInvalidate, Expr
 
 	private function invalidateMethodsOnExpression(Expr $expressionToInvalidate): self
 	{
-		$exprStringToInvalidate = $this->getNodeKey($expressionToInvalidate);
+		$exprStringToInvalidate = null;
 		$expressionTypes = $this->expressionTypes;
 		$nativeExpressionTypes = $this->nativeExpressionTypes;
 		$invalidated = false;
-		$nodeFinder = new NodeFinder();
 		foreach ($expressionTypes as $exprString => $exprTypeHolder) {
 			$expr = $exprTypeHolder->getExpr();
-			$found = $nodeFinder->findFirst([$expr], function (Node $node) use ($exprStringToInvalidate): bool {
-				if (!$node instanceof MethodCall) {
-					return false;
-				}
+			if (!$expr instanceof MethodCall) {
+				continue;
+			}
 
-				return $this->getNodeKey($node->var) === $exprStringToInvalidate;
-			});
-			if ($found === null) {
+			$exprStringToInvalidate ??= $this->getNodeKey($expressionToInvalidate);
+			if ($this->getNodeKey($expr->var) !== $exprStringToInvalidate) {
 				continue;
 			}