Support for self in return typehint overriden by static in phpDoc

src/Reflection/Php/PhpMethodReflection.php

@@ -199,6 +199,9 @@ public function getReturnType(): Type
 							$returnType->isNullable() || $this->phpDocReturnType->isNullable()
 						);
 					}
+					if ($returnType->accepts($this->phpDocReturnType)) {
+						return $this->phpDocReturnType;
+					}
 				}
 
 				$this->returnType = $returnType;

src/Type/ObjectType.php

@@ -55,20 +55,29 @@ public function accepts(Type $type): bool
 			return true;
 		}
 
+		if ($type instanceof StaticType) {
+			return $this->checkSubclassAcceptability($type->getBaseClass());
+		}
+
 		if ($type->getClass() === null) {
 			return false;
 		}
 
-		if ($this->getClass() === $type->getClass()) {
+		return $this->checkSubclassAcceptability($type->getClass());
+	}
+
+	private function checkSubclassAcceptability(string $thatClass): bool
+	{
+		if ($this->getClass() === $thatClass) {
 			return true;
 		}
 
-		if (!$this->exists($this->getClass()) || !$this->exists($type->getClass())) {
+		if (!$this->exists($this->getClass()) || !$this->exists($thatClass)) {
 			return false;
 		}
 
 		$thisReflection = new \ReflectionClass($this->getClass());
-		$thatReflection = new \ReflectionClass($type->getClass());
+		$thatReflection = new \ReflectionClass($thatClass);
 
 		if ($thisReflection->isInterface() && $thatReflection->isInterface()) {
 			return $thatReflection->implementsInterface($this->getClass());

src/Type/StaticType.php

@@ -25,6 +25,11 @@ public function getClass()
 		return null;
 	}
 
+	public function getBaseClass(): string
+	{
+		return $this->baseClass;
+	}
+
 	public function isNullable(): bool
 	{
 		return $this->nullable;

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1439,6 +1439,24 @@ public function dataTypeFromMethodPhpDocs(): array
 				'MethodPhpDocsNamespace\FooParent',
 				'parent::doLorem()',
 			],
+			[
+				ObjectType::class,
+				false,
+				'MethodPhpDocsNamespace\Foo',
+				'$this->doLorem()',
+			],
+			[
+				ObjectType::class,
+				false,
+				'MethodPhpDocsNamespace\FooParent',
+				'parent::doIpsum()',
+			],
+			[
+				ObjectType::class,
+				false,
+				'MethodPhpDocsNamespace\Foo',
+				'$this->doIpsum()',
+			],
 		];
 	}
 

tests/PHPStan/Analyser/data/methodPhpDocs-defined.php

@@ -32,21 +32,3 @@ public function doFluentNullable()
 	}
 
 }
-
-class Baz extends Bar
-{
-
-}
-
-class FooParent
-{
-
-	/**
-	 * @return static
-	 */
-	public function doLorem()
-	{
-
-	}
-
-}

tests/PHPStan/Analyser/data/methodPhpDocs-defined2.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace MethodPhpDocsNamespace;
+
+use SomeNamespace\Amet as Dolor;
+
+class FooParent
+{
+
+	/**
+	 * @return static
+	 */
+	public function doLorem()
+	{
+
+	}
+
+	/**
+	 * @return static
+	 */
+	public function doIpsum(): self
+	{
+
+	}
+
+}

tests/PHPStan/Analyser/data/methodPhpDocs-defined3.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MethodPhpDocsNamespace;
+
+use SomeNamespace\Amet as Dolor;
+
+class Baz extends Bar
+{
+
+}