Make sure late-resolvable types are always resolved

Author: ondrejmirtes

src/Analyser/Generator/ExprAnalysisResult.php

@@ -5,19 +5,24 @@
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeUtils;
 
 final class ExprAnalysisResult
 {
 
+	public readonly Type $type;
+
+	public readonly Type $nativeType;
+
 	public readonly Type $keepVoidType;
 
 	/**
 	 * @param InternalThrowPoint[] $throwPoints
 	 * @param ImpurePoint[] $impurePoints
 	 */
 	public function __construct(
-		public readonly Type $type,
-		public readonly Type $nativeType,
+		Type $type,
+		Type $nativeType,
 		public readonly GeneratorScope $scope,
 		public readonly bool $hasYield,
 		public readonly bool $isAlwaysTerminating,
@@ -29,7 +34,14 @@ public function __construct(
 		?Type $keepVoidType = null,
 	)
 	{
-		$this->keepVoidType = $keepVoidType ?? $type;
+		$this->type = TypeUtils::resolveLateResolvableTypes($type);
+		$this->nativeType = TypeUtils::resolveLateResolvableTypes($nativeType);
+
+		if ($keepVoidType !== null) {
+			$this->keepVoidType = TypeUtils::resolveLateResolvableTypes($keepVoidType);
+		} else {
+			$this->keepVoidType = $this->type;
+		}
 	}
 
 }

src/Analyser/Generator/GeneratorScope.php

@@ -2422,21 +2422,17 @@ public function getAnonymousFunctionReturnType(): ?Type
 	/** @api */
 	public function getType(Expr $node): Type
 	{
-		return TypeUtils::resolveLateResolvableTypes(
-			Fiber::suspend(
-				ExprAnalysisRequest::createNoopRequest($node, $this),
-			)->type,
-		);
+		return Fiber::suspend(
+			ExprAnalysisRequest::createNoopRequest($node, $this),
+		)->type;
 	}
 
 	/** @api */
 	public function getNativeType(Expr $expr): Type
 	{
-		return TypeUtils::resolveLateResolvableTypes(
-			Fiber::suspend(
-				ExprAnalysisRequest::createNoopRequest($expr, $this),
-			)->nativeType,
-		);
+		return Fiber::suspend(
+			ExprAnalysisRequest::createNoopRequest($expr, $this),
+		)->nativeType;
 	}
 
 	public function doNotTreatPhpDocTypesAsCertain(): Scope
@@ -2472,11 +2468,9 @@ private function promoteNativeTypes(): self
 
 	public function getKeepVoidType(Expr $node): Type
 	{
-		return TypeUtils::resolveLateResolvableTypes(
-			Fiber::suspend(
-				ExprAnalysisRequest::createNoopRequest($node, $this),
-			)->keepVoidType,
-		);
+		return Fiber::suspend(
+			ExprAnalysisRequest::createNoopRequest($node, $this),
+		)->keepVoidType;
 	}
 
 	/**