StrictComparisonOfDifferentTypesRule - do not report "use match instead" when already in match

Author: ondrejmirtes

src/Parser/LastConditionVisitor.php

@@ -10,6 +10,7 @@ class LastConditionVisitor extends NodeVisitorAbstract
 {
 
 	public const ATTRIBUTE_NAME = 'isLastCondition';
+	public const ATTRIBUTE_IS_MATCH_NAME = 'isMatch';
 
 	public function enterNode(Node $node): ?Node
 	{
@@ -31,7 +32,9 @@ public function enterNode(Node $node): ?Node
 				}
 
 				$isLast = $i === $lastArm;
-				$arm->conds[count($arm->conds) - 1]->setAttribute(self::ATTRIBUTE_NAME, $isLast);
+				$index = count($arm->conds) - 1;
+				$arm->conds[$index]->setAttribute(self::ATTRIBUTE_NAME, $isLast);
+				$arm->conds[$index]->setAttribute(self::ATTRIBUTE_IS_MATCH_NAME, true);
 			}
 		}
 

src/Rules/Comparison/StrictComparisonOfDifferentTypesRule.php

@@ -82,7 +82,11 @@ public function processNode(Node $node, Scope $scope): array
 				$errorBuilder->addTip('Remove remaining cases below this one and this error will disappear too.');
 			}
 
-			if ($leftType->isEnum()->yes() && $rightType->isEnum()->yes()) {
+			if (
+				$leftType->isEnum()->yes()
+				&& $rightType->isEnum()->yes()
+				&& $node->getAttribute(LastConditionVisitor::ATTRIBUTE_IS_MATCH_NAME, false) !== true
+			) {
 				$errorBuilder->addTip('Use match expression instead. PHPStan will report unhandled enum cases.');
 			}
 

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -955,6 +955,11 @@ public function testEnumTips(): void
 				29,
 				'Use match expression instead. PHPStan will report unhandled enum cases.',
 			],
+			[
+				'Strict comparison using === between StrictComparisonEnumTips\SomeEnum::Two and StrictComparisonEnumTips\SomeEnum::Two will always evaluate to true.',
+				50,
+				'Remove remaining cases below this one and this error will disappear too.',
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Comparison/data/strict-comparison-enum-tips.php

@@ -33,4 +33,23 @@ public function exhaustiveWithSafetyCheck2(): int
 		throw new \LogicException('New case added, handling missing');
 	}
 
+	public function exhaustiveWithSafetyCheckInMatchAlready(): int
+	{
+		// not reported by this rule at all
+		return match ($this) {
+			self::One => -1,
+			self::Two => 0,
+			default => throw new \LogicException('New case added, handling missing'),
+		};
+	}
+
+	public function exhaustiveWithSafetyCheckInMatchAlready2(self $self): int
+	{
+		return match (true) {
+			$self === self::One => -1,
+			$self === self::Two => 0,
+			default => throw new \LogicException('New case added, handling missing'),
+		};
+	}
+
 }