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

Author: phpstan-bot

src/Analyser/NodeScopeResolver.php

@@ -4217,25 +4217,28 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 
 						// Pre-validate all conditions before processing to avoid
 						// partial consumption of enum cases when a later condition
-						// causes the arm to be skipped
+						// causes the arm to be skipped.
+						// Use break instead of continue to stop fast-path processing
+						// entirely - subsequent arms must also go through the slow
+						// path to preserve correct evaluation order.
 						foreach ($arm->conds as $cond) {
 							if (!$cond instanceof Expr\ClassConstFetch) {
-								continue 2;
+								break 2;
 							}
 							if (!$cond->class instanceof Name) {
-								continue 2;
+								break 2;
 							}
 							if (!$cond->name instanceof Node\Identifier) {
-								continue 2;
+								break 2;
 							}
 							$fetchedClassName = $scope->resolveName($cond->class);
 							$loweredFetchedClassName = strtolower($fetchedClassName);
 							if (!array_key_exists($loweredFetchedClassName, $indexedEnumCases)) {
-								continue 2;
+								break 2;
 							}
 							$caseName = $cond->name->toString();
 							if (!array_key_exists($caseName, $indexedEnumCases[$loweredFetchedClassName])) {
-								continue 2;
+								break 2;
 							}
 						}
 

tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php

@@ -141,22 +141,17 @@ public function testEnums(): void
 				85,
 			],
 			[
-				'Match arm comparison between *NEVER* and MatchEnums\DifferentEnum::ONE is always false.',
+				'Match arm comparison between MatchEnums\Foo::THREE|MatchEnums\Foo::TWO and MatchEnums\DifferentEnum::ONE is always false.',
 				95,
 			],
 			[
 				'Match arm comparison between MatchEnums\Foo and MatchEnums\Foo::ONE is always false.',
 				104,
 			],
 			[
-				'Match arm comparison between *NEVER* and MatchEnums\DifferentEnum::ONE is always false.',
+				'Match arm comparison between MatchEnums\Foo::THREE|MatchEnums\Foo::TWO and MatchEnums\DifferentEnum::ONE is always false.',
 				113,
 			],
-			[
-				'Match arm comparison between MatchEnums\Foo::ONE and MatchEnums\Foo::ONE is always true.',
-				113,
-				'Remove remaining cases below this one and this error will disappear too.',
-			],
 		]);
 	}