LastConditionVisitor - consider last condition in last arm

Author: ondrejmirtes

src/Parser/LastConditionVisitor.php

@@ -31,7 +31,7 @@ public function enterNode(Node $node): ?Node
 				}
 
 				$isLast = $i === $lastArm;
-				$arm->conds[0]->setAttribute(self::ATTRIBUTE_NAME, $isLast);
+				$arm->conds[count($arm->conds) - 1]->setAttribute(self::ATTRIBUTE_NAME, $isLast);
 			}
 		}
 

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -813,6 +813,11 @@ public function dataLastMatchArm(): iterable
 				62,
 				'Remove remaining cases below this one and this error will disappear too.',
 			],
+			[
+				"Strict comparison using === between 'bbb' and 'bbb' will always evaluate to true.",
+				79,
+				'Remove remaining cases below this one and this error will disappear too.',
+			],
 		]];
 		yield [true, [
 			[
@@ -839,6 +844,14 @@ public function dataLastMatchArm(): iterable
 				"Strict comparison using === between 'bbb' and 'bbb' will always evaluate to true.",
 				62,
 			],
+			[
+				"Strict comparison using === between 'bbb' and 'bbb' will always evaluate to true.",
+				75,
+			],
+			[
+				"Strict comparison using === between 'bbb' and 'bbb' will always evaluate to true.",
+				79,
+			],
 		]];
 	}
 

tests/PHPStan/Rules/Comparison/data/strict-comparison-last-match-arm.php

@@ -64,4 +64,21 @@ public function doIpsum(): void
 		};
 	}
 
+	public function doMoreConditionsInLastArm(): void
+	{
+		$a = 'aaa';
+		if (rand(0, 1)) {
+			$a = 'bbb';
+		}
+
+		match (true) {
+			$a === 'aaa', $a === 'bbb' => 1,
+		};
+
+		match (true) {
+			$a === 'aaa', $a === 'bbb' => 1,
+			default => new \Exception(),
+		};
+	}
+
 }