Functions and methods returning exceptions do not have implicit @throws

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -1779,7 +1779,10 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						$throwPoints[] = ThrowPoint::createExplicit($scope, $throwType, true);
 					}
 				} elseif ($this->implicitThrows) {
-					$throwPoints[] = ThrowPoint::createImplicit($scope);
+					$functionReturnedType = $scope->getType($expr);
+					if (!(new ObjectType(\Throwable::class))->isSuperTypeOf($functionReturnedType)->yes()) {
+						$throwPoints[] = ThrowPoint::createImplicit($scope);
+					}
 				}
 			} else {
 				$throwPoints[] = ThrowPoint::createImplicit($scope);
@@ -1953,7 +1956,10 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 							$throwPoints[] = ThrowPoint::createExplicit($scope, $methodReflection->getThrowType(), true);
 						}
 					} elseif ($this->implicitThrows) {
-						$throwPoints[] = ThrowPoint::createImplicit($scope);
+						$methodReturnedType = $scope->getType($expr);
+						if (!(new ObjectType(\Throwable::class))->isSuperTypeOf($methodReturnedType)->yes()) {
+							$throwPoints[] = ThrowPoint::createImplicit($scope);
+						}
 					}
 				} else {
 					$throwPoints[] = ThrowPoint::createImplicit($scope);
@@ -2017,7 +2023,10 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 								$throwPoints[] = ThrowPoint::createExplicit($scope, $throwType, true);
 							}
 						} elseif ($this->implicitThrows) {
-							$throwPoints[] = ThrowPoint::createImplicit($scope);
+							$methodReturnedType = $scope->getType($expr);
+							if (!(new ObjectType(\Throwable::class))->isSuperTypeOf($methodReturnedType)->yes()) {
+								$throwPoints[] = ThrowPoint::createImplicit($scope);
+							}
 						}
 						if (
 							$classReflection->getName() === 'Closure'

tests/PHPStan/Analyser/data/throw-points/try-catch.php

@@ -27,6 +27,19 @@ public static function myRand(): int
 
 	}
 
+	public static function createException(): MyInvalidArgumentException
+	{
+
+	}
+
+	/**
+	 * @throws MyRuntimeException
+	 */
+	public static function createExceptionOrThrow(): MyInvalidArgumentException
+	{
+
+	}
+
 }
 
 function (): void {
@@ -105,3 +118,66 @@ function (): void {
 		assertVariableCertainty(TrinaryLogic::createYes(), $foo);
 	}
 };
+
+function (): void {
+	try {
+		if (Foo::myRand() === 0) {
+			$foo = 1;
+			throw Foo::createException();
+		}
+
+		if (Foo::myRand() === 1) {
+			$bar = 1;
+			throw Foo::createExceptionOrThrow();
+		}
+	} catch (MyInvalidArgumentException $e) {
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $foo);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $bar);
+	} catch (\Throwable $e) {
+		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
+		assertVariableCertainty(TrinaryLogic::createYes(), $bar);
+	}
+};
+
+function (): void {
+	try {
+		if (Foo::myRand() === 0) {
+			$foo = 1;
+			throw Foo::createException();
+		}
+
+		if (Foo::myRand() === 1) {
+			$bar = 1;
+			throw Foo::createExceptionOrThrow();
+		}
+	} catch (MyInvalidArgumentException $e) {
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $foo);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $bar);
+	} catch (\Exception $e) {
+		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
+		assertVariableCertainty(TrinaryLogic::createYes(), $bar);
+	}
+};
+
+function (): void {
+	try {
+		if (Foo::myRand() === 0) {
+			$foo = 1;
+			throw Foo::createException();
+		}
+
+		if (Foo::myRand() === 1) {
+			$bar = 1;
+			throw Foo::createExceptionOrThrow();
+		}
+	} catch (MyInvalidArgumentException $e) {
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $foo);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $bar);
+	} catch (\Exception $e) {
+		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
+		assertVariableCertainty(TrinaryLogic::createYes(), $bar);
+	} catch (\Throwable $e) {
+		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
+		assertVariableCertainty(TrinaryLogic::createYes(), $bar);
+	}
+};