Fix throw points not properly matched to catch clauses

- Always include implicit throw points when matching to catch clauses,
  regardless of whether explicit non-throw-statement matches exist
- Previously, when a method with @throws matched a catch clause, implicit
  throw points from other method calls were excluded from the catch scope
- This caused variables assigned between the two calls to be incorrectly
  reported as "Undefined variable" instead of "might not be defined"
- Removed unused $onlyExplicitIsThrow flag and InternalThrowPoint::getNode()
- Updated test expectations in bug-4821.php and explicit-throws.php to
  reflect the corrected (more sound) behavior

Closes phpstan/phpstan#9349

Author: github-actions[bot]

src/Analyser/InternalThrowPoint.php

@@ -70,14 +70,6 @@ public function getType(): Type
 		return $this->type;
 	}
 
-	/**
-	 * @return Node\Expr|Node\Stmt
-	 */
-	public function getNode()
-	{
-		return $this->node;
-	}
-
 	public function isExplicit(): bool
 	{
 		return $this->explicit;

src/Analyser/NodeScopeResolver.php

@@ -1915,7 +1915,6 @@ private function processStmtNode(
 				}
 
 				// explicit only
-				$onlyExplicitIsThrow = true;
 				if (count($matchingThrowPoints) === 0) {
 					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
 						foreach ($catchTypes as $catchTypeIndex => $catchTypeItem) {
@@ -1927,32 +1926,23 @@ private function processStmtNode(
 							if (!$throwPoint->isExplicit()) {
 								continue;
 							}
-							$throwNode = $throwPoint->getNode();
-							if (
-								!$throwNode instanceof Expr\Throw_
-								&& !($throwNode instanceof Node\Stmt\Expression && $throwNode->expr instanceof Expr\Throw_)
-							) {
-								$onlyExplicitIsThrow = false;
-							}
 							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
 						}
 					}
 				}
 
-				// implicit only
-				if (count($matchingThrowPoints) === 0 || $onlyExplicitIsThrow) {
-					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
-						if ($throwPoint->isExplicit()) {
+				// implicit
+				foreach ($throwPoints as $throwPointIndex => $throwPoint) {
+					if ($throwPoint->isExplicit()) {
+						continue;
+					}
+
+					foreach ($catchTypes as $catchTypeItem) {
+						if ($catchTypeItem->isSuperTypeOf($throwPoint->getType())->no()) {
 							continue;
 						}
 
-						foreach ($catchTypes as $catchTypeItem) {
-							if ($catchTypeItem->isSuperTypeOf($throwPoint->getType())->no()) {
-								continue;
-							}
-
-							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
-						}
+						$matchingThrowPoints[$throwPointIndex] = $throwPoint;
 					}
 				}
 

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

@@ -16,7 +16,7 @@ public function sayHello(): void
 			return;
 		} catch (\ReflectionException $e) {
 			assertVariableCertainty(TrinaryLogic::createYes(), $object);
-			assertVariableCertainty(TrinaryLogic::createNo(), $method);
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $method);
 		}
 	}
 

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

@@ -26,7 +26,7 @@ public function doBar(): void
 			$a = 1;
 			$this->throwInvalidArgument();
 		} catch (\InvalidArgumentException $e) {
-			assertVariableCertainty(TrinaryLogic::createYes(), $a);
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
 		}
 	}
 
@@ -38,7 +38,7 @@ public function doBaz(): void
 			$this->throwInvalidArgument();
 			throw new \InvalidArgumentException();
 		} catch (\InvalidArgumentException $e) {
-			assertVariableCertainty(TrinaryLogic::createYes(), $a);
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
 		}
 	}
 

tests/PHPStan/Analyser/nsrt/throw-points/bug-9349.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace ThrowPoints\Bug9349;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertType;
+use function PHPStan\Testing\assertVariableCertainty;
+
+class Foo
+{
+	/**
+	 * @throws \RuntimeException
+	 */
+	public function throwsRuntime(): void
+	{
+	}
+
+	/**
+	 * @throws \LogicException
+	 */
+	public function throwsLogic(): void
+	{
+	}
+
+	/** @return mixed */
+	public function doSomething(): void
+	{
+	}
+}
+
+function (Foo $foo): void {
+	try {
+		$foo->throwsRuntime();
+		$sql = 'SELECT * FROM foo';
+		$foo->doSomething();
+	} catch (\PDOException $e) {
+		// throwsRuntime() declares @throws RuntimeException
+		// PDOException extends RuntimeException, so throwsRuntime()
+		// might throw a PDOException before $sql is assigned.
+		// But doSomething() also has implicit throws after $sql is assigned.
+		// So $sql might or might not be defined.
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $sql);
+	}
+};
+
+function (Foo $foo): void {
+	try {
+		$foo->throwsLogic();
+		$sql = 'SELECT * FROM foo';
+		$foo->doSomething();
+	} catch (\PDOException $e) {
+		// LogicException and PDOException are unrelated
+		// Only implicit throws from doSomething() can reach here
+		// $sql is assigned before doSomething()
+		assertVariableCertainty(TrinaryLogic::createYes(), $sql);
+	}
+};