Address review: reorder conditions and fix closure cache key collision

phpstan-bot · ondrejmirtes · phpstan-bot · commit 4f0994ea8f5b · 2026-02-23T09:08:25.000Z
- Move $parametersAcceptor !== null check before hasSideEffects()-&gt;maybe()
  for function calls
- Move $scope-&gt;isInClass() and getClassReflection()-&gt;is() checks before
  hasSideEffects()-&gt;maybe() for static method calls
- Fix closure type cache key collision between PHPDoc-aware and native
  scopes by including nativeTypesPromoted flag in getClosureScopeCacheKey()
- Revert native-types-81.php test expectations back to original values

Co-authored-by: Ondřej Mirtes &lt;ondrejmirtes@users.noreply.github.com&gt;
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1050,6 +1050,10 @@ private function getClosureScopeCacheKey(): string
 			$parts[] = sprintf(',%s', $parameter->getType()->describe(VerbosityLevel::cache()));
 		}
 
+		if ($this->nativeTypesPromoted) {
+			$parts[] = '::native';
+		}
+
 		return md5(implode("\n", $parts));
 	}
 
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2924,9 +2924,9 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			if (
 				$functionReflection !== null
 				&& $this->rememberPossiblyImpureFunctionValues
+				&& $parametersAcceptor !== null
 				&& $functionReflection->hasSideEffects()->maybe()
 				&& !$functionReflection->isBuiltin()
-				&& $parametersAcceptor !== null
 			) {
 				$scope = $scope->assignExpression(
 					new PossiblyImpureCallExpr($normalizedExpr, $normalizedExpr, sprintf('%s()', $functionReflection->getName())),
@@ -3452,11 +3452,11 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			} elseif (
 				$methodReflection !== null
 				&& $this->rememberPossiblyImpureFunctionValues
-				&& $methodReflection->hasSideEffects()->maybe()
-				&& !$methodReflection->getDeclaringClass()->isBuiltin()
 				&& $parametersAcceptor !== null
 				&& $scope->isInClass()
 				&& $scope->getClassReflection()->is($methodReflection->getDeclaringClass()->getName())
+				&& $methodReflection->hasSideEffects()->maybe()
+				&& !$methodReflection->getDeclaringClass()->isBuiltin()
 			) {
 				$scope = $scope->assignExpression(
 					new PossiblyImpureCallExpr($normalizedExpr, new Variable('this'), sprintf('%s::%s()', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName())),
diff --git a/tests/PHPStan/Analyser/nsrt/native-types-81.php b/tests/PHPStan/Analyser/nsrt/native-types-81.php
@@ -25,12 +25,12 @@ public function doFoo(): void
 		};
 
 		assertType('non-empty-string', $f());
-		assertNativeType('string', $f());
+		assertNativeType('non-empty-string', $f());
 
 		assertType('non-empty-string', (function (): string {
 			return funcWithANativeReturnType();
 		})());
-		assertNativeType('string', (function (): string {
+		assertNativeType('non-empty-string', (function (): string {
 			return funcWithANativeReturnType();
 		})());
 

Original file line number	Diff line number	Diff line change
`@@ -1050,6 +1050,10 @@ private function getClosureScopeCacheKey(): string`
`1050`	`1050`	`$parts[] = sprintf(',%s', $parameter->getType()->describe(VerbosityLevel::cache()));`
`1051`	`1051`	`}`
`1052`	`1052`
	`1053`	`+ if ($this->nativeTypesPromoted) {`
	`1054`	`+ $parts[] = '::native';`
	`1055`	`+ }`
	`1056`	`+`
`1053`	`1057`	`return md5(implode("\n", $parts));`
`1054`	`1058`	`}`
`1055`	`1059`