Fix wrong throwpoints with subtracted Throwable type

ondrejmirtes · ondrejmirtes · commit 4b01b38012a6 · 2022-07-12T17:06:35.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1209,6 +1209,7 @@ private function processStmtNode(
 
 				$catchType = TypeCombinator::union(...array_map(static fn (Name $name): Type => new ObjectType($name->toString()), $catchNode->types));
 				$originalCatchType = $catchType;
+				$isThrowable = $originalCatchType instanceof TypeWithClassName && strtolower($originalCatchType->getClassName()) === 'throwable';
 				$catchType = TypeCombinator::remove($catchType, $pastCatchTypes);
 				$pastCatchTypes = TypeCombinator::union($pastCatchTypes, $originalCatchType);
 				$matchingThrowPoints = [];
@@ -1232,6 +1233,9 @@ private function processStmtNode(
 					if ($isSuperType->yes()) {
 						continue;
 					}
+					if ($isThrowable) {
+						continue;
+					}
 					$newThrowPoints[] = $throwPoint->subtractCatchType($catchType);
 				}
 				$throwPoints = $newThrowPoints;
diff --git a/tests/PHPStan/Rules/Exceptions/data/missing-exception-method-throws.php b/tests/PHPStan/Rules/Exceptions/data/missing-exception-method-throws.php
@@ -57,4 +57,32 @@ public function doDolor(): void
 		}
 	}
 
+	public function doSit(): void
+	{
+		try {
+			$this->throwsInterface();
+		} catch (\Throwable $e) {
+
+		}
+	}
+
+	public function doSit2(): void
+	{
+		try {
+			$this->throwsInterface();
+		} catch (\InvalidArgumentException $e) {
+
+		} catch (\Throwable $e) {
+
+		}
+	}
+
+	/**
+	 * @throws \ExtendsThrowable\ExtendsThrowable
+	 */
+	private function throwsInterface(): void
+	{
+
+	}
+
 }
