[TypeMapper] Use Identifier instead of Name on non-object types (#3375)

Co-authored-by: GitHub Action <action@github.com>
rectorphp · Feb 13, 2023 · dbaf0da · dbaf0da
1 parent 7f97040
commit dbaf0da
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 34 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\CallableType;
@@ -59,6 +59,6 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        return new Name('callable');
+        return new Identifier('callable');
     }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\FloatType;
@@ -49,6 +49,6 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        return new Name('float');
+        return new Identifier('float');
     }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\MixedType;
@@ -53,6 +53,6 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        return new Name('mixed');
+        return new Identifier('mixed');
     }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\NullType;
@@ -53,6 +53,6 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        return new Name('null');
+        return new Identifier('null');
     }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php
@@ -102,22 +102,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        if (! $type instanceof GenericObjectType) {
-            // fallback
-            return new FullyQualified($type->getClassName());
-        }
-
-        if ($type->getClassName() === 'iterable') {
-            // fallback
-            return new Name('iterable');
-        }
-
-        if ($type->getClassName() !== 'object') {
-            // fallback
-            return new FullyQualified($type->getClassName());
-        }
-
-        return new Name('object');
+        return new FullyQualified($type->getClassName());
     }
 
     #[Required]

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\StrictMixedType;
@@ -43,6 +43,6 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, string $typeKind): TypeNo
      */
     public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
     {
-        return new Name(self::MIXED);
+        return new Identifier(self::MIXED);
     }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -224,7 +224,7 @@ private function shouldSkipIterable(UnionType $unionType): bool
         return $unionTypeAnalysis->hasArray();
     }
 
-    private function matchArrayTypes(UnionType $unionType): Name | NullableType | PhpParserUnionType | null
+    private function matchArrayTypes(UnionType $unionType): Identifier | NullableType | PhpParserUnionType | null
     {
         $unionTypeAnalysis = $this->unionTypeAnalyzer->analyseForNullableAndIterable($unionType);
         if (! $unionTypeAnalysis instanceof UnionTypeAnalysis) {
@@ -236,7 +236,7 @@ private function matchArrayTypes(UnionType $unionType): Name | NullableType | Ph
             return $this->resolveNullableType(new NullableType($type));
         }
 
-        return new Name($type);
+        return new Identifier($type);
     }
 
     private function resolveUnionTypes(PhpParserUnionType $phpParserUnionType): ?PhpParserUnionType

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php
@@ -5,7 +5,7 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
@@ -60,6 +60,6 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return null;
         }
 
-        return new Name(self::VOID);
+        return new Identifier(self::VOID);
     }
 }
diff --git a/rules/Php80/Rector/Class_/StringableForToStringRector.php b/rules/Php80/Rector/Class_/StringableForToStringRector.php
@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Cast\String_ as CastString_;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
@@ -118,7 +118,7 @@ public function refactor(Node $node): ?Node
         // add return type
 
         if ($toStringClassMethod->returnType === null) {
-            $toStringClassMethod->returnType = new Name('string');
+            $toStringClassMethod->returnType = new Identifier('string');
         }
 
         return $node;

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php
@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Yield_;
-use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
@@ -88,7 +88,7 @@ public function refactor(Node $node): ?Node
 
         if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::NEVER_TYPE)) {
             // never-type supported natively
-            $node->returnType = new Name('never');
+            $node->returnType = new Identifier('never');
         } else {
             // static anlysis based never type
             $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);