Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/Reflection/Type/CalledOnTypeUnresolvedMethodPrototypeReflection.php

@@ -119,7 +119,7 @@ private function transformStaticType(Type $type): Type
 		return TypeTraverser::map($type, function (Type $type, callable $traverse): Type {
 			if ($type instanceof GenericStaticType) {
 				if ($this->calledOnType instanceof ObjectType) {
-					return new GenericObjectType($this->calledOnType->getClassName(), $type->getTypes());
+					return $traverse(new GenericObjectType($this->calledOnType->getClassName(), $type->getTypes()));
 				}
 
 				return $this->calledOnType;

src/Type/StaticType.php

@@ -286,10 +286,10 @@ private function transformStaticType(Type $type, ClassMemberAccessAnswerer $scop
 				}
 				$type = $type->changeBaseClass($classReflection);
 				if (!$isFinal || $type instanceof ThisType) {
-					return $type;
+					return $traverse($type);
 				}
 
-				return $type->getStaticObjectType();
+				return $traverse($type->getStaticObjectType());
 			}
 
 			return $traverse($type);

tests/PHPStan/Analyser/nsrt/generic-static.php

@@ -24,6 +24,9 @@ public function flip();
 	/** @return static<T, U> */
 	public function fluent();
 
+	/** @return static<T, static<U>> */
+	public function nested();
+
 }
 
 /**
@@ -57,6 +60,7 @@ public function doFoo(): void
 
 		assertType('static(GenericStatic\FooImpl<U (class GenericStatic\FooImpl, argument), T (class GenericStatic\FooImpl, argument)>)', $this->flip());
 		assertType('static(GenericStatic\FooImpl<T (class GenericStatic\FooImpl, argument), U (class GenericStatic\FooImpl, argument)>)', $this->fluent());
+		assertType('static(GenericStatic\FooImpl<T (class GenericStatic\FooImpl, argument), static(GenericStatic\FooImpl<U (class GenericStatic\FooImpl, argument), mixed>)>)', $this->nested());
 	}
 
 	/**
@@ -70,6 +74,7 @@ public function doBar(self $s): void
 
 		assertType('GenericStatic\\FooImpl<float, string>', $s->flip());
 		assertType('GenericStatic\\FooImpl<string, float>', $s->fluent());
+		assertType('GenericStatic\FooImpl<string, GenericStatic\FooImpl<float>>', $s->nested());
 	}
 
 }