Process match arm condition before analysing the body

ondrejmirtes · ondrejmirtes · commit 2b74aa85b87e · 2024-01-11T14:36:10.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2884,7 +2884,8 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 					);
 				}
 
-				$bodyScope = $matchScope->filterByTruthyValue($filteringExpr);
+				$bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
+				}, $deepContext)->getTruthyScope();
 				$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);
 				$armNodes[] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getLine());
 
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -1029,4 +1029,17 @@ public function testDiscussion10252(): void
 		$this->analyse([__DIR__ . '/data/discussion-10252.php'], []);
 	}
 
+	public function testBug10418(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = true;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+		$this->analyse([__DIR__ . '/data/bug-10418.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Variables/data/bug-10418.php b/tests/PHPStan/Rules/Variables/data/bug-10418.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace Bug10418;
+
+function (): void {
+	$text = '123';
+	$result = match(1){
+		preg_match('/(\d+)/', $text, $match) => 'matched number: ' . $match[1],
+		preg_match('/(\w+)/', $text, $match) => 'matched word: ' . json_encode($match),
+		default => 'no matches!'
+	};
+};

Original file line number	Diff line number	Diff line change
`@@ -2884,7 +2884,8 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {`
`2884`	`2884`	`);`
`2885`	`2885`	`}`
`2886`	`2886`
`2887`		`- $bodyScope = $matchScope->filterByTruthyValue($filteringExpr);`
	`2887`	`+ $bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {`
	`2888`	`+ }, $deepContext)->getTruthyScope();`
`2888`	`2889`	`$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);`
`2889`	`2890`	`$armNodes[] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getLine());`
`2890`	`2891`