Updated Rector to commit 30ecb365512dc3332703e46ce2da8c1acad1c268

TomasVotruba · TomasVotruba · commit e46fb7c17bde · 2025-05-29T04:57:45.000Z
rectorphp/rector-src@30ecb36 [TypeDeclaration] Handle crash on return different over static on AddReturnTypeDeclarationRector-a (#6943)
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php
@@ -4,17 +4,19 @@
 namespace Rector\TypeDeclaration\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Php\PhpVersionProvider;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Rector\AbstractRector;
+use Rector\Reflection\ReflectionResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\StaticTypeMapper\ValueObject\Type\SimpleStaticType;
 use Rector\TypeDeclaration\ValueObject\AddReturnTypeDeclaration;
@@ -40,16 +42,21 @@ final class AddReturnTypeDeclarationRector extends AbstractRector implements Con
      * @readonly
      */
     private StaticTypeMapper $staticTypeMapper;
+    /**
+     * @readonly
+     */
+    private ReflectionResolver $reflectionResolver;
     /**
      * @var AddReturnTypeDeclaration[]
      */
     private array $methodReturnTypes = [];
     private bool $hasChanged = \false;
-    public function __construct(PhpVersionProvider $phpVersionProvider, ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard, StaticTypeMapper $staticTypeMapper)
+    public function __construct(PhpVersionProvider $phpVersionProvider, ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard, StaticTypeMapper $staticTypeMapper, ReflectionResolver $reflectionResolver)
     {
         $this->phpVersionProvider = $phpVersionProvider;
         $this->parentClassMethodTypeOverrideGuard = $parentClassMethodTypeOverrideGuard;
         $this->staticTypeMapper = $staticTypeMapper;
+        $this->reflectionResolver = $reflectionResolver;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -123,8 +130,12 @@ private function processClassMethodNodeWithTypehints(ClassMethod $classMethod, C
             $classMethod->returnType = null;
             return;
         }
-        if ($newType instanceof SimpleStaticType && $classMethod->returnType instanceof Name && $this->isName($classMethod->returnType, 'static')) {
-            return;
+        $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
+        if ($classMethod->returnType instanceof Node && $newType instanceof SimpleStaticType) {
+            if (!$classReflection instanceof ClassReflection) {
+                return;
+            }
+            $newType = new StaticType($classReflection);
         }
         // already set and sub type or equal → no change
         if ($this->parentClassMethodTypeOverrideGuard->shouldSkipReturnTypeChange($classMethod, $newType)) {
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'c7278fa576a22288228814bc2b20bd0cddea4677';
+    public const PACKAGE_VERSION = '30ecb365512dc3332703e46ce2da8c1acad1c268';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-05-29 09:00:48';
+    public const RELEASE_DATE = '2025-05-29 04:55:10';
     /**
      * @var int
      */
