Address review: reorder conditions and fix closure cache key collision

- Move $parametersAcceptor !== null check before hasSideEffects()->maybe()
  for function calls
- Move $scope->isInClass() and getClassReflection()->is() checks before
  hasSideEffects()->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 <ondrejmirtes@users.noreply.github.com>

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -145,7 +145,6 @@
 use Throwable;
 use ValueError;
 use function abs;
-use function assert;
 use function array_filter;
 use function array_key_exists;
 use function array_key_first;
@@ -157,6 +156,7 @@
 use function array_slice;
 use function array_unique;
 use function array_values;
+use function assert;
 use function count;
 use function explode;
 use function get_class;
@@ -1040,6 +1040,9 @@ private function getClosureScopeCacheKey(): string
 	{
 		$parts = [];
 		foreach ($this->expressionTypes as $exprString => $expressionTypeHolder) {
+			if ($expressionTypeHolder->getExpr() instanceof VirtualNode) {
+				continue;
+			}
 			$parts[] = sprintf('%s::%s', $exprString, $expressionTypeHolder->getType()->describe(VerbosityLevel::cache()));
 		}
 		$parts[] = '---';

src/Analyser/NodeScopeResolver.php

@@ -2941,9 +2941,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())),
@@ -3469,11 +3469,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())),

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();
 		})());