Fix phpstan/phpstan#14318: False positive variable might not be defined in catch block

- Moved method call throw point creation to after processArgs in MethodCallHandler
- Applied the same fix to StaticCallHandler for consistency
- The throw point scope now includes variables assigned in function arguments
- New regression test in tests/PHPStan/Rules/Variables/data/bug-14318.php

Author: VincentLanglet

src/Analyser/ExprHandler/MethodCallHandler.php

@@ -110,10 +110,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 					$methodReflection->getNamedArgumentsVariants(),
 				);
 
-				$methodThrowPoint = $this->getMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
-				if ($methodThrowPoint !== null) {
-					$throwPoints[] = $methodThrowPoint;
-				}
 			}
 		} else {
 			$methodNameResult = $nodeScopeResolver->processExprNode($stmt, $expr->name, $scope, $storage, $nodeCallback, $context->enterDeep());
@@ -157,6 +153,13 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		$scope = $argsResult->getScope();
 
 		if ($methodReflection !== null) {
+			if ($parametersAcceptor !== null) {
+				$methodThrowPoint = $this->getMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
+				if ($methodThrowPoint !== null) {
+					$throwPoints[] = $methodThrowPoint;
+				}
+			}
+
 			if ($methodReflection->getName() === '__construct' || $methodReflection->hasSideEffects()->yes()) {
 				$nodeScopeResolver->callNodeCallback($nodeCallback, new InvalidateExprNode($normalizedExpr->var), $scope, $storage);
 				$scope = $scope->invalidateExpression($normalizedExpr->var, true, $methodReflection->getDeclaringClass());

src/Analyser/ExprHandler/StaticCallHandler.php

@@ -103,11 +103,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 						$methodReflection->getNamedArgumentsVariants(),
 					);
 
-					$methodThrowPoint = $this->getStaticMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
-					if ($methodThrowPoint !== null) {
-						$throwPoints[] = $methodThrowPoint;
-					}
-
 					$declaringClass = $methodReflection->getDeclaringClass();
 					if (
 						$declaringClass->getName() === 'Closure'
@@ -203,6 +198,13 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		$scope = $argsResult->getScope();
 		$scopeFunction = $scope->getFunction();
 
+		if ($methodReflection !== null && $parametersAcceptor !== null) {
+			$methodThrowPoint = $this->getStaticMethodThrowPoint($methodReflection, $parametersAcceptor, $expr, $scope);
+			if ($methodThrowPoint !== null) {
+				$throwPoints[] = $methodThrowPoint;
+			}
+		}
+
 		if (
 			$methodReflection !== null
 			&& (

tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php

@@ -1422,6 +1422,16 @@ public function testBug9349(): void
 		]);
 	}
 
+	public function testBug14318(): void
+	{
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = false;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+
+		$this->analyse([__DIR__ . '/data/bug-14318.php'], []);
+	}
+
 	#[RequiresPhp('>= 8.0')]
 	public function testBug14274(): void
 	{

tests/PHPStan/Rules/Variables/data/bug-14318.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14318;
+
+class HelloWorld5
+{
+	public function test5(): void
+	{
+		global $pdo;
+
+		try {
+			$this->maybeThrows5($sql = "SELECT * FROM foo");
+			$rs = $pdo->query($sql);
+			if ($result = $rs->fetch(\PDO::FETCH_ASSOC)) {
+				// do something
+			}
+		} catch (\PDOException $e) {
+			var_dump($sql);
+		}
+	}
+
+	/**
+	 * @throws \RuntimeException
+	 */
+	public function maybeThrows5(string $s): void
+	{
+		if (random_int(0, 1) === 1) {
+			throw new \RuntimeException();
+		}
+	}
+}
+
+class HelloWorld6
+{
+	public function test6(): void
+	{
+		global $pdo;
+
+		try {
+			$this->maybeThrows6(strlen($sql = "SELECT * FROM foo"));
+			$rs = $pdo->query($sql);
+			if ($result = $rs->fetch(\PDO::FETCH_ASSOC)) {
+				// do something
+			}
+		} catch (\PDOException $e) {
+			var_dump($sql);
+		}
+	}
+
+	/**
+	 * @throws \RuntimeException
+	 */
+	public function maybeThrows6(int $s): void
+	{
+		if (random_int(0, 1) === 1) {
+			throw new \RuntimeException();
+		}
+	}
+}