Fix scope in enum match arm body

Author: dmytro-dymarchuk

src/Analyser/NodeScopeResolver.php

@@ -3644,6 +3644,7 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 
 						$condNodes = [];
 						$conditionCases = [];
+						$conditionExprs = [];
 						foreach ($arm->conds as $cond) {
 							if (!$cond instanceof Expr\ClassConstFetch) {
 								continue 2;
@@ -3701,6 +3702,7 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 								$armConditionScope,
 								$cond->getStartLine(),
 							);
+							$conditionExprs[] = $cond;
 
 							unset($unusedIndexedEnumCases[$loweredFetchedClassName][$caseName]);
 						}
@@ -3714,10 +3716,11 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 							$conditionCaseType = new UnionType($conditionCases);
 						}
 
+						$filteringExpr = $this->getFilteringExprForMatchArm($expr, $conditionExprs);
 						$matchArmBodyScope = $matchScope->addTypeToExpression(
 							$expr->cond,
 							$conditionCaseType,
-						);
+						)->filterByTruthyValue($filteringExpr);
 						$matchArmBody = new MatchExpressionArmBody($matchArmBodyScope, $arm->body);
 						$armNodes[$i] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getStartLine());
 
@@ -3793,22 +3796,7 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 					$filteringExprs[] = $armCond;
 				}
 
-				if (count($filteringExprs) === 1) {
-					$filteringExpr = new BinaryOp\Identical($expr->cond, $filteringExprs[0]);
-				} else {
-					$items = [];
-					foreach ($filteringExprs as $filteringExpr) {
-						$items[] = new Node\ArrayItem($filteringExpr);
-					}
-					$filteringExpr = new FuncCall(
-						new Name\FullyQualified('in_array'),
-						[
-							new Arg($expr->cond),
-							new Arg(new Array_($items)),
-							new Arg(new ConstFetch(new Name\FullyQualified('true'))),
-						],
-					);
-				}
+				$filteringExpr = $this->getFilteringExprForMatchArm($expr, $filteringExprs);
 
 				$bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
 				}, $deepContext)->getTruthyScope();
@@ -6591,4 +6579,28 @@ private function getNextUnreachableStatements(array $nodes, bool $earlyBinding):
 		return $stmts;
 	}
 
+	/**
+	 * @param array<Expr> $conditions
+	 */
+	public function getFilteringExprForMatchArm(Expr\Match_ $expr, array $conditions): BinaryOp\Identical|FuncCall
+	{
+		if (count($conditions) === 1) {
+			return new BinaryOp\Identical($expr->cond, $conditions[0]);
+		}
+
+		$items = [];
+		foreach ($conditions as $filteringExpr) {
+			$items[] = new Node\ArrayItem($filteringExpr);
+		}
+
+		return new FuncCall(
+			new Name\FullyQualified('in_array'),
+			[
+				new Arg($expr->cond),
+				new Arg(new Array_($items)),
+				new Arg(new ConstFetch(new Name\FullyQualified('true'))),
+			],
+		);
+	}
+
 }

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -102,6 +102,7 @@ private static function findTestFiles(): iterable
 			define('TEST_ARRAY_CONSTANT', [true, false, null]);
 			define('TEST_ENUM_CONSTANT', Foo::ONE);
 			yield __DIR__ . '/data/new-in-initializers-runtime.php';
+			yield __DIR__ . '/data/scope-in-enum-match-arm-body.php';
 		}
 
 		yield __DIR__ . '/../Rules/Comparison/data/bug-6473.php';

tests/PHPStan/Analyser/data/scope-in-enum-match-arm-body.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace ScopeInEnumMatchArmBody;
+
+use function PHPStan\Testing\assertType;
+
+enum Foo: int
+{
+	case ALLOW_NULLABLE_INT = 1;
+	case ALLOW_ONLY_INT = 2;
+
+	public function bar(?int $nullable): void
+	{
+		if ($nullable === null && $this === self::ALLOW_ONLY_INT) {
+			throw new \LogicException('Cannot be null');
+		}
+
+		match ($this) {
+			self::ALLOW_ONLY_INT => assertType('int', $nullable),
+			self::ALLOW_NULLABLE_INT => assertType('int|null', $nullable),
+		};
+	}
+}
+
+
+