From 5d75ea247d94b5ecdedbeade01dc77742131087b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 3 Jan 2026 20:26:58 +0700 Subject: [PATCH 1/2] [TypeDeclarationDocblocks] Use FQCN return docblock for array of object types on AddReturnDocblockFromMethodCallDocblockRector --- .../Fixture/handle_static_call.php.inc | 2 +- .../Fixture/some_class.php.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 8d1fa159b73..9e079d809b4 100644 --- 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 index 564c0ecae1f..d2322cc4fa3 100644 --- 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 { From b1338524fc67e1f1af86f73cb972001bd6571fdd Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 3 Jan 2026 20:34:40 +0700 Subject: [PATCH 2/2] Fix --- .../AddReturnDocblockFromMethodCallDocblockRector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector.php b/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockFromMethodCallDocblockRector.php index 90639a8e592..c06bfdfbf9f 100644 --- 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; }