extract LateResolvableTraverser

Author: staabm

phpstan-baseline.neon

@@ -1689,6 +1689,12 @@ parameters:
 			count: 2
 			path: src/Type/StringType.php
 
+		-
+			rawMessage: 'Doing instanceof PHPStan\Type\CallableType is error-prone and deprecated. Use Type::isCallable() and Type::getCallableParametersAcceptors() instead.'
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Type/Traverser/LateResolvableTraverser.php
+
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\ArrayType is error-prone and deprecated. Use Type::isArray() or Type::getArrays() instead.'
 			identifier: phpstanApi.instanceofType

src/Type/Traverser/LateResolvableTraverser.php

@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Traverser;
+
+use PHPStan\Type\CallableType;
+use PHPStan\Type\ClosureType;
+use PHPStan\Type\LateResolvableType;
+use PHPStan\Type\Type;
+
+final class LateResolvableTraverser
+{
+
+	private int $ignoreResolveUnresolvableTypesLevel;
+
+	public function __construct(
+		private readonly bool $resolveUnresolvableTypes,
+	)
+	{
+		$this->ignoreResolveUnresolvableTypesLevel = 0;
+	}
+
+	/**
+	 * @param callable(Type): Type $traverse
+	 */
+	public function __invoke(Type $type, callable $traverse): Type
+	{
+		while ($type instanceof LateResolvableType && (($this->resolveUnresolvableTypes && $this->ignoreResolveUnresolvableTypesLevel === 0) || $type->isResolvable())) {
+			$type = $type->resolve();
+		}
+
+		if ($type instanceof CallableType || $type instanceof ClosureType) {
+			$this->ignoreResolveUnresolvableTypesLevel++;
+			$result = $traverse($type);
+			$this->ignoreResolveUnresolvableTypesLevel--;
+
+			return $result;
+		}
+
+		return $traverse($type);
+	}
+
+}

src/Type/TypeUtils.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\Generic\TemplateBenevolentUnionType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateUnionType;
+use PHPStan\Type\Traverser\LateResolvableTraverser;
 use function array_merge;
 
 /**
@@ -233,24 +234,7 @@ public static function containsTemplateType(Type $type): bool
 
 	public static function resolveLateResolvableTypes(Type $type, bool $resolveUnresolvableTypes = true): Type
 	{
-		/** @var int $ignoreResolveUnresolvableTypesLevel */
-		$ignoreResolveUnresolvableTypesLevel = 0;
-
-		return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($resolveUnresolvableTypes, &$ignoreResolveUnresolvableTypesLevel): Type {
-			while ($type instanceof LateResolvableType && (($resolveUnresolvableTypes && $ignoreResolveUnresolvableTypesLevel === 0) || $type->isResolvable())) {
-				$type = $type->resolve();
-			}
-
-			if ($type instanceof CallableType || $type instanceof ClosureType) {
-				$ignoreResolveUnresolvableTypesLevel++;
-				$result = $traverse($type);
-				$ignoreResolveUnresolvableTypesLevel--;
-
-				return $result;
-			}
-
-			return $traverse($type);
-		});
+		return TypeTraverser::map($type, new LateResolvableTraverser($resolveUnresolvableTypes));
 	}
 
 }