Fix get_class() on HasMethodType

src/Type/Php/GetClassDynamicReturnTypeExtension.php

@@ -11,13 +11,13 @@
 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\MixedType;
+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\UnionType;
@@ -64,27 +64,26 @@ static function (Type $type, callable $traverse): Type {
 return new GenericClassStringType(new ObjectType($type->getClassName()));
 }
 
-$objectClassNames = $type->getObjectClassNames();
-if ($type instanceof TemplateType && $objectClassNames === []) {
-if ($type instanceof ObjectWithoutClassType) {
-return new GenericClassStringType($type);
+$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([
-new GenericClassStringType($type),
-new ConstantBooleanType(false),
-]);
-} elseif ($type instanceof MixedType) {
-return new UnionType([
-new ClassStringType(),
+$classStringType,
 new ConstantBooleanType(false),
 ]);
-} elseif ($type instanceof StaticType) {
-return new GenericClassStringType($type->getStaticObjectType());
-} elseif ($objectClassNames !== []) {
-return new GenericClassStringType($type);
-} elseif ($type instanceof ObjectWithoutClassType) {
-return new ClassStringType();
 }
 
 return new ConstantBooleanType(false);

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1181,6 +1181,7 @@ public function dataFileAsserts(): iterable
 yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-union-unshift.php');
 yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7987.php');
 yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7963-three.php');
+yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4890.php');
 yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8017.php');
 yield from $this->gatherAssertTypes(__DIR__ . '/data/global-namespace.php');
 

tests/PHPStan/Analyser/data/bug-3158.php

@@ -61,7 +61,7 @@ function (): void {
 /** @var object $object */
 $object = doFoo();
 $objectClass = get_class($object);
-assertType('class-string', $objectClass);
+assertType('class-string<object>', $objectClass);
 $proxy = createProxy($objectClass, function(AParent $o):void {});
 assertType('object', $proxy);
 };

tests/PHPStan/Analyser/data/bug-4741.php

@@ -9,7 +9,7 @@ class Foo
 
 public function isAnObject($object): void {
 $class = get_class($object);
-assertType('class-string|false', $class);
+assertType('class-string<object>|false', $class);
 }
 
 }

tests/PHPStan/Analyser/data/bug-4890.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Bug4890;
+
+use function PHPStan\Testing\assertType;
+
+interface Proxy {}
+
+class HelloWorld
+{
+public function update(object $entity): void
+{
+assertType('class-string<object>', get_class($entity));
+assert(method_exists($entity, 'getId'));
+assertType('class-string<object&hasMethod(getId)>', get_class($entity));
+
+if ($entity instanceof Proxy) {
+assertType('class-string<Bug4890\Proxy&hasMethod(getId)>', get_class($entity));
+}
+
+$class = $entity instanceof Proxy
+? get_parent_class($entity)
+: get_class($entity);
+assert(is_string($class));
+
+}
+
+public function updateProp(object $entity): void
+{
+assertType('class-string<object>', get_class($entity));
+assert(property_exists($entity, 'myProp'));
+assertType('class-string<object&hasProperty(myProp)>', get_class($entity));
+
+if ($entity instanceof Proxy) {
+assertType('class-string<Bug4890\Proxy&hasProperty(myProp)>', get_class($entity));
+}
+
+$class = $entity instanceof Proxy
+? get_parent_class($entity)
+: get_class($entity);
+assert(is_string($class));
+}
+
+/**
+ * @param object{foo: self, bar: int, baz?: string} $entity
+ */
+public function updateObjectShape($entity): void
+{
+assertType('class-string', get_class($entity));
+assert(property_exists($entity, 'foo'));
+assertType('class-string', get_class($entity));
+}
+}

tests/PHPStan/Analyser/data/generics.php

@@ -1301,7 +1301,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)>|false',
+'class-string<object&T (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>|false',
 get_class($a)
 );
 assertType(
@@ -1325,8 +1325,8 @@ function getClassOnTemplateType($a, $b, $c, $d, $object, $mixed, $tObject)
 get_class($objectB)
 );
 
-assertType('class-string', get_class($object));
-assertType('class-string|false', get_class($mixed));
+assertType('class-string<object>', get_class($object));
+assertType('class-string<object>|false', get_class($mixed));
 assertType('class-string<W of object (function PHPStan\Generics\FunctionsAssertType\getClassOnTemplateType(), argument)>', get_class($tObject));
 }
 

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -1036,4 +1036,11 @@ public function testLooseComparisonAgainstEnumsNoPhpdoc(): void
 $this->analyse([__DIR__ . '/data/loose-comparison-against-enums.php'], $issues);
 }
 
+public function testBug4890b(): void
+{
+$this->checkAlwaysTrueCheckTypeFunctionCall = true;
+$this->treatPhpDocTypesAsCertain = true;
+$this->analyse([__DIR__ . '/data/bug-4890b.php'], []);
+}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-4890b.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Bug4890b;
+
+interface Proxy {}
+
+class HelloWorld
+{
+public function update(object $entity): void
+{
+assert(method_exists($entity, 'getId'));
+
+$class = $entity instanceof Proxy
+? get_parent_class($entity)
+: get_class($entity);
+assert(is_string($class));
+}
+}
+
+