FileTypeMapper - fix PHPDocs for renamed trait methods

phpstan · Jul 5, 2023 · 0bd48b4 · 0bd48b4
1 parent 48c18ef
commit 0bd48b4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php
@@ -398,15 +398,21 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
 							continue;
 						}
 
-						if ($traitUseAdaptation->trait === null) {
+						if ($traitUseAdaptation->newName === null) {
 							continue;
 						}
 
-						if ($traitUseAdaptation->newName === null) {
+						$methodName = $traitUseAdaptation->method->toString();
+						$newTraitName = $traitUseAdaptation->newName->toString();
+
+						if ($traitUseAdaptation->trait === null) {
+							foreach ($node->traits as $traitName) {
+								$traitMethodAliases[$traitName->toString()][$methodName] = $newTraitName;
+							}
 							continue;
 						}
 
-						$traitMethodAliases[$traitUseAdaptation->trait->toString()][$traitUseAdaptation->method->toString()] = $traitUseAdaptation->newName->toString();
+						$traitMethodAliases[$traitUseAdaptation->trait->toString()][$methodName] = $newTraitName;
 					}
 
 					$useDocComment = null;

diff --git a/tests/PHPStan/Rules/Methods/MissingMethodReturnTypehintRuleTest.php b/tests/PHPStan/Rules/Methods/MissingMethodReturnTypehintRuleTest.php
@@ -93,4 +93,9 @@ public function testBug9571(): void
 		$this->analyse([__DIR__ . '/data/bug-9571.php'], []);
 	}
 
+	public function testBug9571PhpDocs(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9571-phpdocs.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-9571-phpdocs.php b/tests/PHPStan/Rules/Methods/data/bug-9571-phpdocs.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug9571PhpDocs;
+
+trait DiContainerTrait
+{
+	/**
+	 * @param array<string, mixed> $properties
+	 *
+	 * @return $this
+	 */
+	public function setDefaults(array $properties)
+	{
+		return $this;
+	}
+}
+
+class FactoryTestDefMock
+{
+	use DiContainerTrait {
+		setDefaults as  _setDefaults;
+	}
+}