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

src/PhpDoc/PhpDocBlock.php

@@ -195,7 +195,22 @@ public static function resolvePhpDocBlockForMethod(
 		array $newPositionalParameterNames,
 	): self
 	{
-		$parentReflections = self::getParentReflections($classReflection);
+		$docBlocksFromParents = [];
+		foreach (self::getParentReflections($classReflection) as $parentReflection) {
+			$oneResult = self::resolveMethodPhpDocBlockFromClass(
+				$parentReflection,
+				$methodName,
+				$explicit ?? $docComment !== null,
+				$newPositionalParameterNames,
+			);
+
+			if ($oneResult === null) { // Null if it is private or from a wrong trait.
+				continue;
+			}
+
+			$docBlocksFromParents[] = $oneResult;
+		}
+
 		foreach ($classReflection->getTraits(true) as $traitReflection) {
 			if (!$traitReflection->hasNativeMethod($methodName)) {
 				continue;
@@ -210,23 +225,21 @@ public static function resolvePhpDocBlockForMethod(
 				continue;
 			}
 
-			$parentReflections[] = $traitReflection;
-		}
-
-		$docBlocksFromParents = [];
-		foreach ($parentReflections as $parentReflection) {
-			$oneResult = self::resolveMethodPhpDocBlockFromClass(
-				$parentReflection,
-				$methodName,
-				$explicit ?? $docComment !== null,
-				$newPositionalParameterNames,
-			);
-
-			if ($oneResult === null) { // Null if it is private or from a wrong trait.
-				continue;
+			$methodVariant = $traitMethod->getOnlyVariant();
+			$positionalMethodParameterNames = [];
+			foreach ($methodVariant->getParameters() as $methodParameter) {
+				$positionalMethodParameterNames[] = $methodParameter->getName();
 			}
 
-			$docBlocksFromParents[] = $oneResult;
+			$docBlocksFromParents[] = new self(
+				$traitMethod->getDocComment() ?? ResolvedPhpDocBlock::EMPTY_DOC_STRING,
+				$classReflection->getFileName(),
+				$classReflection,
+				$traitReflection->getName(),
+				$explicit ?? $traitMethod->getDocComment() !== null,
+				self::remapParameterNames($newPositionalParameterNames, $positionalMethodParameterNames),
+				[],
+			);
 		}
 
 		return new self(

tests/PHPStan/Analyser/nsrt/abstract-generic-trait-method-implicit-phpdoc-inheritance.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace AbstractGenericTraitMethodImplicitPhpDocInheritance;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T
+ */
+trait Foo
+{
+
+	/** @return T */
+	abstract public function doFoo();
+}
+
+class UseFoo
+{
+
+	/** @use Foo<int> */
+	use Foo;
+
+	public function doFoo()
+	{
+		return 1;
+	}
+
+}
+
+function (UseFoo $f): void {
+	assertType('int', $f->doFoo());
+};