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

bin/rector.php

@@ -106,11 +106,8 @@ public function loadIfExistsAndNotLoadedYet(string $filePath): void
             return;
         }
 
+        /** @var string $realPath always string after file_exists() check */
         $realPath = realpath($filePath);
-        if (! is_string($realPath)) {
-            return;
-        }
-
         $this->alreadyLoadedAutoloadFiles[] = $realPath;
 
         require_once $filePath;

packages/Caching/Detector/ChangedFilesDetector.php

@@ -85,6 +85,7 @@ public function setFirstResolvedConfigFileInfo(string $filePath): void
 
     private function resolvePath(string $filePath): string
     {
+        /** @var string|false $realPath */
         $realPath = realpath($filePath);
 
         if ($realPath === false) {

packages/Config/RectorConfig.php

@@ -373,10 +373,12 @@ private function isRuleNoLongerExists(mixed $skipRule): bool
             is_string($skipRule)
             // not regex path
             && ! str_contains($skipRule, '*')
-            // not realpath
-            && realpath($skipRule) === false
             // a Rector end
             && str_ends_with($skipRule, 'Rector')
+            // not directory
+            && ! is_dir($skipRule)
+            // not file
+            && ! is_file($skipRule)
             // class not exists
             && ! class_exists($skipRule);
     }

packages/Skipper/FileSystem/FnMatchPathNormalizer.php

@@ -16,6 +16,7 @@ public function normalizeForFnmatch(string $path): string
         }
 
         if (\str_contains($path, '..')) {
+            /** @var string|false $path */
             $path = realpath($path);
             if ($path === false) {
                 return '';

packages/Skipper/RealpathMatcher.php

@@ -8,11 +8,13 @@ final class RealpathMatcher
 {
     public function match(string $matchingPath, string $filePath): bool
     {
+        /** @var string|false $realPathMatchingPath */
         $realPathMatchingPath = realpath($matchingPath);
         if (! is_string($realPathMatchingPath)) {
             return false;
         }
 
+        /** @var string|false $realpathFilePath */
         $realpathFilePath = realpath($filePath);
         if (! is_string($realpathFilePath)) {
             return false;

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;
             }
 

src/Autoloading/BootstrapFilesIncluder.php

@@ -41,6 +41,7 @@ public function includeBootstrapFiles(): void
 
     private function requireRectorStubs(): void
     {
+        /** @var false|string $stubsRectorDirectory */
         $stubsRectorDirectory = realpath(__DIR__ . '/../../stubs-rector');
         if ($stubsRectorDirectory === false) {
             return;

utils/Command/MissingInSetCommand.php

@@ -141,7 +141,9 @@ static function (string $rectorClass): bool {
             $hasError = true;
             $this->symfonyStyle->title('We could not find there rules in configs');
 
-            $setRealpath = (string) realpath($setFile);
+            /** @var string|false $setRealpath */
+            $setRealpath = realpath($setFile);
+            $setRealpath = (string) $setRealpath;
             $relativeFilePath = Strings::after($setRealpath, getcwd() . '/');
 
             $this->symfonyStyle->writeln(' * ' . $relativeFilePath);