Feature/match expression throws tag

phpstan · Mar 23, 2022 · 2b9d212 · 2b9d212
1 parent 0175bc8
commit 2b9d212
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 48 deletions.
diff --git a/src/Rules/Comparison/MatchExpressionRule.php b/src/Rules/Comparison/MatchExpressionRule.php
@@ -85,7 +85,11 @@ public function processNode(Node $node, Scope $scope): array
 
 		if (!$hasDefault && !$nextArmIsDead) {
 			$remainingType = $node->getEndScope()->getType($matchCondition);
-			if (!$remainingType instanceof NeverType && !$this->isUnhandledMatchErrorCaught($node)) {
+			if (
+				!$remainingType instanceof NeverType
+				&& !$this->isUnhandledMatchErrorCaught($node)
+				&& !$this->hasUnhandledMatchErrorThrowsTag($scope)
+			) {
 				$errors[] = RuleErrorBuilder::message(sprintf(
 					'Match expression does not handle remaining %s: %s',
 					$remainingType instanceof UnionType ? 'values' : 'value',
@@ -122,4 +126,19 @@ private function isUnhandledMatchErrorCaught(Node $node): bool
 		return $this->isUnhandledMatchErrorCaught($tryCatchNode);
 	}
 
+	private function hasUnhandledMatchErrorThrowsTag(Scope $scope): bool
+	{
+		$function = $scope->getFunction();
+		if ($function === null) {
+			return false;
+		}
+
+		$throwsType = $function->getThrowType();
+		if ($throwsType === null) {
+			return false;
+		}
+
+		return $throwsType->isSuperTypeOf(new ObjectType(UnhandledMatchError::class))->yes();
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php b/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php
@@ -96,6 +96,10 @@ public function testRule(): void
 				'Match expression does not handle remaining value: true',
 				90,
 			],
+			[
+				'Match expression does not handle remaining values: int<min, 0>|int<2, max>',
+				168,
+			],
 		]);
 	}
 
@@ -176,7 +180,7 @@ public function testBug6115(): void
 		$this->analyse([__DIR__ . '/data/bug-6115.php'], [
 			[
 				'Match expression does not handle remaining value: 3',
-				28,
+				32,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Comparison/data/bug-6115.php b/tests/PHPStan/Rules/Comparison/data/bug-6115.php
@@ -2,56 +2,63 @@
 
 namespace Bug6115;
 
-$array = [1, 2, 3];
-try {
-	foreach ($array as $value) {
-		$b = match ($value) {
-			1 => 0,
-			2 => 1,
-		};
-	}
-} catch (\UnhandledMatchError $e) {
-}
+class Foo
+{
+	public function bar()
+	{
+		$array = [1, 2, 3];
+		try {
+			foreach ($array as $value) {
+				$b = match ($value) {
+					1 => 0,
+					2 => 1,
+				};
+			}
+		} catch (\UnhandledMatchError $e) {
+		}
 
-try {
-	foreach ($array as $value) {
-		$b = match ($value) {
-			1 => 0,
-			2 => 1,
-		};
-	}
-} catch (\Error $e) {
-}
+		try {
+			foreach ($array as $value) {
+				$b = match ($value) {
+					1 => 0,
+					2 => 1,
+				};
+			}
+		} catch (\Error $e) {
+		}
 
-try {
-	foreach ($array as $value) {
-		$b = match ($value) {
-			1 => 0,
-			2 => 1,
-		};
-	}
-} catch (\Exception $e) {
-}
+		try {
+			foreach ($array as $value) {
+				$b = match ($value) {
+					1 => 0,
+					2 => 1,
+				};
+			}
+		} catch (\Exception $e) {
+		}
 
-try {
-	foreach ($array as $value) {
-		$b = match ($value) {
-			1 => 0,
-			2 => 1,
-		};
-	}
-} catch (\UnhandledMatchError|\Exception $e) {
-}
+		try {
+			foreach ($array as $value) {
+				$b = match ($value) {
+					1 => 0,
+					2 => 1,
+				};
+			}
+		} catch (\UnhandledMatchError|\Exception $e) {
+		}
 
-try {
-	try {
-		foreach ($array as $value) {
-			$b = match ($value) {
-				1 => 0,
-				2 => 1,
-			};
+		try {
+			try {
+				foreach ($array as $value) {
+					$b = match ($value) {
+						1 => 0,
+						2 => 1,
+					};
+				}
+			} catch (\Exception $e) {
+			}
+		} catch (\UnhandledMatchError $e) {
 		}
-	} catch (\Exception $e) {
 	}
-} catch (\UnhandledMatchError $e) {}
+}
 
diff --git a/tests/PHPStan/Rules/Comparison/data/match-expr.php b/tests/PHPStan/Rules/Comparison/data/match-expr.php
@@ -138,3 +138,35 @@ public function doBar(int $i): void {
 
 
 }
+
+class ThrowsTag {
+	/**
+	 * @throws \UnhandledMatchError
+	 */
+	public function foo(int $bar): void
+	{
+		$str = match($bar) {
+			1 => 'test'
+		};
+	}
+
+	/**
+	 * @throws \Error
+	 */
+	public function bar(int $bar): void
+	{
+		$str = match($bar) {
+			1 => 'test'
+		};
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	public function baz(int $bar): void
+	{
+		$str = match($bar) {
+			1 => 'test'
+		};
+	}
+}