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 @@ +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; + } } }); 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;