Decrease usage of TypeTraverser

Author: ondrejmirtes

src/Reflection/ParametersAcceptorSelector.php

@@ -31,20 +31,17 @@
 use PHPStan\Type\CallableType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
-use PHPStan\Type\LateResolvableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
 use function array_is_list;
 use function array_key_exists;
@@ -563,28 +560,28 @@ public static function selectFromArgs(
 
 	private static function hasAcceptorTemplateOrLateResolvableType(ParametersAcceptor $acceptor): bool
 	{
-		if (self::hasTemplateOrLateResolvableType($acceptor->getReturnType())) {
+		if ($acceptor->getReturnType()->hasTemplateOrLateResolvableType()) {
 			return true;
 		}
 
 		foreach ($acceptor->getParameters() as $parameter) {
 			if (
 				$parameter instanceof ExtendedParameterReflection
 				&& $parameter->getOutType() !== null
-				&& self::hasTemplateOrLateResolvableType($parameter->getOutType())
+				&& $parameter->getOutType()->hasTemplateOrLateResolvableType()
 			) {
 				return true;
 			}
 
 			if (
 				$parameter instanceof ExtendedParameterReflection
 				&& $parameter->getClosureThisType() !== null
-				&& self::hasTemplateOrLateResolvableType($parameter->getClosureThisType())
+				&& $parameter->getClosureThisType()->hasTemplateOrLateResolvableType()
 			) {
 				return true;
 			}
 
-			if (!self::hasTemplateOrLateResolvableType($parameter->getType())) {
+			if (!$parameter->getType()->hasTemplateOrLateResolvableType()) {
 				continue;
 			}
 
@@ -594,20 +591,6 @@ private static function hasAcceptorTemplateOrLateResolvableType(ParametersAccept
 		return false;
 	}
 
-	private static function hasTemplateOrLateResolvableType(Type $type): bool
-	{
-		$has = false;
-		TypeTraverser::map($type, static function (Type $type, callable $traverse) use (&$has): Type {
-			if ($type instanceof TemplateType || $type instanceof LateResolvableType) {
-				$has = true;
-			}
-
-			return $has ? $type : $traverse($type);
-		});
-
-		return $has;
-	}
-
 	/**
 	 * @param array<int|string, Type> $types
 	 * @param ParametersAcceptor[] $parametersAcceptors

src/Type/Accessory/AccessoryArrayListType.php

@@ -504,4 +504,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('list');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryLiteralStringType.php

@@ -375,4 +375,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('literal-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryLowercaseStringType.php

@@ -380,4 +380,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('lowercase-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -387,4 +387,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('non-empty-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -375,4 +375,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('non-falsy-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryNumericStringType.php

@@ -392,4 +392,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('numeric-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/AccessoryUppercaseStringType.php

@@ -380,4 +380,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode('uppercase-string');
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/HasMethodType.php

@@ -191,4 +191,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode(''); // no PHPDoc representation
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return false;
+	}
+
 }

src/Type/Accessory/HasOffsetType.php

@@ -437,4 +437,9 @@ public function toPhpDocNode(): TypeNode
 		return new IdentifierTypeNode(''); // no PHPDoc representation
 	}
 
+	public function hasTemplateOrLateResolvableType(): bool
+	{
+		return $this->offsetType->hasTemplateOrLateResolvableType();
+	}
+
 }