Re-introduce TypeTraverser

Author: staabm

src/Type/Php/GetClassDynamicReturnTypeExtension.php

@@ -9,14 +9,17 @@
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\Generic\GenericClassStringType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\ObjectShapeType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
-use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use function count;
 
@@ -50,29 +53,42 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return new ClassStringType();
 		}
 
-		$isObject = $argType->isObject();
-		if ($isObject->yes() || $isObject->maybe()) {
-			if ($argType instanceof ObjectShapeType) {
-				return new ClassStringType();
-			}
-
-			$objectType = TypeCombinator::intersect($argType, new ObjectWithoutClassType());
-			if ($objectType instanceof StaticType) {
-				$objectType = $objectType->getStaticObjectType();
-			}
-			$classStringType = new GenericClassStringType($objectType);
-
-			if ($isObject->yes()) {
-				return $classStringType;
-			}
-
-			return new UnionType([
-				$classStringType,
-				new ConstantBooleanType(false),
-			]);
-		}
-
-		return new ConstantBooleanType(false);
+		return TypeTraverser::map(
+			$argType,
+			static function (Type $type, callable $traverse): Type {
+				if ($type instanceof UnionType || $type instanceof IntersectionType) {
+					return $traverse($type);
+				}
+
+				if ($type instanceof EnumCaseObjectType) {
+					return new GenericClassStringType(new ObjectType($type->getClassName()));
+				}
+
+				$isObject = $type->isObject();
+				if ($isObject->yes() || $isObject->maybe()) {
+					if ($type instanceof ObjectShapeType) {
+						return new ClassStringType();
+					}
+
+					$objectType = TypeCombinator::intersect($type, new ObjectWithoutClassType());
+					if ($objectType instanceof StaticType) {
+						$objectType = $objectType->getStaticObjectType();
+					}
+					$classStringType = new GenericClassStringType($objectType);
+
+					if ($isObject->yes()) {
+						return $classStringType;
+					}
+
+					return new UnionType([
+						$classStringType,
+						new ConstantBooleanType(false),
+					]);
+				}
+
+				return new ConstantBooleanType(false);
+			},
+		);
 	}
 
 }

tests/PHPStan/Analyser/data/generics.php

@@ -1309,10 +1309,8 @@ function getClassOnTemplateType($a, $b, $c, $d, $object, $mixed, $tObject)
 		get_class($b)
 	);
 	assertType(
-	'class-string<'.
-			'U of Exception (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)|'.
-		    'V of DateTimeInterface (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)'.
-		'>',
+		'class-string<U of Exception (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>|' .
+		'class-string<V of DateTimeInterface (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>',
 		get_class($c)
 	);
 	assertType('class-string<Iterator<mixed, DateTimeInterface>>', get_class($d));

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -1035,7 +1035,7 @@ public function testLooseComparisonAgainstEnumsNoPhpdoc(): void
 		$issues = array_values(array_filter($issues, static fn (array $i) => count($i) === 2));
 		$this->analyse([__DIR__ . '/data/loose-comparison-against-enums.php'], $issues);
 	}
-	
+
 	public function testBug4890b(): void
 	{
 		$this->checkAlwaysTrueCheckTypeFunctionCall = true;