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

Author: phpstan-bot

src/PhpDoc/PhpDocBlock.php

@@ -16,6 +16,7 @@
 use PHPStan\Type\TypeTraverser;
 use function array_key_exists;
 use function count;
+use function is_bool;
 use function strtolower;
 use function substr;
 
@@ -128,18 +129,24 @@ public static function resolvePhpDocBlockForProperty(
 		array $newPositionalParameterNames, // unused
 	): self
 	{
-		return self::resolvePhpDocBlockTree(
-			$docComment,
-			$classReflection,
-			$trait,
+		$docBlocksFromParents = self::resolveParentPhpDocBlocks(
+			self::getParentReflections($classReflection),
 			$propertyName,
-			$file,
 			'hasNativeProperty',
 			'getNativeProperty',
 			__FUNCTION__,
-			$explicit,
-			[],
-			[],
+			$explicit ?? $docComment !== null,
+			$newPositionalParameterNames,
+		);
+
+		return new self(
+			$docComment ?? ResolvedPhpDocBlock::EMPTY_DOC_STRING,
+			$file,
+			$classReflection,
+			$trait,
+			$explicit ?? true,
+			self::remapParameterNames($originalPositionalParameterNames, $newPositionalParameterNames),
+			$docBlocksFromParents,
 		);
 	}
 
@@ -158,18 +165,24 @@ public static function resolvePhpDocBlockForConstant(
 		array $newPositionalParameterNames, // unused
 	): self
 	{
-		return self::resolvePhpDocBlockTree(
-			$docComment,
-			$classReflection,
-			null,
+		$docBlocksFromParents = self::resolveParentPhpDocBlocks(
+			self::getParentReflections($classReflection),
 			$constantName,
-			$file,
 			'hasConstant',
 			'getConstant',
 			__FUNCTION__,
-			$explicit,
-			[],
-			[],
+			$explicit ?? $docComment !== null,
+			$newPositionalParameterNames,
+		);
+
+		return new self(
+			$docComment ?? ResolvedPhpDocBlock::EMPTY_DOC_STRING,
+			$file,
+			$classReflection,
+			$trait,
+			$explicit ?? true,
+			self::remapParameterNames($originalPositionalParameterNames, $newPositionalParameterNames),
+			$docBlocksFromParents,
 		);
 	}
 
@@ -188,45 +201,30 @@ public static function resolvePhpDocBlockForMethod(
 		array $newPositionalParameterNames,
 	): self
 	{
-		return self::resolvePhpDocBlockTree(
-			$docComment,
-			$classReflection,
-			$trait,
+		$parentReflections = self::getParentReflections($classReflection);
+		foreach ($classReflection->getTraits(true) as $traitReflection) {
+			if (!$traitReflection->hasNativeMethod($methodName)) {
+				continue;
+			}
+			$traitMethod = $traitReflection->getNativeMethod($methodName);
+			$abstract = $traitMethod->isAbstract();
+			if (is_bool($abstract)) {
+				if (!$abstract) {
+					continue;
+				}
+			} elseif (!$abstract->yes()) {
+				continue;
+			}
+
+			$parentReflections[] = $traitReflection;
+		}
+
+		$docBlocksFromParents = self::resolveParentPhpDocBlocks(
+			$parentReflections,
 			$methodName,
-			$file,
 			'hasNativeMethod',
 			'getNativeMethod',
 			__FUNCTION__,
-			$explicit,
-			$originalPositionalParameterNames,
-			$newPositionalParameterNames,
-		);
-	}
-
-	/**
-	 * @param array<int, string> $originalPositionalParameterNames
-	 * @param array<int, string> $newPositionalParameterNames
-	 */
-	private static function resolvePhpDocBlockTree(
-		?string $docComment,
-		ClassReflection $classReflection,
-		?string $trait,
-		string $name,
-		?string $file,
-		string $hasMethodName,
-		string $getMethodName,
-		string $resolveMethodName,
-		?bool $explicit,
-		array $originalPositionalParameterNames,
-		array $newPositionalParameterNames,
-	): self
-	{
-		$docBlocksFromParents = self::resolveParentPhpDocBlocks(
-			$classReflection,
-			$name,
-			$hasMethodName,
-			$getMethodName,
-			$resolveMethodName,
 			$explicit ?? $docComment !== null,
 			$newPositionalParameterNames,
 		);
@@ -264,11 +262,12 @@ private static function remapParameterNames(
 	}
 
 	/**
+	 * @param array<int, ClassReflection> $parentReflections
 	 * @param array<int, string> $positionalParameterNames
 	 * @return array<int, self>
 	 */
 	private static function resolveParentPhpDocBlocks(
-		ClassReflection $classReflection,
+		array $parentReflections,
 		string $name,
 		string $hasMethodName,
 		string $getMethodName,
@@ -278,7 +277,6 @@ private static function resolveParentPhpDocBlocks(
 	): array
 	{
 		$result = [];
-		$parentReflections = self::getParentReflections($classReflection);
 
 		foreach ($parentReflections as $parentReflection) {
 			$oneResult = self::resolvePhpDocBlockFromClass(

tests/PHPStan/Analyser/nsrt/inherit-abstract-trait-method-phpdoc.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace InheritAbstractTraitMethodPhpDoc;
+
+use function PHPStan\Testing\assertType;
+
+trait FooTrait
+{
+
+	/** @return int */
+	abstract public function doFoo();
+
+	/** @return int */
+	public function doBar()
+	{
+		return 1;
+	}
+
+}
+
+class Foo
+{
+
+	use FooTrait;
+
+	public function doFoo()
+	{
+		return 1;
+	}
+
+	public function doBar()
+	{
+		return 1;
+	}
+
+}
+
+function (Foo $foo): void {
+	assertType('int', $foo->doFoo());
+	assertType('mixed', $foo->doBar());
+};