From b3c461facb1bffd06c1b87de8196953bec5f82de Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 18 Feb 2024 09:11:32 +0000 Subject: [PATCH] Updated Rector to commit a8d0dbeb7191d57af0ac9068adf644730f728c83 https://github.com/rectorphp/rector-src/commit/a8d0dbeb7191d57af0ac9068adf644730f728c83 Add const fetch to class const fetch rector. (#5627) --- .../ConstFetchToClassConstFetchRector.php | 44 +++++++++++++++++++ .../ConstFetchToClassConstFetch.php | 42 ++++++++++++++++++ src/Application/VersionResolver.php | 4 +- vendor/composer/autoload_classmap.php | 2 + vendor/composer/autoload_static.php | 2 + 5 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php create mode 100644 rules/Transform/ValueObject/ConstFetchToClassConstFetch.php diff --git a/rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php b/rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php new file mode 100644 index 00000000000..5525d0bd598 --- /dev/null +++ b/rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php @@ -0,0 +1,44 @@ +constFetchToClassConsts as $constFetchToClassConst) { + if (!$this->isName($node, $constFetchToClassConst->getOldConstName())) { + continue; + } + return $this->nodeFactory->createClassConstFetch($constFetchToClassConst->getNewClassName(), $constFetchToClassConst->getNewConstName()); + } + return null; + } + public function configure(array $configuration) : void + { + Assert::allIsAOf($configuration, ConstFetchToClassConstFetch::class); + $this->constFetchToClassConsts = $configuration; + } +} diff --git a/rules/Transform/ValueObject/ConstFetchToClassConstFetch.php b/rules/Transform/ValueObject/ConstFetchToClassConstFetch.php new file mode 100644 index 00000000000..ba4d10dfe24 --- /dev/null +++ b/rules/Transform/ValueObject/ConstFetchToClassConstFetch.php @@ -0,0 +1,42 @@ +oldConstName = $oldConstName; + $this->newClassName = $newClassName; + $this->newConstName = $newConstName; + RectorAssert::constantName($oldConstName); + RectorAssert::className($newClassName); + RectorAssert::constantName($newConstName); + } + public function getOldConstName() : string + { + return $this->oldConstName; + } + public function getNewClassName() : string + { + return $this->newClassName; + } + public function getNewConstName() : string + { + return $this->newConstName; + } +} diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 7556b592f2a..5976813fe83 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 = 'a4f28525c9df28ed142eabe1cde70035715fa785'; + public const PACKAGE_VERSION = 'a8d0dbeb7191d57af0ac9068adf644730f728c83'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-02-18 07:31:15'; + public const RELEASE_DATE = '2024-02-18 10:09:06'; /** * @var int */ diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 1262e203e06..22bcde070eb 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -2290,6 +2290,7 @@ return array( 'Rector\\Transform\\Rector\\Class_\\AddInterfaceByTraitRector' => $baseDir . '/rules/Transform/Rector/Class_/AddInterfaceByTraitRector.php', 'Rector\\Transform\\Rector\\Class_\\MergeInterfacesRector' => $baseDir . '/rules/Transform/Rector/Class_/MergeInterfacesRector.php', 'Rector\\Transform\\Rector\\Class_\\ParentClassToTraitsRector' => $baseDir . '/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php', + 'Rector\\Transform\\Rector\\ConstFetch\\ConstFetchToClassConstFetchRector' => $baseDir . '/rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php', 'Rector\\Transform\\Rector\\FileWithoutNamespace\\RectorConfigBuilderRector' => $baseDir . '/rules/Transform/Rector/FileWithoutNamespace/RectorConfigBuilderRector.php', 'Rector\\Transform\\Rector\\FuncCall\\FuncCallToConstFetchRector' => $baseDir . '/rules/Transform/Rector/FuncCall/FuncCallToConstFetchRector.php', 'Rector\\Transform\\Rector\\FuncCall\\FuncCallToMethodCallRector' => $baseDir . '/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php', @@ -2306,6 +2307,7 @@ return array( 'Rector\\Transform\\Rector\\String_\\StringToClassConstantRector' => $baseDir . '/rules/Transform/Rector/String_/StringToClassConstantRector.php', 'Rector\\Transform\\ValueObject\\AttributeKeyToClassConstFetch' => $baseDir . '/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php', 'Rector\\Transform\\ValueObject\\ClassMethodReference' => $baseDir . '/rules/Transform/ValueObject/ClassMethodReference.php', + 'Rector\\Transform\\ValueObject\\ConstFetchToClassConstFetch' => $baseDir . '/rules/Transform/ValueObject/ConstFetchToClassConstFetch.php', 'Rector\\Transform\\ValueObject\\FuncCallToMethodCall' => $baseDir . '/rules/Transform/ValueObject/FuncCallToMethodCall.php', 'Rector\\Transform\\ValueObject\\FuncCallToStaticCall' => $baseDir . '/rules/Transform/ValueObject/FuncCallToStaticCall.php', 'Rector\\Transform\\ValueObject\\MethodCallToFuncCall' => $baseDir . '/rules/Transform/ValueObject/MethodCallToFuncCall.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index f36c4cd9c97..f870af5d75f 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -2509,6 +2509,7 @@ class ComposerStaticInit2d887a2f87c676eb32b3e04612865e54 'Rector\\Transform\\Rector\\Class_\\AddInterfaceByTraitRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Class_/AddInterfaceByTraitRector.php', 'Rector\\Transform\\Rector\\Class_\\MergeInterfacesRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Class_/MergeInterfacesRector.php', 'Rector\\Transform\\Rector\\Class_\\ParentClassToTraitsRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php', + 'Rector\\Transform\\Rector\\ConstFetch\\ConstFetchToClassConstFetchRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/ConstFetch/ConstFetchToClassConstFetchRector.php', 'Rector\\Transform\\Rector\\FileWithoutNamespace\\RectorConfigBuilderRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/FileWithoutNamespace/RectorConfigBuilderRector.php', 'Rector\\Transform\\Rector\\FuncCall\\FuncCallToConstFetchRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/FuncCall/FuncCallToConstFetchRector.php', 'Rector\\Transform\\Rector\\FuncCall\\FuncCallToMethodCallRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php', @@ -2525,6 +2526,7 @@ class ComposerStaticInit2d887a2f87c676eb32b3e04612865e54 'Rector\\Transform\\Rector\\String_\\StringToClassConstantRector' => __DIR__ . '/../..' . '/rules/Transform/Rector/String_/StringToClassConstantRector.php', 'Rector\\Transform\\ValueObject\\AttributeKeyToClassConstFetch' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/AttributeKeyToClassConstFetch.php', 'Rector\\Transform\\ValueObject\\ClassMethodReference' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/ClassMethodReference.php', + 'Rector\\Transform\\ValueObject\\ConstFetchToClassConstFetch' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/ConstFetchToClassConstFetch.php', 'Rector\\Transform\\ValueObject\\FuncCallToMethodCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/FuncCallToMethodCall.php', 'Rector\\Transform\\ValueObject\\FuncCallToStaticCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/FuncCallToStaticCall.php', 'Rector\\Transform\\ValueObject\\MethodCallToFuncCall' => __DIR__ . '/../..' . '/rules/Transform/ValueObject/MethodCallToFuncCall.php',