Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/NodeScopeResolver.php

@@ -4402,6 +4402,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				}
 			}
 
+			$scopeForMatchNodeCallback = $scope;
+
 			$isExhaustive = $hasDefaultCond || $hasAlwaysTrueCond;
 			if (!$isExhaustive) {
 				$remainingType = $matchScope->getType($expr->cond);
@@ -4429,7 +4431,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 
 			ksort($armNodes, SORT_NUMERIC);
 
-			$this->callNodeCallback($nodeCallback, new MatchExpressionNode($expr->cond, array_values($armNodes), $expr, $matchScope), $scope, $storage);
+			$this->callNodeCallback($nodeCallback, new MatchExpressionNode($expr->cond, array_values($armNodes), $expr, $matchScope), $scopeForMatchNodeCallback, $storage);
 
 			if ($expr->cond instanceof AlwaysRememberedExpr) {
 				$expr->cond = $expr->cond->getExpr();

tests/PHPStan/Rules/Comparison/MatchCallbackScopeRegressionRule.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Comparison;
+
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+use PHPStan\Node\MatchExpressionNode;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\VerbosityLevel;
+
+/**
+ * This rule exists solely as a regression test for the match expression
+ * callback scope fix. It reports the type of the match condition as seen
+ * from the scope passed to the MatchExpressionNode callback.
+ *
+ * Without the fix, exhaustive match expressions pass the merged arm body
+ * scope to the callback, which contains narrowed types from arm conditions
+ * instead of the original match condition type.
+ *
+ * @implements Rule<MatchExpressionNode>
+ */
+final class MatchCallbackScopeRegressionRule implements Rule
+{
+
+	public function getNodeType(): string
+	{
+		return MatchExpressionNode::class;
+	}
+
+	public function processNode(Node $node, Scope $scope): array
+	{
+		return [
+			RuleErrorBuilder::message(
+				$scope->getType($node->getCondition())->describe(VerbosityLevel::precise()),
+			)->identifier('test.matchCallbackScope')->build(),
+		];
+	}
+
+}

tests/PHPStan/Rules/Comparison/MatchCallbackScopeRegressionTest.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Comparison;
+
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+use PHPUnit\Framework\Attributes\RequiresPhp;
+
+/**
+ * Regression test: the scope passed to the MatchExpressionNode callback
+ * must reflect the original match condition type, not the merged arm body
+ * scope which contains narrowed types from individual arms.
+ *
+ * @extends RuleTestCase<MatchCallbackScopeRegressionRule>
+ */
+class MatchCallbackScopeRegressionTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new MatchCallbackScopeRegressionRule();
+	}
+
+	#[RequiresPhp('>= 8.1')]
+	public function testExhaustiveMatchCallbackScope(): void
+	{
+		$this->analyse([__DIR__ . '/data/match-callback-scope-regression.php'], [
+			[
+				'MatchCallbackScopeRegression\Suit',
+				23,
+			],
+		]);
+	}
+
+}

tests/PHPStan/Rules/Comparison/data/match-callback-scope-regression.php

@@ -0,0 +1,27 @@
+<?php // lint >= 8.1
+
+namespace MatchCallbackScopeRegression;
+
+enum Suit
+{
+	case Hearts;
+	case Diamonds;
+}
+
+class Wrapper
+{
+
+	public function getSuit(): Suit
+	{
+		return Suit::Hearts;
+	}
+
+}
+
+function exhaustiveMatchWithMethodCallReturningEnum(Wrapper $w): void
+{
+	match ($w->getSuit()) {
+		1 => null,
+		default => null,
+	};
+}