Fix match analysis

ondrejmirtes · ondrejmirtes · commit 02ea5fa47d42 · 2025-12-11T12:52:45.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -4272,8 +4272,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				}
 
 				$filteringExpr = $this->getFilteringExprForMatchArm($expr, $filteringExprs);
-
-				$bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, $storage, new NoopNodeCallback(), $deepContext)->getTruthyScope();
+				$bodyScope = $matchScope->filterByTruthyValue($filteringExpr);
 				$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);
 				$armNodes[$i] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getStartLine());
 

Original file line number	Diff line number	Diff line change
`@@ -4272,8 +4272,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto`
`4272`	`4272`	`}`
`4273`	`4273`
`4274`	`4274`	`$filteringExpr = $this->getFilteringExprForMatchArm($expr, $filteringExprs);`
`4275`		`-`
`4276`		`- $bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, $storage, new NoopNodeCallback(), $deepContext)->getTruthyScope();`
	`4275`	`+ $bodyScope = $matchScope->filterByTruthyValue($filteringExpr);`
`4277`	`4276`	`$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);`
`4278`	`4277`	`$armNodes[$i] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getStartLine());`
`4279`	`4278`