From 135fa91a30b60adce48efb53d024c5ffd11103af Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 8 Aug 2023 15:44:06 +0000 Subject: [PATCH] Updated Rector to commit 88112d208bafbe266d5b0e5ec7fcb84058280ce2 https://github.com/rectorphp/rector-src/commit/88112d208bafbe266d5b0e5ec7fcb84058280ce2 [TypeDeclaration] Skip non void or never already return typed on ReturnNeverTypeRector (#4723) --- .../Rector/ClassMethod/ReturnNeverTypeRector.php | 3 +++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php index c899e70eb01..91e34181741 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php @@ -87,6 +87,9 @@ CODE_SAMPLE */ private function shouldSkip($node, Scope $scope) : bool { + if ($node->returnType instanceof Node && !$this->isName($node->returnType, 'void')) { + return \true; + } $hasReturn = $this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($node, Return_::class); if ($hasReturn) { return \true; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 0eaaa221d3c..d813bcbde0b 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 = 'c098c8d87e319e4c4ceef04655258976c6f29286'; + public const PACKAGE_VERSION = '88112d208bafbe266d5b0e5ec7fcb84058280ce2'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-08 16:35:18'; + public const RELEASE_DATE = '2023-08-08 22:40:26'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 4050b9f72ce..eb79f5bdf4b 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 ComposerAutoloaderInit6400e056f45bc51265f770f8ff687644::getLoader(); +return ComposerAutoloaderInitc0590210cda00bda55dee195e50ff99c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e6b28b79e80..b2f7fc2131a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit6400e056f45bc51265f770f8ff687644 +class ComposerAutoloaderInitc0590210cda00bda55dee195e50ff99c { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit6400e056f45bc51265f770f8ff687644 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit6400e056f45bc51265f770f8ff687644', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc0590210cda00bda55dee195e50ff99c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit6400e056f45bc51265f770f8ff687644', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc0590210cda00bda55dee195e50ff99c', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit6400e056f45bc51265f770f8ff687644::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitc0590210cda00bda55dee195e50ff99c::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit6400e056f45bc51265f770f8ff687644::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitc0590210cda00bda55dee195e50ff99c::$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 b9b19f7588e..e23bd9c69dd 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit6400e056f45bc51265f770f8ff687644 +class ComposerStaticInitc0590210cda00bda55dee195e50ff99c { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3004,9 +3004,9 @@ class ComposerStaticInit6400e056f45bc51265f770f8ff687644 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit6400e056f45bc51265f770f8ff687644::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit6400e056f45bc51265f770f8ff687644::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit6400e056f45bc51265f770f8ff687644::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitc0590210cda00bda55dee195e50ff99c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc0590210cda00bda55dee195e50ff99c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc0590210cda00bda55dee195e50ff99c::$classMap; }, null, ClassLoader::class); }