[TypeDeclarationDocblocks] Use FQCN return docblock for array of object types on AddReturnDocblockFromMethodCallDocblockRector (#7802)

samsonasik · web-flow · commit b12180819cb4 · 2026-01-03T18:52:45.000+01:00
* [TypeDeclarationDocblocks] Use FQCN return docblock for array of object types on AddReturnDocblockFromMethodCallDocblockRector

* Fix
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector/Fixture/handle_static_call.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector/Fixture/handle_static_call.php.inc
@@ -27,7 +27,7 @@ use Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFr
 final class HandleStaticCall
 {
     /**
-     * @return SomeEntity[]
+     * @return \Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFromMethodCallDocblockRector\Source\SomeEntity[]
      */
     public function getAll(): array
     {
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector/Fixture/some_class.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector/Fixture/some_class.php.inc
@@ -41,7 +41,7 @@ final class SomeClass
     }
 
     /**
-     * @return SomeEntity[]
+     * @return \Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFromMethodCallDocblockRector\Source\SomeEntity[]
      */
     public function getAll(): array
     {
diff --git a/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector.php b/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector.php
@@ -155,7 +155,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $this->phpDocTypeChanger->changeReturnTypeNode($node, $phpDocInfo, $calledReturnTagValue->type);
+        $this->phpDocTypeChanger->changeReturnType($node, $phpDocInfo, $calledClassMethodPhpDocInfo->getReturnType());
 
         return $node;
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ use Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFr`
`27`	`27`	`final class HandleStaticCall`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`		`- * @return SomeEntity[]`
	`30`	`+ * @return \Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFromMethodCallDocblockRector\Source\SomeEntity[]`
`31`	`31`	`*/`
`32`	`32`	`public function getAll(): array`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class SomeClass`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @return SomeEntity[]`
	`44`	`+ * @return \Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFromMethodCallDocblockRector\Source\SomeEntity[]`
`45`	`45`	`*/`
`46`	`46`	`public function getAll(): array`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function refactor(Node $node): ?Node`
`155`	`155`	`return null;`
`156`	`156`	`}`
`157`	`157`
`158`		`- $this->phpDocTypeChanger->changeReturnTypeNode($node, $phpDocInfo, $calledReturnTagValue->type);`
	`158`	`+ $this->phpDocTypeChanger->changeReturnType($node, $phpDocInfo, $calledClassMethodPhpDocInfo->getReturnType());`
`159`	`159`
`160`	`160`	`return $node;`
`161`	`161`	`}`