From 51f97eb7a9b19ef26c781d4d943e6a3740074f03 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 13 Feb 2023 09:45:26 +0000 Subject: [PATCH] Updated Rector to commit 7f9704010043e95a107d2a5fd5112fcfc2c2990b https://github.com/rectorphp/rector-src/commit/7f9704010043e95a107d2a5fd5112fcfc2c2990b [Php80][AutoImport] Do not import iterable on AutoImport enabled on UnionTypesRector (#3374) --- .../TypeMapper/IterableTypeMapper.php | 4 ++-- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php index eecbf07cea8..422c7dc2221 100644 --- a/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php +++ b/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php @@ -4,7 +4,7 @@ declare (strict_types=1); namespace Rector\PHPStanStaticTypeMapper\TypeMapper; use PhpParser\Node; -use PhpParser\Node\Name; +use PhpParser\Node\Identifier; use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode; use PHPStan\PhpDocParser\Ast\Type\TypeNode; use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode; @@ -54,7 +54,7 @@ final class IterableTypeMapper implements TypeMapperInterface */ public function mapToPhpParserNode(Type $type, string $typeKind) : ?Node { - return new Name('iterable'); + return new Identifier('iterable'); } private function convertUnionArrayTypeNodesToArrayTypeOfUnionTypeNodes(UnionTypeNode $unionTypeNode) : BracketsAwareUnionTypeNode { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 666273c7920..7937d71b046 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '91ddd680c78eacc11006126398d64c4b97d38694'; + public const PACKAGE_VERSION = '7f9704010043e95a107d2a5fd5112fcfc2c2990b'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-02-12 18:31:43'; + public const RELEASE_DATE = '2023-02-13 16:40:01'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index b776abac7c5..9344daa2dbf 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit65c8f7a97195bdb8927e834e92ab1449::getLoader(); +return ComposerAutoloaderInit5e5f692b9734123f7d83eca9c7e54e68::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 746d6e05f2c..617b55d0bb6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit65c8f7a97195bdb8927e834e92ab1449 +class ComposerAutoloaderInit5e5f692b9734123f7d83eca9c7e54e68 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit65c8f7a97195bdb8927e834e92ab1449 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit65c8f7a97195bdb8927e834e92ab1449', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit5e5f692b9734123f7d83eca9c7e54e68', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit65c8f7a97195bdb8927e834e92ab1449', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit5e5f692b9734123f7d83eca9c7e54e68', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68::$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 index c508d8d6c51..41cfceac2dc 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449 +class ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3099,9 +3099,9 @@ class ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit65c8f7a97195bdb8927e834e92ab1449::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit5e5f692b9734123f7d83eca9c7e54e68::$classMap; }, null, ClassLoader::class); }