From 95ed962a15de2fcdf1bdec14f4b146c2c61dd750 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 26 Dec 2023 17:40:03 +0000 Subject: [PATCH] Updated Rector to commit 6646d23fe0cea4b4a871ca1931e33f0cb2a574c7 https://github.com/rectorphp/rector-src/commit/6646d23fe0cea4b4a871ca1931e33f0cb2a574c7 [CodingStyle] Add RemoveUselessAliasInUseStatementRector (#5394) --- config/set/coding-style.php | 3 +- docs/rector_rules_overview.md | 25 +++++-- ...RemoveUselessAliasInUseStatementRector.php | 70 +++++++++++++++++++ src/Application/VersionResolver.php | 4 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_static.php | 1 + 6 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php diff --git a/config/set/coding-style.php b/config/set/coding-style.php index 2cba7e463f3..1e888ee4114 100644 --- a/config/set/coding-style.php +++ b/config/set/coding-style.php @@ -26,6 +26,7 @@ use Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector; use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector; use Rector\CodingStyle\Rector\Property\SplitGroupedPropertiesRector; use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector; +use Rector\CodingStyle\Rector\Stmt\RemoveUselessAliasInUseStatementRector; use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector; use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector; use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; @@ -36,5 +37,5 @@ use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector; use Rector\Visibility\Rector\ClassMethod\ExplicitPublicClassMethodRector; return static function (RectorConfig $rectorConfig) : void { $rectorConfig->ruleWithConfiguration(FuncCallToConstFetchRector::class, ['php_sapi_name' => 'PHP_SAPI', 'pi' => 'M_PI']); - $rectorConfig->rules([SeparateMultiUseImportsRector::class, PostIncDecToPreIncDecRector::class, NewlineAfterStatementRector::class, RemoveFinalFromConstRector::class, NullableCompareToNullRector::class, ConsistentImplodeRector::class, TernaryConditionVariableAssignmentRector::class, SymplifyQuoteEscapeRector::class, StringClassNameToClassConstantRector::class, CatchExceptionNameMatchingTypeRector::class, UseIncrementAssignRector::class, SplitDoubleAssignRector::class, EncapsedStringsToSprintfRector::class, WrapEncapsedVariableInCurlyBracesRector::class, NewlineBeforeNewAssignSetRector::class, MakeInheritedMethodVisibilitySameAsParentRector::class, CallUserFuncArrayToVariadicRector::class, VersionCompareFuncCallToConstantRector::class, StaticArrowFunctionRector::class, StaticClosureRector::class, CountArrayToEmptyArrayComparisonRector::class, CallUserFuncToMethodCallRector::class, FuncGetArgsToVariadicParamRector::class, StrictArraySearchRector::class, UseClassKeywordForClassNameResolutionRector::class, SplitGroupedPropertiesRector::class, SplitGroupedClassConstantsRector::class, ExplicitPublicClassMethodRector::class, ArraySpreadInsteadOfArrayMergeRector::class]); + $rectorConfig->rules([SeparateMultiUseImportsRector::class, PostIncDecToPreIncDecRector::class, NewlineAfterStatementRector::class, RemoveFinalFromConstRector::class, NullableCompareToNullRector::class, ConsistentImplodeRector::class, TernaryConditionVariableAssignmentRector::class, SymplifyQuoteEscapeRector::class, StringClassNameToClassConstantRector::class, CatchExceptionNameMatchingTypeRector::class, UseIncrementAssignRector::class, SplitDoubleAssignRector::class, EncapsedStringsToSprintfRector::class, WrapEncapsedVariableInCurlyBracesRector::class, NewlineBeforeNewAssignSetRector::class, MakeInheritedMethodVisibilitySameAsParentRector::class, CallUserFuncArrayToVariadicRector::class, VersionCompareFuncCallToConstantRector::class, StaticArrowFunctionRector::class, StaticClosureRector::class, CountArrayToEmptyArrayComparisonRector::class, CallUserFuncToMethodCallRector::class, FuncGetArgsToVariadicParamRector::class, StrictArraySearchRector::class, UseClassKeywordForClassNameResolutionRector::class, SplitGroupedPropertiesRector::class, SplitGroupedClassConstantsRector::class, ExplicitPublicClassMethodRector::class, ArraySpreadInsteadOfArrayMergeRector::class, RemoveUselessAliasInUseStatementRector::class]); }; diff --git a/docs/rector_rules_overview.md b/docs/rector_rules_overview.md index b8550568d8e..cb7a029c70e 100644 --- a/docs/rector_rules_overview.md +++ b/docs/rector_rules_overview.md @@ -1,4 +1,4 @@ -# 353 Rules Overview +# 354 Rules Overview
@@ -8,7 +8,7 @@ - [CodeQuality](#codequality) (73) -- [CodingStyle](#codingstyle) (27) +- [CodingStyle](#codingstyle) (28) - [DeadCode](#deadcode) (43) @@ -1867,6 +1867,19 @@ Remove final from constants in classes defined as final
+### RemoveUselessAliasInUseStatementRector + +Remove useless alias in use statement as same name with last use statement name + +- class: [`Rector\CodingStyle\Rector\Stmt\RemoveUselessAliasInUseStatementRector`](../rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php) + +```diff +-use App\Bar as Bar; ++use App\Bar; +``` + +
+ ### SeparateMultiUseImportsRector Split multi use imports and trait statements to standalone lines @@ -4765,13 +4778,13 @@ Change simple property init and assign to constructor promotion ```diff class SomeClass { -- public float $someVariable; +- public float $price; - public function __construct( -- float $someVariable = 0.0 -+ public float $someVariable = 0.0 +- float $price = 0.0 ++ public float $price = 0.0 ) { -- $this->someVariable = $someVariable; +- $this->price = $price; } } ``` diff --git a/rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php b/rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php new file mode 100644 index 00000000000..0d189113c61 --- /dev/null +++ b/rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php @@ -0,0 +1,70 @@ +> + */ + public function getNodeTypes() : array + { + return [FileWithoutNamespace::class, Namespace_::class]; + } + /** + * @param FileWithoutNamespace|Namespace_ $node + * @return null|\Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace|\PhpParser\Node\Stmt\Namespace_ + */ + public function refactor(Node $node) + { + $hasChanged = \false; + foreach ($node->stmts as $stmt) { + if (!$stmt instanceof Use_) { + continue; + } + if (\count($stmt->uses) !== 1) { + continue; + } + if (!isset($stmt->uses[0])) { + continue; + } + $aliasName = $stmt->uses[0]->alias instanceof Identifier ? $stmt->uses[0]->alias->toString() : null; + if ($aliasName === null) { + continue; + } + $useName = $stmt->uses[0]->name->toString(); + $lastName = Strings::after($useName, '\\', -1) ?? $useName; + if ($lastName === $aliasName) { + $stmt->uses[0]->alias = null; + $hasChanged = \true; + } + } + if ($hasChanged) { + return $node; + } + return null; + } +} diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 43df0175111..f39aa9df95e 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 = '6bff51172cf396da8abc062d96f0406fd86ef349'; + public const PACKAGE_VERSION = '6646d23fe0cea4b4a871ca1931e33f0cb2a574c7'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-12-25 10:15:01'; + public const RELEASE_DATE = '2023-12-26 18:37:51'; /** * @var int */ diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index a5270b4ff9d..db9391b9b8f 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1150,6 +1150,7 @@ return array( 'Rector\\CodingStyle\\Rector\\PostInc\\PostIncDecToPreIncDecRector' => $baseDir . '/rules/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector.php', 'Rector\\CodingStyle\\Rector\\Property\\SplitGroupedPropertiesRector' => $baseDir . '/rules/CodingStyle/Rector/Property/SplitGroupedPropertiesRector.php', 'Rector\\CodingStyle\\Rector\\Stmt\\NewlineAfterStatementRector' => $baseDir . '/rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php', + 'Rector\\CodingStyle\\Rector\\Stmt\\RemoveUselessAliasInUseStatementRector' => $baseDir . '/rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php', 'Rector\\CodingStyle\\Rector\\String_\\SymplifyQuoteEscapeRector' => $baseDir . '/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php', 'Rector\\CodingStyle\\Rector\\String_\\UseClassKeywordForClassNameResolutionRector' => $baseDir . '/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php', 'Rector\\CodingStyle\\Rector\\Ternary\\TernaryConditionVariableAssignmentRector' => $baseDir . '/rules/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 49dc9edbe62..862283bade0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1368,6 +1368,7 @@ class ComposerStaticInit8339caf294dd12447c06647e5d0dc118 'Rector\\CodingStyle\\Rector\\PostInc\\PostIncDecToPreIncDecRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector.php', 'Rector\\CodingStyle\\Rector\\Property\\SplitGroupedPropertiesRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/Property/SplitGroupedPropertiesRector.php', 'Rector\\CodingStyle\\Rector\\Stmt\\NewlineAfterStatementRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php', + 'Rector\\CodingStyle\\Rector\\Stmt\\RemoveUselessAliasInUseStatementRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/Stmt/RemoveUselessAliasInUseStatementRector.php', 'Rector\\CodingStyle\\Rector\\String_\\SymplifyQuoteEscapeRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php', 'Rector\\CodingStyle\\Rector\\String_\\UseClassKeywordForClassNameResolutionRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php', 'Rector\\CodingStyle\\Rector\\Ternary\\TernaryConditionVariableAssignmentRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector.php',