Throwable catch block also uses implicit throw points even when there are explicit ones

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -1170,7 +1170,7 @@ private function processStmtNode(
 					$matchingThrowPoints = [];
 					$newThrowPoints = [];
 					foreach ($throwPoints as $throwPoint) {
-						if (!$throwPoint->isExplicit()) {
+						if (!$throwPoint->isExplicit() && !$catchType->isSuperTypeOf(new ObjectType(\Throwable::class))->yes()) {
 							continue;
 						}
 						$isSuperType = $catchType->isSuperTypeOf($throwPoint->getType());

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -385,6 +385,8 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/DateTimeDynamicReturnTypes.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4821.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4838.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4879.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4820.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-4820.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Bug4820;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertType;
+use function PHPStan\Testing\assertVariableCertainty;
+
+class Param {
+
+	public bool $foo;
+}
+
+class HelloWorld
+{
+	public function sayHello(Param $param): void
+	{
+
+		try {
+			$result = call_user_func([$this, 'mayThrow']);
+			if ($param->foo) {
+				$this->mayThrow();
+			}
+
+		} catch (\Throwable $e) {
+			assertType('bool', $param->foo);
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $result);
+			throw $e;
+		}
+	}
+
+	/**
+	 * @throws \RuntimeException
+	 */
+	private function mayThrow(): void
+	{
+		throw new \RuntimeException();
+	}
+
+}

tests/PHPStan/Analyser/data/bug-4879.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Bug4879;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertVariableCertainty;
+
+class HelloWorld
+{
+	public function sayHello(bool $bool1): void
+	{
+		try {
+			if ($bool1) {
+				throw new \Exception();
+			}
+
+			$var = 'foo';
+
+			$this->test();
+		} catch (\Throwable $ex) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $var);
+		}
+	}
+
+	public function sayHello2(bool $bool1): void
+	{
+		try {
+			if ($bool1) {
+				throw new \Exception();
+			}
+
+			$var = 'foo';
+
+			$this->test();
+		} catch (\Exception $ex) {
+			assertVariableCertainty(TrinaryLogic::createNo(), $var);
+		}
+	}
+
+	public function test(): void
+	{
+		return;
+	}
+}