octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-12 14:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CodingStyle] Skip RemoveUnusedAliasRector when same class in use statement exists, but not used (#732)

Browse Source 
* [CodingStyle] Skip RemoveUnusedAliasRector used by return method call

* update fixture

* update fixture

* Fixed 🎉

* clean up

* [ci-review] Rector Rectify

* no scope handling

Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
Abdul Malik Ikhsan 2021-08-23 03:54:06 +07:00 committed by GitHub
parent 138aa5ea68
commit 1cc465b4d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rules-tests/CodingStyle/Rector/Use_/RemoveUnusedAliasRector/Fixture/skip_same_class_in_use_statement_not_used.php.inc Normal file
View File

@ -0,0 +1,14 @@
<?php
namespace Rector\Tests\CodingStyle\Rector\Use_\RemoveUnusedAliasRector\Fixture;
use Rector\Tests\CodingStyle\Rector\Use_\RemoveUnusedAliasRector\Source\StandaloneClass;
use Rector\Tests\CodingStyle\Rector\Use_\RemoveUnusedAliasRector\Source\DifferentNamespace\StandaloneClass as StandaloneClassDifferentNamespace;
class SkipSameClassInUseStatementNotUsed
{
public function run()
{
return new StandaloneClassDifferentNamespace();
}
}

37
rules/CodingStyle/Rector/Use_/RemoveUnusedAliasRector.php
View File

@ -12,6 +12,7 @@ use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipper;
use Rector\CodingStyle\Naming\NameRenamer;
use Rector\CodingStyle\Node\DocAliasResolver;
use Rector\CodingStyle\Node\UseManipulator;
@ -46,7 +47,8 @@ final class RemoveUnusedAliasRector extends AbstractRector
private DocAliasResolver $docAliasResolver,
private UseManipulator $useManipulator,
private UseNameAliasToNameResolver $useNameAliasToNameResolver,
private NameRenamer $nameRenamer
private NameRenamer $nameRenamer,
private ClassNameImportSkipper $classNameImportSkipper
) {
}
@ -129,7 +131,7 @@ CODE_SAMPLE
continue;
}
$this->refactorAliasName($aliasName, $lastName, $use);
$this->refactorAliasName($node, $aliasName, $lastName, $use);
}
return $node;
@ -206,20 +208,27 @@ CODE_SAMPLE
});
}
private function refactorAliasName(string $aliasName, string $lastName, UseUse $useUse): void
private function refactorAliasName(Use_ $use, string $aliasName, string $lastName, UseUse $useUse): void
{
// only alias name is used → use last name directly
$parentUse = $use->getAttribute(AttributeKey::PARENT_NODE);
if (! $parentUse instanceof Node) {
return;
}
/** @var Use_[] $uses */
$uses = $this->betterNodeFinder->find($parentUse, function (Node $node) use ($use): bool {
if ($node === $use) {
return false;
}
return $node instanceof Use_;
});
if ($this->classNameImportSkipper->isShortNameInUseStatement(new Name($lastName), $uses)) {
return;
}
$lowerAliasName = strtolower($aliasName);
if (! isset($this->resolvedNodeNames[$lowerAliasName])) {
return;
}
// keep to differentiate 2 aliases classes
$lowerLastName = strtolower($lastName);
if (count($this->useNamesAliasToName[$lowerLastName] ?? []) > 1) {
return;
}
$this->nameRenamer->renameNameNode($this->resolvedNodeNames[$lowerAliasName], $lastName);
$useUse->alias = null;
}