Use isFromThrowExpr() instead of the throw point's node shape to decide whether implicit throw points still apply

src/Analyser/StatementsHandler.php

@@ -794,7 +794,9 @@ public function getOverridingThrowPoints(Node\Stmt $statement, MutatingScope $sc
 					return [];
 				}
 
-				return [InternalThrowPoint::createExplicit($scope, $throwsType, $statement, false)];
+				$fromThrowExpr = $statement instanceof Node\Stmt\Expression && $statement->expr instanceof Expr\Throw_;
+
+				return [InternalThrowPoint::createExplicit($scope, $throwsType, $statement, false, $fromThrowExpr)];
 			}
 		}
 

src/Analyser/StmtHandler/TryCatchHandler.php

@@ -142,11 +142,7 @@ public function processStmt(
 						if (!$throwPoint->isExplicit()) {
 							continue;
 						}
-						$throwNode = $throwPoint->getNode();
-						if (
-							!$throwNode instanceof Expr\Throw_
-							&& !($throwNode instanceof Node\Stmt\Expression && $throwNode->expr instanceof Expr\Throw_)
-						) {
+						if (!$throwPoint->isFromThrowExpr()) {
 							$onlyExplicitIsThrow = false;
 						}
 

tests/PHPStan/Analyser/nsrt/bug-14990.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14990;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertType;
+use function PHPStan\Testing\assertVariableCertainty;
+
+class Thing {}
+
+class Db
+{
+	// Throws are only INFERRED from the body (no @throws tag).
+	public static function getThing(): Thing
+	{
+		if (rand(0, 1) === 0) {
+			throw new \Exception('no data');
+		}
+		return new Thing();
+	}
+}
+
+class Helper
+{
+	/** @throws \Exception */
+	public static function mightThrow(): void
+	{
+		if (rand(0, 1)) {
+			throw new \Exception('boom');
+		}
+	}
+}
+
+function doFoo(): void
+{
+	$thing = null;
+
+	try {
+		$thing = Db::getThing();
+		Helper::mightThrow();
+	} catch (\Exception $e) {
+		assertType('Bug14990\Thing|null', $thing);
+		if ($thing === null) {
+			echo 'thing not set';
+		}
+	}
+}
+
+function doBar(): void
+{
+	try {
+		$thing = Db::getThing();
+		Helper::mightThrow();
+	} catch (\Exception $e) {
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $thing);
+	}
+}

tests/PHPStan/Analyser/nsrt/explicit-throws.php

@@ -42,6 +42,98 @@ public function doBaz(): void
 		}
 	}
 
+	public function doThrowInArrowFunctionArg(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			array_map(static fn (int $i) => throw new \InvalidArgumentException(), [1, 2]);
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doThrowInClosureArg(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			array_map(static function (int $i): int {
+				throw new \InvalidArgumentException();
+			}, [1, 2]);
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doThrowInCalledClosure(): void
+	{
+		$callback = static function (): void {
+			throw new \InvalidArgumentException();
+		};
+		try {
+			doFoo();
+			$a = 1;
+			$callback();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doThrowInImmediatelyInvokedClosure(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			(static function (): void {
+				throw new \InvalidArgumentException();
+			})();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doThrowInClosureVariablePassedAsCallable(): void
+	{
+		$callback = static function (int $i): int {
+			throw new \InvalidArgumentException();
+		};
+		try {
+			doFoo();
+			$a = 1;
+			array_map($callback, [1, 2]);
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doAnnotatedThrowStatement(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			/** @throws \InvalidArgumentException */
+			throw new \InvalidArgumentException();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doDocumentedThrowInClosureArg(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			array_map(function (int $i): int {
+				$this->throwInvalidArgument();
+
+				return $i;
+			}, [1, 2]);
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createYes(), $a);
+		}
+	}
+
 	/**
 	 * @throws \InvalidArgumentException
 	 */

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -1264,6 +1264,11 @@ public function testBug14966(): void
 		$this->analyse([__DIR__ . '/data/bug-14966.php'], []);
 	}
 
+	public function testBug14990(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-14990.php'], []);
+	}
+
 	public function testBug14847(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-14847.php'], [