Fix double processing of match with enum condition

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -4090,6 +4090,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$hasDefaultCond = false;
 			$hasAlwaysTrueCond = false;
 			$arms = $expr->arms;
+			$armCondsToSkip = [];
 			if ($condType->isEnum()->yes()) {
 				// enum match analysis would work even without this if branch
 				// but would be much slower
@@ -4110,7 +4111,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 						$condNodes = [];
 						$conditionCases = [];
 						$conditionExprs = [];
-						foreach ($arm->conds as $cond) {
+						foreach ($arm->conds as $j => $cond) {
 							if (!$cond instanceof Expr\ClassConstFetch) {
 								continue 2;
 							}
@@ -4170,6 +4171,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 							$conditionExprs[] = $cond;
 
 							unset($unusedIndexedEnumCases[$loweredFetchedClassName][$caseName]);
+							$armCondsToSkip[$i][$j] = true;
 						}
 
 						$conditionCasesCount = count($conditionCases);
@@ -4246,7 +4248,10 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$filteringExprs = [];
 				$armCondScope = $matchScope;
 				$condNodes = [];
-				foreach ($arm->conds as $armCond) {
+				foreach ($arm->conds as $j => $armCond) {
+					if (isset($armCondsToSkip[$i][$j])) {
+						continue;
+					}
 					$condNodes[] = new MatchExpressionArmCondition($armCond, $armCondScope, $armCond->getStartLine());
 					$armCondResult = $this->processExprNode($stmt, $armCond, $armCondScope, $storage, $nodeCallback, $deepContext);
 					$hasYield = $hasYield || $armCondResult->hasYield();

tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php

@@ -148,10 +148,6 @@ public function testEnums(): void
 				'Match arm comparison between MatchEnums\Foo and MatchEnums\Foo::ONE is always false.',
 				104,
 			],
-			[
-				'Match arm comparison between *NEVER* and MatchEnums\Foo::ONE is always false.',
-				113,
-			],
 			[
 				'Match arm comparison between *NEVER* and MatchEnums\DifferentEnum::ONE is always false.',
 				113,