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

Author: phpstan-bot

src/Analyser/NodeScopeResolver.php

@@ -4298,9 +4298,10 @@ public function getPhpDocs(Scope $scope, Node\FunctionLike|Node\Stmt\Property $n
 					$docComment,
 				);
 			}
+			$methodNameForInheritance = $node->getAttribute('originalTraitMethodName') ?? $node->name->name;
 			$resolvedPhpDoc = $this->phpDocInheritanceResolver->resolvePhpDocForMethod(
 				$scope->getClassReflection(),
-				$node->name->name,
+				$methodNameForInheritance,
 				$currentResolvedPhpDoc,
 				$positionalParameterNames,
 			);

tests/PHPStan/Analyser/nsrt/bug-9733.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9733;
+
+use function PHPStan\Testing\assertType;
+
+abstract class Base{
+	/**
+	 * @param int[] $array
+	 */
+	abstract public function test(array $array) : void;
+}
+
+trait MyTrait{
+	public function test(array $array) : void{
+		assertType('array<int>', $array);
+	}
+}
+
+class Concrete extends Base{
+	use MyTrait {
+		test as test2;
+	}
+}