get_class() returns false for mixed argument types

This reverts commit 921f48e.
phpstan · Sep 12, 2021 · e86742d · e86742d
1 parent f76875a
commit e86742d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Type/Php/GetClassDynamicReturnTypeExtension.php b/src/Type/Php/GetClassDynamicReturnTypeExtension.php
@@ -49,9 +49,19 @@ static function (Type $type, callable $traverse): Type {
 				}
 
 				if ($type instanceof TemplateType && !$type instanceof TypeWithClassName) {
-					return new GenericClassStringType($type);
+					if ($type instanceof ObjectWithoutClassType) {
+						return new GenericClassStringType($type);
+					}
+
+					return new UnionType([
+						new GenericClassStringType($type),
+						new ConstantBooleanType(false),
+					]);
 				} elseif ($type instanceof MixedType) {
-					return new ClassStringType();
+					return new UnionType([
+						new ClassStringType(),
+						new ConstantBooleanType(false),
+					]);
 				} elseif ($type instanceof StaticType) {
 					return new GenericClassStringType($type->getStaticObjectType());
 				} elseif ($type instanceof TypeWithClassName) {

diff --git a/tests/PHPStan/Analyser/data/generics.php b/tests/PHPStan/Analyser/data/generics.php
@@ -1299,7 +1299,7 @@ function arrayOfGenericClassStrings(array $a): void
 function getClassOnTemplateType($a, $b, $c, $d, $object, $mixed, $tObject)
 {
 	assertType(
-		'class-string<T (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>',
+		'class-string<T (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>|false',
 		get_class($a)
 	);
 	assertType(
@@ -1324,7 +1324,7 @@ function getClassOnTemplateType($a, $b, $c, $d, $object, $mixed, $tObject)
 	);
 
 	assertType('class-string', get_class($object));
-	assertType('class-string', get_class($mixed));
+	assertType('class-string|false', get_class($mixed));
 	assertType('class-string<W of object (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>', get_class($tObject));
 }