From 01bdd5bff553ff0faa2cd6a629a75f15b0e4f1e2 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 6 Sep 2023 12:12:53 +0000 Subject: [PATCH] Updated Rector to commit c17181453c5493f1ef2e43206759f12d715c18df https://github.com/rectorphp/rector-src/commit/c17181453c5493f1ef2e43206759f12d715c18df [TypeDeclaration] Add append in loop support on ReturnTypeFromStrictNewArrayRector (#4922) --- .../ClassMethod/ReturnTypeFromStrictNewArrayRector.php | 5 +---- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php index 71de3427dc7..74056939740 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php @@ -114,13 +114,10 @@ CODE_SAMPLE if (!$onlyReturn->expr instanceof Variable) { return null; } - $returnType = $this->nodeTypeResolver->getType($onlyReturn->expr); + $returnType = $this->nodeTypeResolver->getNativeType($onlyReturn->expr); if (!$returnType instanceof ArrayType) { return null; } - if (!$this->nodeNameResolver->areNamesEqual($onlyReturn->expr, $variable)) { - return null; - } // 3. always returns array $node->returnType = new Identifier('array'); // 4. add more precise array type if suitable diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index bdbea3ccec0..67dc6c05f54 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 = '233209ade90b075fa18665470163f1128e546472'; + public const PACKAGE_VERSION = 'c17181453c5493f1ef2e43206759f12d715c18df'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-06 19:03:21'; + public const RELEASE_DATE = '2023-09-06 19:09:11'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index f2b53fe33ea..d7458ec6c6d 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 ComposerAutoloaderInit0e059a6e2b35a20c6ab91e6703e5366f::getLoader(); +return ComposerAutoloaderInit70422a187909f541d1fdc58d2e41dc49::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 92a26347d42..d4cb42b00df 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit0e059a6e2b35a20c6ab91e6703e5366f +class ComposerAutoloaderInit70422a187909f541d1fdc58d2e41dc49 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit0e059a6e2b35a20c6ab91e6703e5366f return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit0e059a6e2b35a20c6ab91e6703e5366f', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit70422a187909f541d1fdc58d2e41dc49', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit0e059a6e2b35a20c6ab91e6703e5366f', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit70422a187909f541d1fdc58d2e41dc49', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit70422a187909f541d1fdc58d2e41dc49::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit70422a187909f541d1fdc58d2e41dc49::$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 3eb1f71989e..5c691a60f6d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f +class ComposerStaticInit70422a187909f541d1fdc58d2e41dc49 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2606,9 +2606,9 @@ class ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0e059a6e2b35a20c6ab91e6703e5366f::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit70422a187909f541d1fdc58d2e41dc49::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit70422a187909f541d1fdc58d2e41dc49::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit70422a187909f541d1fdc58d2e41dc49::$classMap; }, null, ClassLoader::class); }