Introduce new method

VincentLanglet · VincentLanglet · commit 1ce9e0470bc8 · 2025-12-06T14:28:41.000+01:00
diff --git a/src/Type/Accessory/HasMethodType.php b/src/Type/Accessory/HasMethodType.php
@@ -14,6 +14,7 @@
 use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\StringType;
@@ -57,6 +58,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 	private function getCanonicalMethodName(): string
 	{
 		return strtolower($this->methodName);
diff --git a/src/Type/Accessory/HasPropertyType.php b/src/Type/Accessory/HasPropertyType.php
@@ -10,6 +10,7 @@
 use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
@@ -51,6 +52,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -295,6 +295,11 @@ public function isObject(): TrinaryLogic
 		return $this->objectType->isObject();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return $this->objectType->getClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return $this->objectType->isEnum();
diff --git a/src/Type/Enum/EnumCaseObjectType.php b/src/Type/Enum/EnumCaseObjectType.php
@@ -18,6 +18,7 @@
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\GeneralizePrecision;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
@@ -217,6 +218,11 @@ public function getEnumCases(): array
 		return [$this];
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType(new ObjectType($this->getClassName()));
+	}
+
 	public function toPhpDocNode(): TypeNode
 	{
 		return new ConstTypeNode(
diff --git a/src/Type/Generic/TemplateObjectWithoutClassType.php b/src/Type/Generic/TemplateObjectWithoutClassType.php
@@ -36,4 +36,9 @@ public function __construct(
 		$this->default = $default;
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 }
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -497,6 +497,11 @@ public function isObject(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isObject());
 	}
 
+	public function getClassStringType(): Type
+	{
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getClassStringType());
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isEnum());
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -386,6 +386,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		if ($this->subtractedType !== null) {
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -113,6 +113,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new NeverType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/NonexistentParentClassType.php b/src/Type/NonexistentParentClassType.php
@@ -52,6 +52,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/ObjectShapeType.php b/src/Type/ObjectShapeType.php
@@ -21,6 +21,7 @@
 use PHPStan\Type\Accessory\HasPropertyType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
@@ -89,6 +90,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 	public function hasProperty(string $propertyName): TrinaryLogic
 	{
 		return $this->hasInstanceProperty($propertyName);
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -40,6 +40,7 @@
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\Traits\MaybeIterableTypeTrait;
@@ -916,6 +917,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		$classReflection = $this->getClassReflection();
diff --git a/src/Type/ObjectWithoutClassType.php b/src/Type/ObjectWithoutClassType.php
@@ -4,6 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
 use PHPStan\Type\Traits\ObjectTypeTrait;
@@ -49,6 +50,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ClassStringType();
+	}
+
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
 		if ($type instanceof CompoundType) {
diff --git a/src/Type/Php/GetClassDynamicReturnTypeExtension.php b/src/Type/Php/GetClassDynamicReturnTypeExtension.php
@@ -22,6 +22,8 @@
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
+use PHPStan\Type\VerbosityLevel;
+
 use function count;
 
 #[AutowiredService]
@@ -62,27 +64,12 @@ static function (Type $type, callable $traverse): Type {
 					return $traverse($type);
 				}
 
-				if ($type instanceof EnumCaseObjectType) {
-					return new GenericClassStringType(new ObjectType($type->getClassName()));
-				}
-
 				$isObject = $type->isObject();
 				if ($isObject->no()) {
 					return new ConstantBooleanType(false);
 				}
 
-				if ($type instanceof StaticType) {
-					$objectType = $type->getStaticObjectType();
-				} else {
-					$objectType = TypeCombinator::intersect($type, new ObjectWithoutClassType());
-				}
-
-				if (!$objectType instanceof TemplateType && $objectType instanceof ObjectWithoutClassType) {
-					$classStringType = new ClassStringType();
-				} else {
-					$classStringType = new GenericClassStringType($objectType);
-				}
-
+				$classStringType = $type->getClassStringType();
 				if ($isObject->yes()) {
 					return $classStringType;
 				}
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -194,6 +194,11 @@ public function isObject(): TrinaryLogic
 		return $this->getStaticObjectType()->isObject();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return $this->getStaticObjectType()->getClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return $this->getStaticObjectType()->isEnum();
diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
@@ -110,6 +110,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ErrorType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -88,6 +88,11 @@ public function isObject(): TrinaryLogic
 		return $this->resolve()->isObject();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return $this->resolve()->getClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return $this->resolve()->isEnum();
diff --git a/src/Type/Traits/MaybeObjectTypeTrait.php b/src/Type/Traits/MaybeObjectTypeTrait.php
@@ -14,6 +14,7 @@
 use PHPStan\Reflection\Type\UnresolvedMethodPrototypeReflection;
 use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\ClassStringType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
@@ -30,6 +31,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ClassStringType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/Traits/NonObjectTypeTrait.php b/src/Type/Traits/NonObjectTypeTrait.php
@@ -21,6 +21,11 @@ public function isObject(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new ErrorType();
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
@@ -17,7 +17,9 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
+use PHPStan\Type\ClassStringType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -40,6 +40,8 @@ public function getObjectClassNames(): array;
 	 */
 	public function getObjectClassReflections(): array;
 
+	public function getClassStringType(): Type;
+
 	/**
 	 * Returns object type Foo for class-string<Foo> and 'Foo' (if Foo is a valid class).
 	 */
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -449,6 +449,11 @@ public function isObject(): TrinaryLogic
 		return $this->unionResults(static fn (Type $type): TrinaryLogic => $type->isObject());
 	}
 
+	public function getClassStringType(): Type
+	{
+		return $this->unionTypes(static fn (Type $type): Type => $type->getClassStringType());
+	}
+
 	public function isEnum(): TrinaryLogic
 	{
 		return $this->unionResults(static fn (Type $type): TrinaryLogic => $type->isEnum());
diff --git a/tests/PHPStan/Analyser/nsrt/bug-4890.php b/tests/PHPStan/Analyser/nsrt/bug-4890.php
@@ -12,7 +12,7 @@ public function update(object $entity): void
 	{
 		assertType('class-string', get_class($entity));
 		assert(method_exists($entity, 'getId'));
-		assertType('class-string<object&hasMethod(getId)>', get_class($entity));
+		assertType('class-string<hasMethod(getId)>', get_class($entity));
 
 		if ($entity instanceof Proxy) {
 			assertType('class-string<Bug4890\Proxy&hasMethod(getId)>', get_class($entity));
@@ -29,7 +29,7 @@ public function updateProp(object $entity): void
 	{
 		assertType('class-string', get_class($entity));
 		assert(property_exists($entity, 'myProp'));
-		assertType('class-string<object&hasProperty(myProp)>', get_class($entity));
+		assertType('class-string<hasProperty(myProp)>', get_class($entity));
 
 		if ($entity instanceof Proxy) {
 			assertType('class-string<Bug4890\Proxy&hasProperty(myProp)>', get_class($entity));

Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,11 @@ public function isObject(): TrinaryLogic`
`295`	`295`	`return $this->objectType->isObject();`
`296`	`296`	`}`
`297`	`297`
	`298`	`+ public function getClassStringType(): Type`
	`299`	`+ {`
	`300`	`+ return $this->objectType->getClassStringType();`
	`301`	`+ }`
	`302`	`+`
`298`	`303`	`public function isEnum(): TrinaryLogic`
`299`	`304`	`{`
`300`	`305`	`return $this->objectType->isEnum();`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,9 @@ public function __construct(`
`36`	`36`	`$this->default = $default;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ public function getClassStringType(): Type`
	`40`	`+ {`
	`41`	`+ return new GenericClassStringType($this);`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,11 @@ public function isObject(): TrinaryLogic`
`497`	`497`	`return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isObject());`
`498`	`498`	`}`
`499`	`499`
	`500`	`+ public function getClassStringType(): Type`
	`501`	`+ {`
	`502`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getClassStringType());`
	`503`	`+ }`
	`504`	`+`
`500`	`505`	`public function isEnum(): TrinaryLogic`
`501`	`506`	`{`
`502`	`507`	`return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isEnum());`
Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,11 @@ public function isObject(): TrinaryLogic`
`386`	`386`	`return TrinaryLogic::createMaybe();`
`387`	`387`	`}`
`388`	`388`
	`389`	`+ public function getClassStringType(): Type`
	`390`	`+ {`
	`391`	`+ return new ClassStringType();`
	`392`	`+ }`
	`393`	`+`
`389`	`394`	`public function isEnum(): TrinaryLogic`
`390`	`395`	`{`
`391`	`396`	`if ($this->subtractedType !== null) {`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,11 @@ public function isObject(): TrinaryLogic`
`113`	`113`	`return TrinaryLogic::createNo();`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public function getClassStringType(): Type`
	`117`	`+ {`
	`118`	`+ return new NeverType();`
	`119`	`+ }`
	`120`	`+`
`116`	`121`	`public function isEnum(): TrinaryLogic`
`117`	`122`	`{`
`118`	`123`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ public function isObject(): TrinaryLogic`
`52`	`52`	`return TrinaryLogic::createYes();`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ public function getClassStringType(): Type`
	`56`	`+ {`
	`57`	`+ return new ClassStringType();`
	`58`	`+ }`
	`59`	`+`
`55`	`60`	`public function isEnum(): TrinaryLogic`
`56`	`61`	`{`
`57`	`62`	`return TrinaryLogic::createNo();`