make variable related specifications more precise

rajyan · rajyan · commit 93ef0b8a7f86 · 2022-10-28T21:19:53.000+09:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2880,6 +2880,7 @@ private function enterAnonymousFunctionWithoutReflection(
 			$nativeTypes[$paramExprString] = $parameterType;
 		}
 
+		$nonRefVariableNames = [];
 		foreach ($closure->uses as $use) {
 			if (!is_string($use->var->name)) {
 				throw new ShouldNotHappenException();
@@ -2891,34 +2892,41 @@ private function enterAnonymousFunctionWithoutReflection(
 				$nativeTypes[$paramExprString] = new MixedType();
 				continue;
 			}
+			$nonRefVariableNames[$variableName] = true;
 			if ($this->hasVariableType($variableName)->no()) {
 				$variableType = new ErrorType();
 			} else {
 				$variableType = $this->getVariableType($variableName);
 				$nativeTypes[$paramExprString] = $this->getNativeType($use->var);
 			}
 			$expressionTypes[$paramExprString] = ExpressionTypeHolder::createYes($variableType);
+		}
 
-			foreach ($this->expressionTypes as $exprString => $typeHolder) {
-				$expr = $this->exprStringToExpr((string) $exprString);
-				if ($expr === null) {
-					continue;
-				}
-				if ($expr instanceof Variable) {
-					continue;
-				}
-				$variable = (new NodeFinder())->findFirst([$expr], static fn (Node $node): bool => $node instanceof Variable);
+		foreach ($this->expressionTypes as $exprString => $typeHolder) {
+			$expr = $this->exprStringToExpr((string) $exprString);
+			if ($expr === null) {
+				continue;
+			}
+			if ($expr instanceof Variable) {
+				continue;
+			}
+			$variables = (new NodeFinder())->findInstanceOf([$expr], Variable::class);
+			if ($variables === []) {
+				continue;
+			}
+			foreach ($variables as $variable) {
 				if (!$variable instanceof Variable) {
-					continue;
+					continue 2;
 				}
 				if (!is_string($variable->name)) {
-					continue;
+					continue 2;
 				}
-				if ($variable->name !== $variableName) {
-					continue;
+				if (!array_key_exists($variable->name, $nonRefVariableNames)) {
+					continue 2;
 				}
-				$expressionTypes[$exprString] = $typeHolder;
 			}
+
+			$expressionTypes[$exprString] = $typeHolder;
 		}
 
 		if ($this->hasVariableType('this')->yes() && !$closure->static) {
