[TypeDeclaration] Handle Parent ClassMethod has no Return_ stmt on Re…

…turnTypeDeclarationRector (#2980)

* [TypeDeclaration] Handle Parent ClassMethod has no Return_ stmt on ReturnTypeDeclarationRector

* [ci-review] Rector Rectify

* check child return type

* handle both parent and child void

* final touch: eol

* better comment

Co-authored-by: GitHub Action <action@github.com>

packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php

@@ -15,12 +15,14 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
+use PHPStan\Type\VoidType;
 use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\StaticTypeMapper\PhpDoc\CustomPHPStanDetector;
+use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 
 final class ClassMethodReturnTypeOverrideGuard
 {
@@ -38,7 +40,8 @@ public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly AstResolver $astResolver,
         private readonly ReflectionResolver $reflectionResolver,
-        private readonly CustomPHPStanDetector $customPHPStanDetector
+        private readonly CustomPHPStanDetector $customPHPStanDetector,
+        private readonly ReturnTypeInferer $returnTypeInferer
     ) {
     }
 
@@ -102,6 +105,8 @@ public function shouldSkipClassMethodOldTypeWithNewType(
      */
     private function shouldSkipHasChildHasReturnType(array $childrenClassReflections, ClassMethod $classMethod): bool
     {
+        $returnType = $this->returnTypeInferer->inferFunctionLike($classMethod);
+
         $methodName = $this->nodeNameResolver->getName($classMethod);
         foreach ($childrenClassReflections as $childClassReflection) {
             if (! $childClassReflection->hasNativeMethod($methodName)) {
@@ -118,6 +123,11 @@ private function shouldSkipHasChildHasReturnType(array $childrenClassReflections
             if ($method->returnType instanceof Node) {
                 return true;
             }
+
+            $childReturnType = $this->returnTypeInferer->inferFunctionLike($method);
+            if ($returnType instanceof VoidType && ! $childReturnType instanceof VoidType) {
+                return true;
+            }
         }
 
         return false;

rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/parent_and_child_no_return_stmt.php.inc

@@ -0,0 +1,53 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector\Fixture;
+
+/**
+ * Both class parent and child need to be in same fixture file
+ * as demonstrate the changed parts are both
+ */
+class ParentNoReturnStmt2
+{
+    public function run()
+    {
+        // this method is optional, not marked as abstract
+        // and leave the child to implements or not
+    }
+}
+
+final class SomeChildOverrideParentMethod2 extends ParentNoReturnStmt2
+{
+    public function run()
+    {
+        echo 'test';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector\Fixture;
+
+/**
+ * Both class parent and child need to be in same fixture file
+ * as demonstrate the changed parts are both
+ */
+class ParentNoReturnStmt2
+{
+    public function run(): void
+    {
+        // this method is optional, not marked as abstract
+        // and leave the child to implements or not
+    }
+}
+
+final class SomeChildOverrideParentMethod2 extends ParentNoReturnStmt2
+{
+    public function run(): void
+    {
+        echo 'test';
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/parent_no_return_stmt.php.inc

@@ -0,0 +1,63 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector\Fixture;
+
+use stdClass;
+
+/**
+ * Both class parent and child need to be in same fixture file
+ * as demonstrate the changed parts are both, which should only child
+ */
+class ParentNoReturnStmt
+{
+    /**
+     * @return stdClass
+     */
+    public function run()
+    {
+        // this method is optional, not marked as abstract
+        // and leave the child to implements or not
+    }
+}
+
+final class SomeChildOverrideParentMethod extends ParentNoReturnStmt
+{
+    public function run()
+    {
+        return new stdClass;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector\Fixture;
+
+use stdClass;
+
+/**
+ * Both class parent and child need to be in same fixture file
+ * as demonstrate the changed parts are both, which should only child
+ */
+class ParentNoReturnStmt
+{
+    /**
+     * @return stdClass
+     */
+    public function run()
+    {
+        // this method is optional, not marked as abstract
+        // and leave the child to implements or not
+    }
+}
+
+final class SomeChildOverrideParentMethod extends ParentNoReturnStmt
+{
+    public function run(): \stdClass
+    {
+        return new stdClass;
+    }
+}
+
+?>