Match expression - fix default handling

phpstan · Dec 9, 2020 · 1dfade1 · 1dfade1
1 parent ccd6f88
commit 1dfade1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/src/Rules/Comparison/MatchExpressionRule.php b/src/Rules/Comparison/MatchExpressionRule.php
@@ -45,15 +45,6 @@ public function processNode(Node $node, Scope $scope): array
 			$armConditions = $arm->getConditions();
 			if (count($armConditions) === 0) {
 				$hasDefault = true;
-				$nextArmIsDead = true;
-				if (
-					$this->checkAlwaysTrueStrictComparison
-					&& ($i !== $armsCount - 1 || $i === 0)
-				) {
-					$errors[] = RuleErrorBuilder::message(
-						'Match arm comparison is always true.'
-					)->line($arm->getLine())->build();
-				}
 			}
 			foreach ($armConditions as $armCondition) {
 				$armConditionScope = $armCondition->getScope();

diff --git a/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php b/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php
@@ -83,18 +83,6 @@ public function testRule(): void
 				'Match arm comparison between 1 and 1 is always true.',
 				70,
 			],
-			[
-				'Match arm comparison is always true.',
-				74,
-			],
-			[
-				'Match arm comparison is always true.',
-				78,
-			],
-			[
-				'Match arm is unreachable because previous comparison is always true.',
-				79,
-			],
 			[
 				'Match arm comparison between true and false is always false.',
 				86,

diff --git a/tests/PHPStan/Rules/Comparison/data/match-expr.php b/tests/PHPStan/Rules/Comparison/data/match-expr.php
@@ -71,12 +71,12 @@ public function doFoo(int $i): void
 		};
 
 		match ($i) {
-			default => 1, // always true - report with strict-rules
+			default => 1,
 		};
 
 		match ($i) {
-			default => 1, // always true - report with strict-rules
-			1 => 2, // unreachable
+			default => 1,
+			1 => 2,
 		};
 	}