[CodeQuality] Skip child has typed on ReturnTypeFromStrictScalarRetur…

…nExprRector (#2806)

Co-authored-by: Dominik Peters <kuhlesdominik@gmx.de>

rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+class SkipIfChildClassHasTyped
+{
+    public function test()
+    {
+        return 0;
+    }
+}
+
+class SomeChild extends SkipIfChildClassHasTyped
+{
+    public function test(): string
+    {
+        $a = '1';
+
+        return $a;
+    }
+
+}

rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php

@@ -13,6 +13,7 @@
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\TypeDeclaration\NodeAnalyzer\ReturnTypeAnalyzer\StrictScalarReturnTypeAnalyzer;
+use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -23,7 +24,8 @@
 final class ReturnTypeFromStrictScalarReturnExprRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly StrictScalarReturnTypeAnalyzer $strictScalarReturnTypeAnalyzer
+        private readonly StrictScalarReturnTypeAnalyzer $strictScalarReturnTypeAnalyzer,
+        private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard
     ) {
     }
 
@@ -90,6 +92,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod($node)) {
+            return null;
+        }
+
         $node->returnType = $returnTypeNode;
         return $node;
     }