Updated Rector to commit 6cd3eecc07d3321f76235c7a07a765e510157af6

6cd3eecc07 Make use of toPhpDocNode() - take #8 (#4570)

packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php

@@ -87,6 +87,8 @@ final class ArrayTypeMapper implements TypeMapperInterface
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
+        // this cannot be handled by PHPStan $type->toPhpDocNode() as requires space removal around "|" in union type
+        // then e.g. "int" instead of explicit number, and nice arrays
         $itemType = $type->getItemType();
         if ($itemType instanceof UnionType && !$type instanceof ConstantArrayType) {
             return $this->createArrayTypeNodeFromUnionType($itemType);

packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php

@@ -5,27 +5,16 @@ namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node;
 use PhpParser\Node\Name\FullyQualified;
-use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
-use PHPStan\Reflection\ParameterReflection;
 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;
-use RectorPrefix202307\Webmozart\Assert\Assert;
 /**
  * @implements TypeMapperInterface<ClosureType>
  */
 final class ClosureTypeMapper implements TypeMapperInterface
 {
-    /**
-     * @var \Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper
-     */
-    private $phpStanStaticTypeMapper;
     /**
      * @return class-string<Type>
      */
@@ -38,12 +27,7 @@ final class ClosureTypeMapper implements TypeMapperInterface
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type) : TypeNode
     {
-        $identifierTypeNode = new IdentifierTypeNode($type->getClassName());
-        $returnDocTypeNode = $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($type->getReturnType());
-        $callableTypeParameterNodes = $this->createCallableTypeParameterNodes($type);
-        // callable parameters must be of specific type
-        Assert::allIsInstanceOf($callableTypeParameterNodes, CallableTypeParameterNode::class);
-        return new SpacingAwareCallableTypeNode($identifierTypeNode, $callableTypeParameterNodes, $returnDocTypeNode);
+        return $type->toPhpDocNode();
     }
     /**
      * @param TypeKind::* $typeKind
@@ -56,24 +40,4 @@ final class ClosureTypeMapper implements TypeMapperInterface
         }
         return new FullyQualified('Closure');
     }
-    /**
-     * @required
-     */
-    public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper) : void
-    {
-        $this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper;
-    }
-    /**
-     * @return CallableTypeParameterNode[]
-     */
-    private function createCallableTypeParameterNodes(ClosureType $closureType) : array
-    {
-        $callableTypeParameterNodes = [];
-        foreach ($closureType->getParameters() as $parameterReflection) {
-            /** @var ParameterReflection $parameterReflection */
-            $typeNode = $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($parameterReflection->getType());
-            $callableTypeParameterNodes[] = new CallableTypeParameterNode($typeNode, $parameterReflection->passedByReference()->yes(), $parameterReflection->isVariadic(), $parameterReflection->getName() !== '' && $parameterReflection->getName() !== '0' ? '$' . $parameterReflection->getName() : '', $parameterReflection->isOptional());
-        }
-        return $callableTypeParameterNodes;
-    }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '09fe7f5c1ebe6b6eacddc9765284dce921bd9191';
+    public const PACKAGE_VERSION = '6cd3eecc07d3321f76235c7a07a765e510157af6';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-07-21 15:02:17';
+    public const RELEASE_DATE = '2023-07-21 15:12:06';
     /**
      * @var int
      */

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit06cb2dba81e4322cc21547273306baaf::getLoader();
+return ComposerAutoloaderInitb29d4c290aa7898e1fde7e5adbfc60b1::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit06cb2dba81e4322cc21547273306baaf
+class ComposerAutoloaderInitb29d4c290aa7898e1fde7e5adbfc60b1
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit06cb2dba81e4322cc21547273306baaf
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit06cb2dba81e4322cc21547273306baaf', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitb29d4c290aa7898e1fde7e5adbfc60b1', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit06cb2dba81e4322cc21547273306baaf', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitb29d4c290aa7898e1fde7e5adbfc60b1', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit06cb2dba81e4322cc21547273306baaf::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit06cb2dba81e4322cc21547273306baaf::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit06cb2dba81e4322cc21547273306baaf
+class ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3021,9 +3021,9 @@ class ComposerStaticInit06cb2dba81e4322cc21547273306baaf
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit06cb2dba81e4322cc21547273306baaf::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit06cb2dba81e4322cc21547273306baaf::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit06cb2dba81e4322cc21547273306baaf::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitb29d4c290aa7898e1fde7e5adbfc60b1::$classMap;
 
         }, null, ClassLoader::class);
     }