Implicit throw point is enough to no longer mark multi-catch as dead

ondrejmirtes · ondrejmirtes · commit c587dd1d870f · 2023-06-07T23:45:21.000+02:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -433,11 +433,6 @@ parameters:
 			count: 6
 			path: src/Reflection/InitializerExprTypeResolver.php
 
-		-
-			message: "#^Dead catch \\- PHPStan\\\\BetterReflection\\\\Identifier\\\\Exception\\\\InvalidIdentifierName is never thrown in the try block\\.$#"
-			count: 1
-			path: src/Reflection/SignatureMap/NativeFunctionReflectionProvider.php
-
 		-
 			message: "#^Creating new PHPStan\\\\Php8StubsMap is not covered by backward compatibility promise\\. The class might change in a minor PHPStan version\\.$#"
 			count: 1
@@ -1772,11 +1767,6 @@ parameters:
 			count: 1
 			path: tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
 
-		-
-			message: "#^Dead catch \\- OutOfBoundsException is never thrown in the try block\\.$#"
-			count: 1
-			path: tests/PHPStan/Reflection/SignatureMap/SignatureMapParserTest.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class PHPStan\\\\Rules\\\\Arrays\\\\AppendedArrayItemTypeRule\\:
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1294,17 +1294,16 @@ private function processStmtNode(
 				// explicit only
 				if (count($matchingThrowPoints) === 0) {
 					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
-						if (!$throwPoint->isExplicit()) {
-							continue;
-						}
-
 						foreach ($catchTypes as $catchTypeIndex => $catchTypeItem) {
 							if ($catchTypeItem->isSuperTypeOf($throwPoint->getType())->no()) {
 								continue;
 							}
 
-							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
 							$matchingCatchTypes[$catchTypeIndex] = true;
+							if (!$throwPoint->isExplicit()) {
+								continue;
+							}
+							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
 						}
 					}
 				}
@@ -1322,7 +1321,6 @@ private function processStmtNode(
 							}
 
 							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
-							$matchingCatchTypes[$catchTypeIndex] = true;
 						}
 					}
 				}
diff --git a/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php b/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php
@@ -475,4 +475,9 @@ public function testMagicMethods(): void
 		]);
 	}
 
+	public function testBug9406(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9406.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Exceptions/data/bug-9406.php b/tests/PHPStan/Rules/Exceptions/data/bug-9406.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Bug9406;
+
+function foo(): void
+{
+	if ($_POST['foo'] === null) {
+		throw new \InvalidArgumentException('Foo');
+	}
+}
+
+
+function app(): void
+{
+	try {
+		foo();
+
+		if ($_POST['bar'] === null) {
+			throw new \RuntimeException('Bar');
+		}
+	} catch (\RuntimeException|\InvalidArgumentException $e) {
+
+	}
+}
+
+function app2(): void
+{
+	try {
+		foo();
+
+		if ($_POST['bar'] === null) {
+			throw new \RuntimeException('Bar');
+		}
+	} catch (\InvalidArgumentException $e) {
+
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1294,17 +1294,16 @@ private function processStmtNode(`
`1294`	`1294`	`// explicit only`
`1295`	`1295`	`if (count($matchingThrowPoints) === 0) {`
`1296`	`1296`	`foreach ($throwPoints as $throwPointIndex => $throwPoint) {`
`1297`		`- if (!$throwPoint->isExplicit()) {`
`1298`		`- continue;`
`1299`		`- }`
`1300`		`-`
`1301`	`1297`	`foreach ($catchTypes as $catchTypeIndex => $catchTypeItem) {`
`1302`	`1298`	`if ($catchTypeItem->isSuperTypeOf($throwPoint->getType())->no()) {`
`1303`	`1299`	`continue;`
`1304`	`1300`	`}`
`1305`	`1301`
`1306`		`- $matchingThrowPoints[$throwPointIndex] = $throwPoint;`
`1307`	`1302`	`$matchingCatchTypes[$catchTypeIndex] = true;`
	`1303`	`+ if (!$throwPoint->isExplicit()) {`
	`1304`	`+ continue;`
	`1305`	`+ }`
	`1306`	`+ $matchingThrowPoints[$throwPointIndex] = $throwPoint;`
`1308`	`1307`	`}`
`1309`	`1308`	`}`
`1310`	`1309`	`}`
`@@ -1322,7 +1321,6 @@ private function processStmtNode(`
`1322`	`1321`	`}`
`1323`	`1322`
`1324`	`1323`	`$matchingThrowPoints[$throwPointIndex] = $throwPoint;`
`1325`		`- $matchingCatchTypes[$catchTypeIndex] = true;`
`1326`	`1324`	`}`
`1327`	`1325`	`}`
`1328`	`1326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,4 +475,9 @@ public function testMagicMethods(): void`
`475`	`475`	`]);`
`476`	`476`	`}`
`477`	`477`
	`478`	`+ public function testBug9406(): void`
	`479`	`+ {`
	`480`	`+ $this->analyse([__DIR__ . '/data/bug-9406.php'], []);`
	`481`	`+ }`
	`482`	`+`
`478`	`483`	`}`