From cb35f4b8c09e69b6742b7d69f83c7359d69507ed Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 5 Sep 2022 12:47:29 +0000 Subject: [PATCH] Updated Rector to commit f230e5463ae1bfd9e1d6070935def31ae493109e https://github.com/rectorphp/rector-src/commit/f230e5463ae1bfd9e1d6070935def31ae493109e [PHP 8.1] Do not process static methods from Enum class (#2911) --- .../MyCLabsMethodCallToEnumConstRector.php | 17 +++++++++++++++++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php b/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php index 3e767cd873a..9265fc3140b 100644 --- a/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php +++ b/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php @@ -23,6 +23,10 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; */ final class MyCLabsMethodCallToEnumConstRector extends AbstractRector implements MinPhpVersionInterface { + /** + * @var string[] + */ + private const ENUM_METHODS = ['from', 'values', 'keys', 'isValid', 'search', 'toArray', 'assertValidValue']; public function getRuleDefinition() : RuleDefinition { return new RuleDefinition('Refactor MyCLabs enum fetch to Enum const', [new CodeSample(<<<'CODE_SAMPLE' @@ -52,6 +56,9 @@ CODE_SAMPLE if ($enumCaseName === null) { return null; } + if ($this->shouldOmitEnumCase($enumCaseName)) { + return null; + } if ($node instanceof MethodCall) { return $this->refactorMethodCall($node, $enumCaseName); } @@ -82,6 +89,9 @@ CODE_SAMPLE if ($enumCaseName === null) { return null; } + if ($this->shouldOmitEnumCase($enumCaseName)) { + return null; + } return $this->nodeFactory->createClassConstFetch($className, $enumCaseName); } private function refactorGetValueMethodCall(MethodCall $methodCall) : ?PropertyFetch @@ -98,6 +108,9 @@ CODE_SAMPLE if ($enumCaseName === null) { return null; } + if ($this->shouldOmitEnumCase($enumCaseName)) { + return null; + } $enumConstFetch = $this->nodeFactory->createClassConstFetch($className, $enumCaseName); return new PropertyFetch($enumConstFetch, 'value'); } @@ -117,4 +130,8 @@ CODE_SAMPLE } return null; } + private function shouldOmitEnumCase(string $enumCaseName) : bool + { + return \in_array($enumCaseName, self::ENUM_METHODS, \true); + } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 44b2beb2bce..d1e92309e44 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 = 'edf1d520411ac348fa874fdf67e2924acf752f08'; + public const PACKAGE_VERSION = 'f230e5463ae1bfd9e1d6070935def31ae493109e'; /** * @api * @var string */ - public const RELEASE_DATE = '2022-09-05 13:58:27'; + public const RELEASE_DATE = '2022-09-05 14:42:35'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 933064dcf36..4da22356aac 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 ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937::getLoader(); +return ComposerAutoloaderInite6d9d73ab60df60c9870f2003c9c9d29::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index f140f62faf4..41c60799c60 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937 +class ComposerAutoloaderInite6d9d73ab60df60c9870f2003c9c9d29 { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInite6d9d73ab60df60c9870f2003c9c9d29', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInite6d9d73ab60df60c9870f2003c9c9d29', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit381e3878476bc4f190c0d0630e379937::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit381e3878476bc4f190c0d0630e379937::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire381e3878476bc4f190c0d0630e379937($fileIdentifier, $file); + composerRequiree6d9d73ab60df60c9870f2003c9c9d29($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInit381e3878476bc4f190c0d0630e379937 * @param string $file * @return void */ -function composerRequire381e3878476bc4f190c0d0630e379937($fileIdentifier, $file) +function composerRequiree6d9d73ab60df60c9870f2003c9c9d29($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 ce7bc0069c4..a923f8cd1fd 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit381e3878476bc4f190c0d0630e379937 +class ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3093,9 +3093,9 @@ class ComposerStaticInit381e3878476bc4f190c0d0630e379937 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit381e3878476bc4f190c0d0630e379937::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit381e3878476bc4f190c0d0630e379937::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit381e3878476bc4f190c0d0630e379937::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInite6d9d73ab60df60c9870f2003c9c9d29::$classMap; }, null, ClassLoader::class); }