Updated Rector to commit 1ed4cf9c87b9898148161af76fec9274083d9a27

rectorphp/rector-src@1ed4cf9 Make use of toPhpDocNode() - take #3 (#4557)
rectorphp · Jul 20, 2023 · b74932f · b74932f
1 parent a40539c
commit b74932f
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 53 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php
@@ -5,32 +5,17 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\CallableType;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\Type;
-use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareCallableTypeNode;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
-use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper;
-use RectorPrefix202307\Symfony\Contracts\Service\Attribute\Required;
 /**
  * @implements TypeMapperInterface<CallableType>
  */
 final class CallableTypeMapper implements TypeMapperInterface
 {
-    /**
-     * @var \Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper
-     */
-    private $phpStanStaticTypeMapper;
-    /**
-     * @required
-     */
-    public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper) : void
-    {
-        $this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper;
-    }
     /**
      * @return class-string<Type>
      */
@@ -43,8 +28,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        $returnTypeNode = $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($type->getReturnType());
-        return new SpacingAwareCallableTypeNode(new IdentifierTypeNode('callable'), [], $returnTypeNode);
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeKind::* $typeKind

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -38,7 +37,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('mixed');
+        return $type->toPhpDocNode();
     }
     /**
      * @param MixedType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/NeverTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/NeverTypeMapper.php
@@ -4,7 +4,6 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
@@ -26,7 +25,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('never');
+        return $type->toPhpDocNode();
     }
     /**
      * @param NeverType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/NonEmptyArrayTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/NonEmptyArrayTypeMapper.php
@@ -5,11 +5,9 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Type;
-use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
 /**
  * @implements TypeMapperInterface<NonEmptyArrayType>
@@ -28,7 +26,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new SpacingAwareArrayTypeNode(new IdentifierTypeNode('mixed'));
+        return $type->toPhpDocNode();
     }
     /**
      * @param NonEmptyArrayType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
@@ -28,7 +27,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('null');
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeKind::* $typeKind

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/OversizedArrayTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/OversizedArrayTypeMapper.php
@@ -5,8 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Accessory\OversizedArrayType;
 use PHPStan\Type\Type;
@@ -29,7 +27,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new ArrayTypeNode(new IdentifierTypeNode('mixed'));
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeKind::* $typeKind

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ParentStaticTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ParentStaticTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Name;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
 use Rector\Core\Enum\ObjectReference;
@@ -28,7 +27,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode(ObjectReference::PARENT);
+        return $type->toPhpDocNode();
     }
     /**
      * @param ParentStaticType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ResourceTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ResourceTypeMapper.php
@@ -4,7 +4,6 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\Type;
@@ -26,7 +25,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('resource');
+        return $type->toPhpDocNode();
     }
     /**
      * @param ResourceType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/SelfObjectTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/SelfObjectTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Name;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
@@ -27,7 +26,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('self');
+        return $type->toPhpDocNode();
     }
     /**
      * @param SelfObjectType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\StrictMixedType;
 use PHPStan\Type\Type;
@@ -31,7 +30,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode(self::MIXED);
+        return $type->toPhpDocNode();
     }
     /**
      * @param StrictMixedType $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
@@ -38,7 +37,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode('string-class');
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeWithClassName $type

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php
@@ -5,7 +5,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
 use PHPStan\Type\VoidType;
@@ -43,7 +42,7 @@ public function getNodeClass() : string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        return new IdentifierTypeNode(self::VOID);
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeKind::* $typeKind

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'f403ca026144fc810918f6eb6178ea88f16c0641';
+    public const PACKAGE_VERSION = '1ed4cf9c87b9898148161af76fec9274083d9a27';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-07-21 04:05:33';
+    public const RELEASE_DATE = '2023-07-20 22:52:16';
     /**
      * @var int
      */

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcecd0c80d627eae86703ca38e6153385::getLoader();
+return ComposerAutoloaderInit35df304764cc0d55582e1cf57cf66250::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcecd0c80d627eae86703ca38e6153385
+class ComposerAutoloaderInit35df304764cc0d55582e1cf57cf66250
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcecd0c80d627eae86703ca38e6153385', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit35df304764cc0d55582e1cf57cf66250', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitcecd0c80d627eae86703ca38e6153385', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit35df304764cc0d55582e1cf57cf66250', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitcecd0c80d627eae86703ca38e6153385::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit35df304764cc0d55582e1cf57cf66250::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitcecd0c80d627eae86703ca38e6153385::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit35df304764cc0d55582e1cf57cf66250::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcecd0c80d627eae86703ca38e6153385
+class ComposerStaticInit35df304764cc0d55582e1cf57cf66250
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3023,9 +3023,9 @@ class ComposerStaticInitcecd0c80d627eae86703ca38e6153385
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcecd0c80d627eae86703ca38e6153385::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcecd0c80d627eae86703ca38e6153385::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitcecd0c80d627eae86703ca38e6153385::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit35df304764cc0d55582e1cf57cf66250::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit35df304764cc0d55582e1cf57cf66250::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit35df304764cc0d55582e1cf57cf66250::$classMap;
 
         }, null, ClassLoader::class);
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInitcecd0c80d627eae86703ca38e6153385::getLoader();
		return ComposerAutoloaderInit35df304764cc0d55582e1cf57cf66250::getLoader();