From 239f91295eadb1f3ba05dc45201751dde6a8caf0 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 7 Jul 2022 09:23:09 +0000 Subject: [PATCH] Updated Rector to commit b67bf649899000a913c4c91ec7ce43b165aa471d https://github.com/rectorphp/rector-src/commit/b67bf649899000a913c4c91ec7ce43b165aa471d move ParamTypeByParentCallTypeRector to type-declaration-strict set --- config/set/type-declaration-strict.php | 3 ++- config/set/type-declaration.php | 14 +------------- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/config/set/type-declaration-strict.php b/config/set/type-declaration-strict.php index 7148357f16fe..b72f9bd486f1 100644 --- a/config/set/type-declaration-strict.php +++ b/config/set/type-declaration-strict.php @@ -8,6 +8,7 @@ use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; use Rector\TypeDeclaration\Rector\ClassMethod\ArrayShapeFromConstantArrayReturnRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictBoolReturnExprRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeFuncCallRector; @@ -20,5 +21,5 @@ use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictSetUpRector; return static function (RectorConfig $rectorConfig) : void { - $rectorConfig->rules([AddClosureReturnTypeRector::class, ReturnTypeFromStrictTypedPropertyRector::class, TypedPropertyFromStrictConstructorRector::class, ParamTypeFromStrictTypedPropertyRector::class, ReturnTypeFromStrictTypedCallRector::class, AddVoidReturnTypeWhereNoReturnRector::class, ReturnTypeFromReturnNewRector::class, TypedPropertyFromStrictGetterMethodReturnTypeRector::class, AddMethodCallBasedStrictParamTypeRector::class, ArrayShapeFromConstantArrayReturnRector::class, ReturnTypeFromStrictBoolReturnExprRector::class, ReturnTypeFromStrictNativeFuncCallRector::class, ReturnTypeFromStrictNewArrayRector::class, ReturnTypeFromStrictScalarReturnExprRector::class, TypedPropertyFromStrictSetUpRector::class]); + $rectorConfig->rules([AddClosureReturnTypeRector::class, ReturnTypeFromStrictTypedPropertyRector::class, TypedPropertyFromStrictConstructorRector::class, ParamTypeFromStrictTypedPropertyRector::class, ReturnTypeFromStrictTypedCallRector::class, AddVoidReturnTypeWhereNoReturnRector::class, ReturnTypeFromReturnNewRector::class, TypedPropertyFromStrictGetterMethodReturnTypeRector::class, AddMethodCallBasedStrictParamTypeRector::class, ArrayShapeFromConstantArrayReturnRector::class, ReturnTypeFromStrictBoolReturnExprRector::class, ReturnTypeFromStrictNativeFuncCallRector::class, ReturnTypeFromStrictNewArrayRector::class, ReturnTypeFromStrictScalarReturnExprRector::class, TypedPropertyFromStrictSetUpRector::class, ParamTypeByParentCallTypeRector::class]); }; diff --git a/config/set/type-declaration.php b/config/set/type-declaration.php index 98c0d6e3a511..46774ec5505d 100644 --- a/config/set/type-declaration.php +++ b/config/set/type-declaration.php @@ -8,7 +8,6 @@ use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ParamAnnotationIncorrectNullableRector; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector; -use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector; use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector; use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; @@ -17,16 +16,5 @@ use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; use Rector\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector; return static function (RectorConfig $rectorConfig) : void { - $rectorConfig->rule(ParamTypeDeclarationRector::class); - $rectorConfig->rule(ReturnTypeDeclarationRector::class); - $rectorConfig->rule(PropertyTypeDeclarationRector::class); - $rectorConfig->rule(AddClosureReturnTypeRector::class); - $rectorConfig->rule(AddArrayParamDocTypeRector::class); - $rectorConfig->rule(AddArrayReturnDocTypeRector::class); - $rectorConfig->rule(ParamTypeByParentCallTypeRector::class); - $rectorConfig->rule(ParamTypeByMethodCallTypeRector::class); - $rectorConfig->rule(TypedPropertyFromAssignsRector::class); - $rectorConfig->rule(ReturnAnnotationIncorrectNullableRector::class); - $rectorConfig->rule(VarAnnotationIncorrectNullableRector::class); - $rectorConfig->rule(ParamAnnotationIncorrectNullableRector::class); + $rectorConfig->rules([ParamTypeDeclarationRector::class, ReturnTypeDeclarationRector::class, PropertyTypeDeclarationRector::class, AddClosureReturnTypeRector::class, AddArrayParamDocTypeRector::class, AddArrayReturnDocTypeRector::class, ParamTypeByMethodCallTypeRector::class, TypedPropertyFromAssignsRector::class, ReturnAnnotationIncorrectNullableRector::class, VarAnnotationIncorrectNullableRector::class, ParamAnnotationIncorrectNullableRector::class]); }; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index bdea5aaa1455..ea4a555129da 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -17,12 +17,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '22f2acadf73bc00a350b6b457db51eb5e0353d89'; + public const PACKAGE_VERSION = 'b67bf649899000a913c4c91ec7ce43b165aa471d'; /** * @api * @var string */ - public const RELEASE_DATE = '2022-07-07 10:54:38'; + public const RELEASE_DATE = '2022-07-07 11:17:45'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 4564ce465835..52074010f122 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -9,4 +9,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd::getLoader(); +return ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 633e35212236..a73de03b900b 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd +class ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e { private static $loader; @@ -22,19 +22,19 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitab2609172046cee66f6ea03a3c02037e::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire6a7b45bdeda296aaafeb064485efabcd($fileIdentifier, $file); + composerRequireab2609172046cee66f6ea03a3c02037e($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ public static function getLoader() * @param string $file * @return void */ -function composerRequire6a7b45bdeda296aaafeb064485efabcd($fileIdentifier, $file) +function composerRequireab2609172046cee66f6ea03a3c02037e($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 c43be3c0953f..94615e6118d2 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd +class ComposerStaticInitab2609172046cee66f6ea03a3c02037e { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3412,9 +3412,9 @@ class ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$classMap; }, null, ClassLoader::class); }