From 3015eb3ebfae4cb818654f4fcca831f3979d0185 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 23 Sep 2025 20:36:25 +0700
Subject: [PATCH] [TypeDeclarationDocblocks] Skip already has @ return doc on
 AddReturnDocblockForCommonObjectDenominatorRector

---
 .../skip_already_has_return_doc.php.inc       | 20 +++++++++++++++++++
 ...cblockForCommonObjectDenominatorRector.php |  5 +++++
 2 files changed, 25 insertions(+)
 create mode 100644 rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_already_has_return_doc.php.inc

diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_already_has_return_doc.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_already_has_return_doc.php.inc
new file mode 100644
index 00000000000..d3828bf6fba
--- /dev/null
+++ b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_already_has_return_doc.php.inc
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForCommonObjectDenominatorRector\Fixture;
+
+use Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForCommonObjectDenominatorRector\Source\FirstExtension;
+use Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForCommonObjectDenominatorRector\Source\SecondExtension;
+
+final class SkipAlreadyHasReturnDoc
+{
+    /**
+     * @return object[]
+     */
+    public function getExtensions(): array
+    {
+        return [
+            new FirstExtension(),
+            new SecondExtension()
+        ];
+    }
+}
diff --git a/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector.php b/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector.php
index b12e0b160d4..bd0e8474a51 100644
--- a/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector.php
+++ b/rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Return_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -108,6 +109,10 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
+        if ($phpDocInfo->getReturnTagValue() instanceof ReturnTagValueNode) {
+            return null;
+        }
+
         $returnType = $phpDocInfo->getReturnType();
 
         if (! $returnType instanceof MixedType || $returnType->isExplicitMixed()) {