From b0a44e83a2cac8b4b0d6f01ed67e2eafd1f831a5 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 25 Jun 2022 16:33:06 +0000 Subject: [PATCH] Updated Rector to commit c6fe564d2732c8d2b7166d27741b395e34db5212 https://github.com/rectorphp/rector-src/commit/c6fe564d2732c8d2b7166d27741b395e34db5212 [TypeDeclaration] Handle inner function Yield and Return_ on ReturnTypeFromStrictReturnExprRector (#2566) --- .../ReturnTypeFromStrictReturnExprRector.php | 4 ++-- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector.php index 6a9440755a3..55a6b8947c1 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector.php @@ -81,10 +81,10 @@ CODE_SAMPLE if ($classMethod->stmts === null) { return \false; } - if ($this->betterNodeFinder->hasInstancesOf($classMethod->stmts, [Yield_::class])) { + if ($this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($classMethod, [Yield_::class])) { return \false; } - $returns = $this->betterNodeFinder->findInstanceOf($classMethod->stmts, Return_::class); + $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($classMethod, Return_::class); if (\count($returns) !== 1) { return \false; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 9f4dd466c95..a68ce731495 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '6845975035289df55f72cc710101fc9ae5d4ae1b'; + public const PACKAGE_VERSION = 'c6fe564d2732c8d2b7166d27741b395e34db5212'; /** * @var string */ - public const RELEASE_DATE = '2022-06-25 18:07:41'; + public const RELEASE_DATE = '2022-06-25 18:27:56'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 3726a42b14c..ef6238dd7cf 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712::getLoader(); +return ComposerAutoloaderInit36c5a7b318e730f2a84ed7ae195a6070::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fbc3658e8ab..2a67e026bd0 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712 +class ComposerAutoloaderInit36c5a7b318e730f2a84ed7ae195a6070 { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit36c5a7b318e730f2a84ed7ae195a6070', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit36c5a7b318e730f2a84ed7ae195a6070', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit823c01ea85d61dbd009573be8e82a712::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit823c01ea85d61dbd009573be8e82a712::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire823c01ea85d61dbd009573be8e82a712($fileIdentifier, $file); + composerRequire36c5a7b318e730f2a84ed7ae195a6070($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInit823c01ea85d61dbd009573be8e82a712 * @param string $file * @return void */ -function composerRequire823c01ea85d61dbd009573be8e82a712($fileIdentifier, $file) +function composerRequire36c5a7b318e730f2a84ed7ae195a6070($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 ba467f36a8a..a4425a137cb 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit823c01ea85d61dbd009573be8e82a712 +class ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3403,9 +3403,9 @@ class ComposerStaticInit823c01ea85d61dbd009573be8e82a712 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit823c01ea85d61dbd009573be8e82a712::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit823c01ea85d61dbd009573be8e82a712::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit823c01ea85d61dbd009573be8e82a712::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit36c5a7b318e730f2a84ed7ae195a6070::$classMap; }, null, ClassLoader::class); }