Defer invalidating expressions after all args are processed

ondrejmirtes · ondrejmirtes · commit 2a92c7b4310f · 2026-02-10T17:56:33.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -5549,6 +5549,8 @@ private function processArgs(
 		$throwPoints = [];
 		$impurePoints = [];
 		$isAlwaysTerminating = false;
+		/** @var list<array{InvalidateExprNode[], string[]}> $deferredInvalidateExpressions */
+		$deferredInvalidateExpressions = [];
 		foreach ($args as $i => $arg) {
 			$assignByReference = false;
 			$parameter = null;
@@ -5676,7 +5678,7 @@ private function processArgs(
 					$scope = $scope->restoreThis($restoreThisScope);
 				}
 
-				$scope = $this->processImmediatelyCalledCallable($scope, $invalidateExpressions, $uses);
+				$deferredInvalidateExpressions[] = [$invalidateExpressions, $uses];
 			} elseif ($arg->value instanceof Expr\ArrowFunction) {
 				if (
 					$closureBindScope === null
@@ -5717,7 +5719,7 @@ private function processArgs(
 				if ($exprType->isCallable()->yes()) {
 					$acceptors = $exprType->getCallableParametersAcceptors($scope);
 					if (count($acceptors) === 1) {
-						$scope = $this->processImmediatelyCalledCallable($scope, $acceptors[0]->getInvalidateExpressions(), $acceptors[0]->getUsedVariables());
+						$deferredInvalidateExpressions[] = [$acceptors[0]->getInvalidateExpressions(), $acceptors[0]->getUsedVariables()];
 						if ($this->callCallbackImmediately($parameter, $parameterType, $calleeReflection)) {
 							$callableThrowPoints = array_map(static fn (SimpleThrowPoint $throwPoint) => $throwPoint->isExplicit() ? InternalThrowPoint::createExplicit($scope, $throwPoint->getType(), $arg->value, $throwPoint->canContainAnyThrowable()) : InternalThrowPoint::createImplicit($scope, $arg->value), $acceptors[0]->getThrowPoints());
 							if (!$this->implicitThrows) {
@@ -5747,6 +5749,10 @@ private function processArgs(
 			$scope = $scope->restoreOriginalScopeAfterClosureBind($originalScope);
 		}
 
+		foreach ($deferredInvalidateExpressions as [$invalidateExpressions, $uses]) {
+			$scope = $this->processImmediatelyCalledCallable($scope, $invalidateExpressions, $uses);
+		}
+
 		if ($parameters !== null) {
 			foreach ($args as $i => $arg) {
 				$assignByReference = false;
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -3817,4 +3817,14 @@ public function testBug13993b(): void
 		$this->analyse([__DIR__ . '/../../Analyser/nsrt/closure-passed-to-type-fiberscope-php81.php'], []);
 	}
 
+	public function testDiscussion14038(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+		$this->checkImplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/discussion-14038.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/discussion-14038.php b/tests/PHPStan/Rules/Methods/data/discussion-14038.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace Discussion14038;
+
+use DateTime;
+use Exception;
+
+class HelloWorld
+{
+	private ?DateTime $d = null;
+
+	private function clo(callable $c, DateTime $d): void
+	{
+	}
+
+	protected function redirect(): void
+	{
+	}
+
+	public function sayHello(): void
+	{
+		if ($this->d === null) {
+			throw new Exception;
+		}
+		$this->clo(
+			function(): void {
+				$this->redirect();
+			},
+			$this->d,
+		);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -3817,4 +3817,14 @@ public function testBug13993b(): void`
`3817`	`3817`	`$this->analyse([__DIR__ . '/../../Analyser/nsrt/closure-passed-to-type-fiberscope-php81.php'], []);`
`3818`	`3818`	`}`
`3819`	`3819`
	`3820`	`+ public function testDiscussion14038(): void`
	`3821`	`+ {`
	`3822`	`+ $this->checkThisOnly = false;`
	`3823`	`+ $this->checkNullables = true;`
	`3824`	`+ $this->checkUnionTypes = true;`
	`3825`	`+ $this->checkExplicitMixed = true;`
	`3826`	`+ $this->checkImplicitMixed = true;`
	`3827`	`+ $this->analyse([__DIR__ . '/data/discussion-14038.php'], []);`
	`3828`	`+ }`
	`3829`	`+`
`3820`	`3830`	`}`