Introduce new method

VincentLanglet · VincentLanglet · commit eac96dbdd1c0 · 2026-02-01T14:48:05.000+01:00
diff --git a/src/Type/Accessory/HasMethodType.php b/src/Type/Accessory/HasMethodType.php
@@ -15,6 +15,7 @@
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\StringType;
@@ -58,6 +59,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
@@ -11,6 +11,7 @@
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
@@ -52,6 +53,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
@@ -297,6 +297,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;
@@ -222,6 +223,11 @@ public function getEnumCaseObject(): ?EnumCaseObjectType
 		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/TemplateMixedType.php b/src/Type/Generic/TemplateMixedType.php
@@ -63,4 +63,9 @@ public function toStrictMixedType(): TemplateStrictMixedType
 		);
 	}
 
+	public function getClassStringType(): Type
+	{
+		return new GenericClassStringType($this);
+	}
+
 }
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
@@ -520,6 +520,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
@@ -392,6 +392,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
@@ -114,6 +114,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
@@ -53,6 +53,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
@@ -22,6 +22,7 @@
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
+use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
@@ -90,6 +91,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;
@@ -919,6 +920,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
@@ -50,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
@@ -10,15 +10,8 @@
 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\Generic\TemplateType;
 use PHPStan\Type\IntersectionType;
-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\UnionType;
@@ -62,27 +55,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
@@ -198,6 +198,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
@@ -111,6 +111,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
@@ -89,6 +89,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
@@ -22,6 +22,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/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));
diff --git a/tests/PHPStan/Analyser/nsrt/generics.php b/tests/PHPStan/Analyser/nsrt/generics.php
@@ -1316,7 +1316,7 @@ function arrayOfGenericClassStrings(array $a): void
 function getClassOnTemplateType($a, $b, $c, $d, $object, $mixed, $tObject)
 {
 	assertType(
-		'class-string<object&T (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>|false',
+		'class-string<T (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>|false',
 		get_class($a)
 	);
 	assertType(

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,11 @@ public function isObject(): TrinaryLogic`
`297`	`297`	`return $this->objectType->isObject();`
`298`	`298`	`}`
`299`	`299`
	`300`	`+ public function getClassStringType(): Type`
	`301`	`+ {`
	`302`	`+ return $this->objectType->getClassStringType();`
	`303`	`+ }`
	`304`	`+`
`300`	`305`	`public function isEnum(): TrinaryLogic`
`301`	`306`	`{`
`302`	`307`	`return $this->objectType->isEnum();`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,9 @@ public function toStrictMixedType(): TemplateStrictMixedType`
`63`	`63`	`);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public function getClassStringType(): Type`
	`67`	`+ {`
	`68`	`+ return new GenericClassStringType($this);`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`}`
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
`@@ -520,6 +520,11 @@ public function isObject(): TrinaryLogic`
`520`	`520`	`return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isObject());`
`521`	`521`	`}`
`522`	`522`
	`523`	`+ public function getClassStringType(): Type`
	`524`	`+ {`
	`525`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getClassStringType());`
	`526`	`+ }`
	`527`	`+`
`523`	`528`	`public function isEnum(): TrinaryLogic`
`524`	`529`	`{`
`525`	`530`	`return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isEnum());`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,11 @@ public function isObject(): TrinaryLogic`
`392`	`392`	`return TrinaryLogic::createMaybe();`
`393`	`393`	`}`
`394`	`394`
	`395`	`+ public function getClassStringType(): Type`
	`396`	`+ {`
	`397`	`+ return new ClassStringType();`
	`398`	`+ }`
	`399`	`+`
`395`	`400`	`public function isEnum(): TrinaryLogic`
`396`	`401`	`{`
`397`	`402`	`if ($this->subtractedType !== null) {`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,11 @@ public function isObject(): TrinaryLogic`
`114`	`114`	`return TrinaryLogic::createNo();`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ public function getClassStringType(): Type`
	`118`	`+ {`
	`119`	`+ return new NeverType();`
	`120`	`+ }`
	`121`	`+`
`117`	`122`	`public function isEnum(): TrinaryLogic`
`118`	`123`	`{`
`119`	`124`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,11 @@ public function isObject(): TrinaryLogic`
`53`	`53`	`return TrinaryLogic::createYes();`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ public function getClassStringType(): Type`
	`57`	`+ {`
	`58`	`+ return new ClassStringType();`
	`59`	`+ }`
	`60`	`+`
`56`	`61`	`public function isEnum(): TrinaryLogic`
`57`	`62`	`{`
`58`	`63`	`return TrinaryLogic::createNo();`