From 07dd65650f09d440fd0d75bffcc7ed1c35b87fda Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 27 Jul 2023 04:15:19 +0000 Subject: [PATCH] Updated Rector to commit 3a95b1436575815cfc442baf137a2a6a24100cdd https://github.com/rectorphp/rector-src/commit/3a95b1436575815cfc442baf137a2a6a24100cdd [TypeDeclaration] Add Closure support on BoolReturnTypeFromStrictScalarReturnsRector (#4610) --- .../BoolReturnTypeFromStrictScalarReturnsRector.php | 7 ++++--- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromStrictScalarReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromStrictScalarReturnsRector.php index 7bd4fdf5d95..1a171311d5f 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromStrictScalarReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromStrictScalarReturnsRector.php @@ -15,6 +15,7 @@ use PhpParser\Node\Expr\BinaryOp\NotEqual; use PhpParser\Node\Expr\BinaryOp\NotIdentical; use PhpParser\Node\Expr\BinaryOp\Smaller; use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual; +use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\FuncCall; use PhpParser\Node\Identifier; use PhpParser\Node\Name; @@ -84,10 +85,10 @@ CODE_SAMPLE */ public function getNodeTypes() : array { - return [ClassMethod::class, Function_::class]; + return [ClassMethod::class, Function_::class, Closure::class]; } /** - * @param ClassMethod|Function_ $node + * @param ClassMethod|Function_|Closure $node */ public function refactor(Node $node) : ?Node { @@ -107,7 +108,7 @@ CODE_SAMPLE } /** * @param Return_[] $returns - * @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $functionLike + * @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $functionLike */ private function hasOnlyBoolScalarReturnExprs(array $returns, $functionLike) : bool { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 014ea67488f..3a0055395d8 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 = 'b5f973f768f2bb55ca4b224a58a05eb5817b2cae'; + public const PACKAGE_VERSION = '3a95b1436575815cfc442baf137a2a6a24100cdd'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-26 22:18:53'; + public const RELEASE_DATE = '2023-07-27 11:10:47'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 56fb6336a33..481e672b1c4 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 ComposerAutoloaderInit390cf93a3f14159e715e57e6829719cb::getLoader(); +return ComposerAutoloaderInitff7d92f95514b3cf37b6783b33384602::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fba5aecee37..967c0837ec9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit390cf93a3f14159e715e57e6829719cb +class ComposerAutoloaderInitff7d92f95514b3cf37b6783b33384602 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit390cf93a3f14159e715e57e6829719cb return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit390cf93a3f14159e715e57e6829719cb', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitff7d92f95514b3cf37b6783b33384602', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit390cf93a3f14159e715e57e6829719cb', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitff7d92f95514b3cf37b6783b33384602', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit390cf93a3f14159e715e57e6829719cb::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitff7d92f95514b3cf37b6783b33384602::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit390cf93a3f14159e715e57e6829719cb::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitff7d92f95514b3cf37b6783b33384602::$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 e7c5ecab553..2cab61d6d8e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit390cf93a3f14159e715e57e6829719cb +class ComposerStaticInitff7d92f95514b3cf37b6783b33384602 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3023,9 +3023,9 @@ class ComposerStaticInit390cf93a3f14159e715e57e6829719cb public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit390cf93a3f14159e715e57e6829719cb::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit390cf93a3f14159e715e57e6829719cb::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit390cf93a3f14159e715e57e6829719cb::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitff7d92f95514b3cf37b6783b33384602::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitff7d92f95514b3cf37b6783b33384602::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitff7d92f95514b3cf37b6783b33384602::$classMap; }, null, ClassLoader::class); }