[TypeDeclaration] Handle fallback from param same type object on ReturnTypeFromReturnNewRector

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/Fixture/fallback_from_param.php.inc

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Source\SomeResponse;
+
+final class FallbackFromParam
+{
+    public function action(SomeResponse $someResponse)
+    {
+        if (rand(0, 1)) {
+            return new SomeResponse();
+        }
+
+        return $someResponse;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Source\SomeResponse;
+
+final class FallbackFromParam
+{
+    public function action(SomeResponse $someResponse): \Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Source\SomeResponse
+    {
+        if (rand(0, 1)) {
+            return new SomeResponse();
+        }
+
+        return $someResponse;
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/Fixture/fallback_from_param_self.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Fixture;
+
+final class FallbackFromParamSelf
+{
+    public function action(self $obj)
+    {
+        if (rand(0, 1)) {
+            return new FallbackFromParamSelf();
+        }
+
+        return $obj;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Fixture;
+
+final class FallbackFromParamSelf
+{
+    public function action(self $obj): \Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector\Fixture\FallbackFromParamSelf
+    {
+        if (rand(0, 1)) {
+            return new FallbackFromParamSelf();
+        }
+
+        return $obj;
+    }
+}
+
+?>

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php

@@ -5,6 +5,7 @@
 namespace Rector\TypeDeclaration\Rector\ClassMethod;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrowFunction;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\New_;
@@ -200,7 +201,17 @@ private function resolveReturnNewType(array $returns): ?array
     {
         $newTypes = [];
         foreach ($returns as $return) {
+            if (! $return->expr instanceof Expr) {
+                return null;
+            }
+
             if (! $return->expr instanceof New_) {
+                $returnType = $this->nodeTypeResolver->getNativeType($return->expr);
+                if ($returnType instanceof ObjectType) {
+                    $newTypes[] = $returnType;
+                    continue;
+                }
+
                 return null;
             }