Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

Diff for: src/Reflection/ClassReflection.php

@@ -1364,7 +1364,7 @@ public function getActiveTemplateTypeMap(): TemplateTypeMap
 				if ($type instanceof ErrorType) {
 					$templateType = $templateTypeMap->getType($name);
 					if ($templateType !== null) {
-						return TemplateTypeHelper::resolveToBounds($templateType);
+						return TemplateTypeHelper::resolveToDefaults($templateType);
 					}
 				}
 

Diff for: src/Type/Generic/TemplateTypeHelper.php

@@ -68,6 +68,17 @@ public static function resolveTemplateTypes(
 		});
 	}
 
+	public static function resolveToDefaults(Type $type): Type
+	{
+		return TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
+			if ($type instanceof TemplateType) {
+				return $traverse($type->getDefault() ?? $type->getBound());
+			}
+
+			return $traverse($type);
+		});
+	}
+
 	public static function resolveToBounds(Type $type): Type
 	{
 		return TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {

Diff for: src/Type/ObjectType.php

@@ -827,7 +827,7 @@ public function getTemplateType(string $ancestorClassName, string $templateTypeN
 				return new MixedType(false);
 			}
 
-			return $bound;
+			return TemplateTypeHelper::resolveToDefaults($templateType);
 		}
 
 		return $type;

Diff for: tests/PHPStan/Analyser/nsrt/bug-11899.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Bug11899;
+
+use function PHPStan\Testing\assertType;
+
+abstract class Test {}
+
+interface InvertedQuestions {}
+
+class SomeTest extends Test implements InvertedQuestions {}
+
+/**
+ * @template TTestType = Test
+ * @property-read ?TTestType $test
+ */
+class UserTest {
+	public function __get() : mixed {
+		return new SomeTest();
+	}
+}
+
+function acceptUserTest1(UserTest $ut) : void {
+	assertType('Bug11899\\UserTest', $ut);
+	assertType('Bug11899\\Test|null', $ut->test);
+}
+
+/**
+ * @param UserTest<InvertedQuestions> $ut
+ */
+function acceptUserTest2(UserTest $ut) : void {
+	assertType('Bug11899\\UserTest<Bug11899\\InvertedQuestions>', $ut);
+	assertType('Bug11899\\InvertedQuestions|null', $ut->test);
+}