More match fixes

ondrejmirtes · ondrejmirtes · commit d87b3a551def · 2024-01-11T14:43:02.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1526,17 +1526,20 @@ private function resolveType(string $exprString, Expr $node): Type
 					);
 				}
 
-				$filteringExprType = $matchScope->getType($filteringExpr);
+				$noopCallback = static function (): void {
+				};
+				$filteringExprResult = $this->nodeScopeResolver->processExprNode(new Node\Stmt\Expression($filteringExpr), $filteringExpr, $matchScope, $noopCallback, ExpressionContext::createDeep());
 
+				$filteringExprType = $matchScope->getType($filteringExpr);
 				if (!$filteringExprType->isFalse()->yes()) {
-					$truthyScope = $matchScope->filterByTruthyValue($filteringExpr);
+					$truthyScope = $filteringExprResult->getTruthyScope();
 					if ($node->hasAttribute(self::KEEP_VOID_ATTRIBUTE_NAME)) {
 						$arm->body->setAttribute(self::KEEP_VOID_ATTRIBUTE_NAME, $node->getAttribute(self::KEEP_VOID_ATTRIBUTE_NAME));
 					}
 					$types[] = $truthyScope->getType($arm->body);
 				}
 
-				$matchScope = $matchScope->filterByFalseyValue($filteringExpr);
+				$matchScope = $filteringExprResult->getFalseyScope();
 			}
 
 			return TypeCombinator::union(...$types);
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2884,23 +2884,24 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 					);
 				}
 
-				$bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
-				}, $deepContext)->getTruthyScope();
-				$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);
+				$filteringExprResult = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
+				}, $deepContext);
+				$truthyScope = $filteringExprResult->getTruthyScope();
+				$matchArmBody = new MatchExpressionArmBody($truthyScope, $arm->body);
 				$armNodes[] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getLine());
 
 				$armResult = $this->processExprNode(
 					$stmt,
 					$arm->body,
-					$bodyScope,
+					$truthyScope,
 					$nodeCallback,
 					ExpressionContext::createTopLevel(),
 				);
 				$armScope = $armResult->getScope();
 				$scope = $scope->mergeWith($armScope);
 				$hasYield = $hasYield || $armResult->hasYield();
 				$throwPoints = array_merge($throwPoints, $armResult->getThrowPoints());
-				$matchScope = $matchScope->filterByFalseyValue($filteringExpr);
+				$matchScope = $filteringExprResult->getFalseyScope();
 			}
 
 			$remainingType = $matchScope->getType($expr->cond);

Original file line number	Diff line number	Diff line change
`@@ -1526,17 +1526,20 @@ private function resolveType(string $exprString, Expr $node): Type`
`1526`	`1526`	`);`
`1527`	`1527`	`}`
`1528`	`1528`
`1529`		`- $filteringExprType = $matchScope->getType($filteringExpr);`
	`1529`	`+ $noopCallback = static function (): void {`
	`1530`	`+ };`
	`1531`	`+ $filteringExprResult = $this->nodeScopeResolver->processExprNode(new Node\Stmt\Expression($filteringExpr), $filteringExpr, $matchScope, $noopCallback, ExpressionContext::createDeep());`
`1530`	`1532`
	`1533`	`+ $filteringExprType = $matchScope->getType($filteringExpr);`
`1531`	`1534`	`if (!$filteringExprType->isFalse()->yes()) {`
`1532`		`- $truthyScope = $matchScope->filterByTruthyValue($filteringExpr);`
	`1535`	`+ $truthyScope = $filteringExprResult->getTruthyScope();`
`1533`	`1536`	`if ($node->hasAttribute(self::KEEP_VOID_ATTRIBUTE_NAME)) {`
`1534`	`1537`	`$arm->body->setAttribute(self::KEEP_VOID_ATTRIBUTE_NAME, $node->getAttribute(self::KEEP_VOID_ATTRIBUTE_NAME));`
`1535`	`1538`	`}`
`1536`	`1539`	`$types[] = $truthyScope->getType($arm->body);`
`1537`	`1540`	`}`
`1538`	`1541`
`1539`		`- $matchScope = $matchScope->filterByFalseyValue($filteringExpr);`
	`1542`	`+ $matchScope = $filteringExprResult->getFalseyScope();`
`1540`	`1543`	`}`
`1541`	`1544`
`1542`	`1545`	`return TypeCombinator::union(...$types);`