From 1e091dc2fcc4c06db8662bdb4a7ec0e53098c21e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 21 Aug 2025 12:32:16 +0700
Subject: [PATCH 1/2] [CodeQuality] Skip already has return type on
 TypeWillReturnCallableArrowFunctionRector

---
 .../Fixture/skip_already_return_typed.php.inc  | 18 ++++++++++++++++++
 ...peWillReturnCallableArrowFunctionRector.php | 16 +++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 rules-tests/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector/Fixture/skip_already_return_typed.php.inc

diff --git a/rules-tests/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector/Fixture/skip_already_return_typed.php.inc b/rules-tests/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector/Fixture/skip_already_return_typed.php.inc
new file mode 100644
index 00000000..76a558b5
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector/Fixture/skip_already_return_typed.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\TypeWillReturnCallableArrowFunctionRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\TypeWillReturnCallableArrowFunctionRector\Source\SomeMockedClass;
+
+final class SkipAlreadyReturnTyped extends TestCase
+{
+    public function test($value): void
+    {
+        $this->createMock(SomeMockedClass::class)
+            ->method('nativeObject')
+            ->willReturnCallback(fn (object $object): \stdClass => $value);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/rules/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector.php b/rules/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector.php
index ba8c8df4..fd99bb5e 100644
--- a/rules/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector.php
+++ b/rules/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector.php
@@ -239,14 +239,16 @@ public function refactor(Node $node): ?Class_
                 $hasChanged = true;
             }
 
-            $returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode(
-                $parameterTypesAndReturnType->getReturnType(),
-                TypeKind::RETURN
-            );
+            if (! $innerArg->returnType instanceof Node) {
+                $returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode(
+                    $parameterTypesAndReturnType->getReturnType(),
+                    TypeKind::RETURN
+                );
 
-            if ($returnTypeNode instanceof Node) {
-                $innerArg->returnType = $returnTypeNode;
-                $hasChanged = true;
+                if ($returnTypeNode instanceof Node) {
+                    $innerArg->returnType = $returnTypeNode;
+                    $hasChanged = true;
+                }
             }
         });
 

From 037adc01a62ff616aa21b82099b7d0aea9df5346 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 21 Aug 2025 12:33:16 +0700
Subject: [PATCH 2/2] fx

---
 .../Reflection/MethodParametersAndReturnTypesResolver.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php b/rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php
index 9efac0e5..c4f1616f 100644
--- a/rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php
+++ b/rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php
@@ -67,7 +67,8 @@ private function resolveParameterTypes(
             $parameterType = $this->resolveObjectType($parameterReflection->getNativeType());
 
             if ($parameterType instanceof ObjectType && $currentClassReflection->getName() !== $parameterType->getClassReflection()->getName()) {
-                return [];
+                $parameterTypes[] = new MixedType();
+                continue;
             }
 
             $parameterTypes[] = $parameterType;