Filter scope by dynamic variable name for $$name

ondrejmirtes · ondrejmirtes · commit 0df0c6f34b38 · 2025-03-13T11:43:05.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2010,7 +2010,11 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 
 			$nameType = $this->getType($node->name);
 			if (count($nameType->getConstantStrings()) > 0) {
-				return TypeCombinator::union(...array_map(fn ($constantString) => $this->getVariableType($constantString->getValue()), $nameType->getConstantStrings()));
+				return TypeCombinator::union(
+					...array_map(fn ($constantString) => $this
+						->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))
+						->getVariableType($constantString->getValue()), $nameType->getConstantStrings()),
+				);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -2010,7 +2010,11 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu`
`2010`	`2010`
`2011`	`2011`	`$nameType = $this->getType($node->name);`
`2012`	`2012`	`if (count($nameType->getConstantStrings()) > 0) {`
`2013`		`- return TypeCombinator::union(...array_map(fn ($constantString) => $this->getVariableType($constantString->getValue()), $nameType->getConstantStrings()));`
	`2013`	`+ return TypeCombinator::union(`
	`2014`	`+ ...array_map(fn ($constantString) => $this`
	`2015`	`+ ->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))`
	`2016`	`+ ->getVariableType($constantString->getValue()), $nameType->getConstantStrings()),`
	`2017`	`+ );`
`2014`	`2018`	`}`
`2015`	`2019`	`}`
`2016`	`2020`