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

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -728,8 +728,8 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 
 			$resolvedPhpDoc = $this->phpDocInheritanceResolver->resolvePhpDocForMethod(
 				$docComment,
-				$fileDeclaringClass->getFileName(),
-				$fileDeclaringClass,
+				$actualDeclaringClass->getFileName(),
+				$actualDeclaringClass,
 				$declaringTraitName,
 				$methodReflection->getName(),
 				$positionalParameterNames,

tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php

@@ -530,4 +530,15 @@ public function testBug3580(): void
 		$this->analyse([__DIR__ . '/data/bug-3580.php'], []);
 	}
 
+	public function testOverridenAbstractTraitMethodPhpDoc(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->reportMaybes = true;
+		$this->reportStatic = true;
+		$this->analyse([__DIR__ . '/data/overriden-abstract-trait-method-phpdoc.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/overriden-abstract-trait-method-phpdoc.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace OverridenAbstractTraitMethodPhpDoc;
+
+/**
+ * @template DataArray of array<string, mixed>
+ */
+trait FooTrait
+{
+	/**
+	 * Offset checker
+	 *
+	 * @phpstan-param Offset $offset
+	 * @return bool
+	 * @template Offset of key-of<DataArray>
+	 */
+	abstract public function offsetExists(mixed $offset): bool;
+}
+
+/**
+ * @template DataArray of array<string, mixed>
+ * @phpstan-type DataKey key-of<DataArray>
+ * @phpstan-type DataValue DataArray[DataKey]
+ */
+class FooClass
+{
+
+	/** @phpstan-use FooTrait<DataArray> */
+	use FooTrait;
+
+	/** @phpstan-var DataArray|array{} */
+	public array $data = [];
+
+
+	/**
+	 * Data checker
+	 *
+	 * @phpstan-param Offset $offset
+	 * @return bool
+	 * @template Offset of key-of<DataArray>
+	 */
+	public function offsetExists(mixed $offset): bool
+	{
+		return array_key_exists($offset, $this->data);
+	}
+}