[TypeDeclaration] Using ClassMethodReturnTypeOverrideGuard on ReturnT…

…ypeFromStrictParamRector (#4878)

* [TypeDeclaration] Using ClassMethodReturnTypeOverrideGuard on ReturnTypeFromStrictParamRector

* tweak of parent not found

* Fix

* add parent already has return on ReturnTypeFromStrictParamRector

* fixture fix

packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php

@@ -104,7 +104,7 @@ private function isReturnTypeChangeAllowed(ClassMethod $classMethod, Scope $scop
 
         // nothing to check
         if (! $parentClassMethodReflection instanceof MethodReflection) {
-            return true;
+            return ! $this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($classMethod);
         }
 
         $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select(

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector/Fixture/from_parent_has_return.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Source\ParentHasReturn;
+
+class FromParentHasReturn extends ParentHasReturn {
+    public function doFoo(int $param): int {
+        return $param;
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector/Fixture/parent_overridden.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Source\ParentOverrideBase;
+
+class ParentOverridden extends ParentOverrideBase {
+    public function doFoo(ParentOverrideBase $param) {
+        return $param;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Source\ParentOverrideBase;
+
+class ParentOverridden extends ParentOverrideBase {
+    public function doFoo(ParentOverrideBase $param): ParentOverrideBase {
+        return $param;
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector/Source/ParentHasReturn.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Source;
+
+class ParentHasReturn {
+    public function doFoo(int $param): int {
+    }
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector/Source/ParentOverrideBase.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector\Source;
+
+class ParentOverrideBase {
+    public function doFoo(ParentOverrideBase $param) {
+    }
+}

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php

@@ -25,7 +25,7 @@
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
-use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
+use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -36,7 +36,7 @@
 final class ReturnTypeFromStrictParamRector extends AbstractScopeAwareRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard,
+        private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard,
         private readonly ReturnTypeInferer $returnTypeInferer
     ) {
     }
@@ -91,7 +91,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
-        if ($this->shouldSkipNode($node)) {
+        if ($this->shouldSkipNode($node, $scope)) {
             return null;
         }
 
@@ -195,20 +195,14 @@ private function shouldSkipParam(Param $param, array $stmts): bool
         return $isParamModified;
     }
 
-    private function shouldSkipNode(ClassMethod|Function_|Closure $node): bool
+    private function shouldSkipNode(ClassMethod|Function_|Closure $node, Scope $scope): bool
     {
         if ($node->returnType !== null) {
             return true;
         }
 
-        if ($node instanceof ClassMethod) {
-            if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($node)) {
-                return true;
-            }
-
-            if ($node->isMagic()) {
-                return true;
-            }
+        if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod($node, $scope)) {
+            return true;
         }
 
         $returnType = $this->returnTypeInferer->inferFunctionLike($node);