move string downgrade types to object classes

rules/downgrade-php71/src/Rector/FunctionLike/DowngradeVoidTypeReturnDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp71\Rector\FunctionLike;
 
+use PHPStan\Type\VoidType;
 use Rector\DowngradePhp72\Rector\FunctionLike\AbstractDowngradeReturnTypeDeclarationRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -20,28 +21,22 @@ public function getRuleDefinition(): RuleDefinition
             [
                 new CodeSample(
                     <<<'CODE_SAMPLE'
-<?php
-
 class SomeClass
 {
     public function run(): void
     {
-        // do something
     }
 }
 CODE_SAMPLE
                     ,
                     <<<'CODE_SAMPLE'
-<?php
-
 class SomeClass
 {
     /**
      * @return void
      */
     public function run()
     {
-        // do something
     }
 }
 CODE_SAMPLE
@@ -50,8 +45,8 @@ public function run()
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'void';
+        return VoidType::class;
     }
 }

rules/downgrade-php72/src/Contract/Rector/DowngradeTypeRectorInterface.php

@@ -9,5 +9,5 @@ interface DowngradeTypeRectorInterface
     /**
      * Name of the type to remove
      */
-    public function getTypeNameToRemove(): string;
+    public function getTypeToRemove(): string;
 }

rules/downgrade-php72/src/Rector/FunctionLike/AbstractDowngradeParamTypeDeclarationRector.php

@@ -5,7 +5,6 @@
 namespace Rector\DowngradePhp72\Rector\FunctionLike;
 
 use PhpParser\Node\FunctionLike;
-use PhpParser\Node\Identifier;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use Rector\DowngradePhp71\Rector\FunctionLike\AbstractDowngradeParamDeclarationRector;
@@ -23,27 +22,16 @@ public function shouldRemoveParamDeclaration(Param $param, FunctionLike $functio
             return false;
         }
 
-        // It can either be the type, or the nullable type (eg: ?object)
-        $isNullableType = $param->type instanceof NullableType;
-        if (! $param->type instanceof Identifier && ! $isNullableType) {
-            return false;
-        }
-
-        // If it is the NullableType, extract the name from its inner type
-        if ($isNullableType) {
-            /** @var NullableType */
-            $nullableType = $param->type;
-            $typeName = $this->getName($nullableType->type);
-        } else {
-            $typeName = $this->getName($param->type);
+        $type = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
+        if ($type instanceof NullableType) {
+            $type = $type->type;
         }
 
-        // Check it is the type to be removed
-        return $typeName === $this->getTypeNameToRemove();
+        return is_a($type, $this->getTypeToRemove(), true);
     }
 
     protected function getRectorDefinitionDescription(): string
     {
-        return sprintf("Remove the '%s' param type, add a @param tag instead", $this->getTypeNameToRemove());
+        return sprintf("Remove the '%s' param type, add a @param tag instead", $this->getTypeToRemove());
     }
 }

rules/downgrade-php72/src/Rector/FunctionLike/AbstractDowngradeReturnTypeDeclarationRector.php

@@ -22,22 +22,16 @@ public function shouldRemoveReturnDeclaration(FunctionLike $functionLike): bool
             return false;
         }
 
-        // It can either be the type, or the nullable type (eg: ?object)
-        $isNullableType = $functionLike->returnType instanceof NullableType;
-        if ($isNullableType) {
-            /** @var NullableType */
-            $nullableType = $functionLike->returnType;
-            $typeName = $this->getName($nullableType->type);
-        } else {
-            $typeName = $this->getName($functionLike->returnType);
+        $type = $this->staticTypeMapper->mapPhpParserNodePHPStanType($functionLike->returnType);
+        if ($type instanceof NullableType) {
+            $type = $type->type;
         }
 
-        // Check it is the type to be removed
-        return $typeName === $this->getTypeNameToRemove();
+        return is_a($type, $this->getTypeToRemove(), true);
     }
 
     protected function getRectorDefinitionDescription(): string
     {
-        return sprintf("Remove the '%s' function type, add a @return tag instead", $this->getTypeNameToRemove());
+        return sprintf("Remove the '%s' function type, add a @return tag instead", $this->getTypeToRemove());
     }
 }

rules/downgrade-php72/src/Rector/FunctionLike/DowngradeParamObjectTypeDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp72\Rector\FunctionLike;
 
+use PHPStan\Type\ObjectWithoutClassType;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -47,8 +48,8 @@ public function someFunction($someObject)
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'object';
+        return ObjectWithoutClassType::class;
     }
 }

rules/downgrade-php72/src/Rector/FunctionLike/DowngradeReturnObjectTypeDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp72\Rector\FunctionLike;
 
+use PHPStan\Type\ObjectWithoutClassType;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -49,8 +50,8 @@ public function getSomeObject()
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'object';
+        return ObjectWithoutClassType::class;
     }
 }

rules/downgrade-php80/src/Rector/FunctionLike/DowngradeParamMixedTypeDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp80\Rector\FunctionLike;
 
+use PHPStan\Type\MixedType;
 use Rector\DowngradePhp72\Rector\FunctionLike\AbstractDowngradeParamTypeDeclarationRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -48,8 +49,8 @@ public function someFunction($anything)
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'mixed';
+        return MixedType::class;
     }
 }

rules/downgrade-php80/src/Rector/FunctionLike/DowngradeReturnMixedTypeDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp80\Rector\FunctionLike;
 
+use PHPStan\Type\MixedType;
 use Rector\DowngradePhp72\Rector\FunctionLike\AbstractDowngradeReturnTypeDeclarationRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -56,8 +57,8 @@ public function getAnything(bool $flag)
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'mixed';
+        return MixedType::class;
     }
 }

rules/downgrade-php80/src/Rector/FunctionLike/DowngradeReturnStaticTypeDeclarationRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp80\Rector\FunctionLike;
 
+use PHPStan\Type\StaticType;
 use Rector\DowngradePhp72\Rector\FunctionLike\AbstractDowngradeReturnTypeDeclarationRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -50,8 +51,8 @@ public function getStatic()
         );
     }
 
-    public function getTypeNameToRemove(): string
+    public function getTypeToRemove(): string
     {
-        return 'static';
+        return StaticType::class;
     }
 }