[TypeDeclaration] Separated inferred and no types (#90)

rectorphp · May 22, 2021 · 617c04a · 617c04a
1 parent db00e23
commit 617c04a
Show file tree

Hide file tree

Showing 20 changed files with 194 additions and 1,252 deletions.
diff --git a/packages/StaticTypeMapper/PhpParser/FullyQualifiedNodeMapper.php b/packages/StaticTypeMapper/PhpParser/FullyQualifiedNodeMapper.php
@@ -32,7 +32,8 @@ public function mapToPHPStan(Node $node): Type
         $fullyQualifiedName = $node->toString();
 
         // is aliased?
-        if ($this->isAliasedName($originalName, $fullyQualifiedName)) {
+        if ($this->isAliasedName($originalName, $fullyQualifiedName) && $originalName !== $fullyQualifiedName
+        ) {
             return new AliasedObjectType($originalName, $fullyQualifiedName);
         }
 

diff --git a/...ctor/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/nullable_type.php.inc b/...ctor/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/nullable_type.php.inc
@@ -6,9 +6,9 @@ use DateTimeInterface;
 
 class NullableType
 {
-    private ?DatetimeInterface $time;
+    private ?DateTimeInterface $time;
 
-    public function __construct(DatetimeInterface $time = null)
+    public function __construct(DateTimeInterface $time = null)
     {
         $this->time = $time;
     }

diff --git a/...ass_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_property_assign.php.inc b/...ass_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_property_assign.php.inc
@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+final class SkipPropertyAssign
+{
+    private $command;
+
+    public function __construct(\Closure $command)
+    {
+        $this->command = $command;
+    }
+
+    public function getCommand()
+    {
+        if (!$this->command instanceof \Closure) {
+            return $this->command;
+        }
+
+        $this->command = ($this->command)();
+
+        return $this->command;
+    }
+}