[TypeDeclaration] Handle assign $this on TypedPropertyFromAssignsRect…

…or (#5333) * [TypeDeclaration] Handle assign $this on TypedPropertyFromAssignsRector * fixed * fix namesapce * clean up * [ci-review] Rector Rectify * clean up * clean up * clean up * clean up * clean up * clean up * clean up * clean up --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Dec 6, 2023 · 79c57f0 · 79c57f0
1 parent 043d43c
commit 79c57f0
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 8 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php
@@ -13,6 +13,7 @@
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
+use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\StaticTypeMapper\ValueObject\Type\SelfStaticType;
 use Rector\StaticTypeMapper\ValueObject\Type\SimpleStaticType;
 
@@ -45,23 +46,22 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
     }
 
     /**
-     * @param StaticType $type
+     * @param SimpleStaticType|StaticType $type
      */
     public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
     {
-        // special case, for autocomplete of return type
-        if ($type instanceof SimpleStaticType) {
-            return new Name(ObjectReference::STATIC);
+        if ($type instanceof SelfStaticType) {
+            return new Name(ObjectReference::SELF);
         }
 
-        if ($type instanceof SelfStaticType) {
+        if ($typeKind !== TypeKind::RETURN) {
             return new Name(ObjectReference::SELF);
         }
 
-        if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::STATIC_RETURN_TYPE)) {
-            return new Name(ObjectReference::STATIC);
+        if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::STATIC_RETURN_TYPE)) {
+            return new Name(ObjectReference::SELF);
         }
 
-        return new Name(ObjectReference::SELF);
+        return new Name(ObjectReference::STATIC);
     }
 }
diff --git a/...on/Rector/Property/TypedPropertyFromAssignsRector/Fixture/assign_this_become_self.php.inc b/...on/Rector/Property/TypedPropertyFromAssignsRector/Fixture/assign_this_become_self.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+final class AssignThisBecomeSelf
+{
+    private static $instance = null;
+
+    private function __construct()
+    {
+        static::$instance = $this;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+final class AssignThisBecomeSelf
+{
+    private static ?self $instance = null;
+
+    private function __construct()
+    {
+        static::$instance = $this;
+    }
+}
+
+?>
diff --git a/...operty/TypedPropertyFromAssignsRector/FixtureComplexTypes/assign_this_become_self.php.inc b/...operty/TypedPropertyFromAssignsRector/FixtureComplexTypes/assign_this_become_self.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\FixtureComplexTypes;
+
+final class AssignThisBecomeSelf
+{
+    private static $instance = null;
+
+    private function __construct()
+    {
+        static::$instance = $this;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\FixtureComplexTypes;
+
+final class AssignThisBecomeSelf
+{
+    private static ?self $instance = null;
+
+    private function __construct()
+    {
+        static::$instance = $this;
+    }
+}
+
+?>