Fixed resolving static on static

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -3617,7 +3617,7 @@ private function methodCallReturnType(Type $calledOnType, Type $typeWithMethod,
 		)->getReturnType();
 
 		if ($methodCall instanceof MethodCall) {
-			$calledOnThis = $calledOnType instanceof ThisType && $this->isInClass();
+			$calledOnThis = $calledOnType instanceof StaticType && $this->isInClass();
 		} else {
 			if (!$methodCall->class instanceof Name) {
 				$calledOnThis = false;
@@ -3673,7 +3673,7 @@ private function propertyFetchType(Type $fetchedOnType, string $propertyName, Ex
 		}
 
 		if ($propertyFetch instanceof PropertyFetch) {
-			$fetchedOnThis = $fetchedOnType instanceof ThisType && $this->isInClass();
+			$fetchedOnThis = $fetchedOnType instanceof StaticType && $this->isInClass();
 		} else {
 			if (!$propertyFetch->class instanceof Name) {
 				$fetchedOnThis = false;

tests/PHPStan/Analyser/data/static-methods.php

@@ -22,6 +22,7 @@ public function staticMethod()
 	public function doFoo()
 	{
 		assertType('array<static(StaticMethods\Foo)>', $this->method());
+		assertType('array<static(StaticMethods\Foo)>', $this->method()[0]->method());
 		assertType('array<static(StaticMethods\Foo)>', self::staticMethod());
 		assertType('array<static(StaticMethods\Foo)>', static::staticMethod());
 	}
@@ -34,6 +35,7 @@ class Bar extends Foo
 	public function doFoo()
 	{
 		assertType('array<static(StaticMethods\Bar)>', $this->method());
+		assertType('array<static(StaticMethods\Bar)>', $this->method()[0]->method());
 		assertType('array<static(StaticMethods\Bar)>', self::staticMethod());
 		assertType('array<static(StaticMethods\Bar)>', static::staticMethod());
 	}
@@ -43,6 +45,7 @@ public function doFoo()
 function (Foo $foo, Bar $bar) {
 	assertType('array<StaticMethods\Foo>', $foo->method());
 	assertType('array<StaticMethods\Bar>', $bar->method());
+	assertType('array<StaticMethods\Bar>', $bar->method()[0]->method());
 
 	assertType('array<StaticMethods\Foo>', Foo::staticMethod());
 	assertType('array<StaticMethods\Bar>', Bar::staticMethod());

tests/PHPStan/Analyser/data/static-properties.php

@@ -16,6 +16,7 @@ class Foo
 	public function doFoo()
 	{
 		assertType('array<static(StaticProperties\Foo)>', $this->prop);
+		assertType('array<static(StaticProperties\Foo)>', $this->prop[0]->prop);
 		assertType('array<static(StaticProperties\Foo)>', self::$staticProp);
 		assertType('array<static(StaticProperties\Foo)>', static::$staticProp);
 	}
@@ -28,6 +29,7 @@ class Bar extends Foo
 	public function doFoo()
 	{
 		assertType('array<static(StaticProperties\Bar)>', $this->prop);
+		assertType('array<static(StaticProperties\Bar)>', $this->prop[0]->prop);
 		assertType('array<static(StaticProperties\Bar)>', self::$staticProp);
 		assertType('array<static(StaticProperties\Bar)>', static::$staticProp);
 	}

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -350,4 +350,9 @@ public function testBug2676(): void
 		$this->analyse([__DIR__ . '/data/bug-2676.php'], []);
 	}
 
+	public function testBug2885(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-2885.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-2885.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Bug2885;
+
+class Test
+{
+	/**
+	 * @return static
+	 */
+	function do()
+	{
+		return $this->do()->do();
+	}
+}