From fbd33e5f98872411cd257b581cdcd4d7b7c2ebd3 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 21 Aug 2023 09:37:33 +0000 Subject: [PATCH] Updated Rector to commit 45aababfbcf23f7ab3765376d6f04a3aee113e8a https://github.com/rectorphp/rector-src/commit/45aababfbcf23f7ab3765376d6f04a3aee113e8a [TypeDeclaration] Add new array replaced with array on ReturnTypeFromStrictNewArrayRector (#4825) --- .../ClassMethod/ReturnTypeFromStrictNewArrayRector.php | 6 +++++- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php index 12627768a8e..71de3427dc7 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php @@ -175,7 +175,11 @@ CODE_SAMPLE if (!$this->nodeNameResolver->areNamesEqual($assign->var, $variable)) { continue; } - if (!$assign->expr instanceof Array_) { + if ($assign->expr instanceof Array_) { + continue; + } + $nativeType = $this->nodeTypeResolver->getNativeType($assign->expr); + if (!$nativeType->isArray()->yes()) { return \true; } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index a5619ad2e18..8c2a3f5881b 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 = '4a869b9b104dc81adef4441025787c0c3411d4d6'; + public const PACKAGE_VERSION = '45aababfbcf23f7ab3765376d6f04a3aee113e8a'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-21 09:25:14'; + public const RELEASE_DATE = '2023-08-21 11:25:39'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 3e05f94ad43..2e2e3c68d82 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 ComposerAutoloaderInit99ab81fa9c7f9b879738d682de7c5efb::getLoader(); +return ComposerAutoloaderInitce2f1889ef64e81634bccde3190ed77c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a263a48c7e3..94a9ea7a240 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit99ab81fa9c7f9b879738d682de7c5efb +class ComposerAutoloaderInitce2f1889ef64e81634bccde3190ed77c { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit99ab81fa9c7f9b879738d682de7c5efb return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit99ab81fa9c7f9b879738d682de7c5efb', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitce2f1889ef64e81634bccde3190ed77c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit99ab81fa9c7f9b879738d682de7c5efb', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitce2f1889ef64e81634bccde3190ed77c', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitce2f1889ef64e81634bccde3190ed77c::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitce2f1889ef64e81634bccde3190ed77c::$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 cdd5f8fdc80..974a55f3c9c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb +class ComposerStaticInitce2f1889ef64e81634bccde3190ed77c { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2611,9 +2611,9 @@ class ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit99ab81fa9c7f9b879738d682de7c5efb::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitce2f1889ef64e81634bccde3190ed77c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitce2f1889ef64e81634bccde3190ed77c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitce2f1889ef64e81634bccde3190ed77c::$classMap; }, null, ClassLoader::class); }