[Php74] Skip array type on trait on RestoreDefaultNullToNullableTypeP…

…ropertyRector (#2094) * [Php74] Skip array type on trait on RestoreDefaultNullToNullableTypePropertyRector * Fixed 🎉
rectorphp · Apr 18, 2022 · 8e51a6c · 8e51a6c
1 parent 961f67c
commit 8e51a6c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php
@@ -18,6 +18,7 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\Property;
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\ClassAutoloadingException;
 use PHPStan\Reflection\ReflectionProvider;
@@ -116,6 +117,10 @@ public function isObjectType(Node $node, ObjectType $requiredObjectType): bool
 
     public function getType(Node $node): Type
     {
+        if ($node instanceof Property && $node->type instanceof NullableType) {
+            return $this->getType($node->type);
+        }
+
         if ($node instanceof NullableType) {
             if ($node->type instanceof Name && $node->type->hasAttribute(AttributeKey::NAMESPACED_NAME)) {
                 $node->type = new FullyQualified($node->type->getAttribute(AttributeKey::NAMESPACED_NAME));
@@ -167,6 +172,10 @@ public function getType(Node $node): Type
                 }
             }
 
+            if ($node instanceof Identifier) {
+                return $this->identifierTypeResolver->resolve($node);
+            }
+
             return new MixedType();
         }
 

diff --git a/...y/RestoreDefaultNullToNullableTypePropertyRector/Fixture/skip_array_type_on_trait.php.inc b/...y/RestoreDefaultNullToNullableTypePropertyRector/Fixture/skip_array_type_on_trait.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector\Fixture;
+
+trait SkipArrayTypeOnTrait
+{
+    /** @var stdClass[] */
+    private array $targets;
+
+    public function withTargets(stdClass ...$targets): self
+    {
+        $this->targets = $targets;
+
+        return $this;
+    }
+}
diff --git a/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php b/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php
@@ -94,6 +94,10 @@ private function shouldSkip(Property $property): bool
             return true;
         }
 
+        if (! $this->nodeTypeResolver->isNullableType($property)) {
+            return true;
+        }
+
         // is variable assigned in constructor
         $propertyName = $this->getName($property);
         $classLike = $this->betterNodeFinder->findParentType($property, Class_::class);
@@ -104,10 +108,6 @@ private function shouldSkip(Property $property): bool
             return false;
         }
 
-        if (! $this->nodeTypeResolver->isNullableType($property)) {
-            return true;
-        }
-
         return $this->constructorAssignDetector->isPropertyAssigned($classLike, $propertyName);
     }
 }