More tests

Author: ondrejmirtes

tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php

@@ -358,6 +358,15 @@ public function dataReportAlwaysTrueInLastCondition(): iterable
 				'Match arm is unreachable because previous comparison is always true.',
 				24,
 			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				49,
+				'Remove remaining cases below this one and this error will disappear too.',
+			],
+			[
+				'Match arm is unreachable because previous comparison is always true.',
+				50,
+			],
 		]];
 		yield [true, false, [
 			[
@@ -372,13 +381,30 @@ public function dataReportAlwaysTrueInLastCondition(): iterable
 				'Match arm is unreachable because previous comparison is always true.',
 				24,
 			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				45,
+			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				49,
+			],
+			[
+				'Match arm is unreachable because previous comparison is always true.',
+				50,
+			],
 		]];
 		yield [false, true, [
 			[
 				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
 				23,
 				'Remove remaining cases below this one and this error will disappear too.',
 			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				49,
+				'Remove remaining cases below this one and this error will disappear too.',
+			],
 		]];
 		yield [true, true, [
 			[
@@ -389,6 +415,14 @@ public function dataReportAlwaysTrueInLastCondition(): iterable
 				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
 				23,
 			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				45,
+			],
+			[
+				'Match arm comparison between $this(MatchAlwaysTrueLastArm\Foo)&MatchAlwaysTrueLastArm\Foo::BAR and MatchAlwaysTrueLastArm\Foo::BAR is always true.',
+				49,
+			],
 		]];
 	}
 

tests/PHPStan/Rules/Comparison/data/match-always-true-last-arm.php

@@ -39,4 +39,16 @@ public function doBaz(): void
 		};
 	}
 
+	public function doMoreConditionsInLastArm(): void
+	{
+		match ($this) {
+			self::FOO, self::BAR => 1,
+		};
+
+		match ($this) {
+			self::FOO, self::BAR => 1,
+			default => 2,
+		};
+	}
+
 }