Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor ImplementsFactoryInterfaceToPsrFactoryRector to use UseImportsResolver to get Use_[] collection #78

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Refactor ImplementsFactoryInterfaceToPsrFactoryRector to use UseImportsResolver to get Use_[] collection #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions src/Rector/Class_/ImplementsFactoryInterfaceToPsrFactoryRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
use PhpParser\Node\Identifier;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use Rector\Core\Configuration\Option;
use Rector\Core\Configuration\RectorConfigProvider;
use Rector\Naming\Naming\UseImportsResolver;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

Expand All @@ -21,10 +20,14 @@ final class ImplementsFactoryInterfaceToPsrFactoryRector extends AbstractRector
private const FACTORY_INTERFACE = FactoryInterface::class;

private RectorConfigProvider $rectorConfigProvider;
private UseImportsResolver $useImportsResolver;

public function __construct(RectorConfigProvider $rectorConfigProvider)
{
public function __construct(
RectorConfigProvider $rectorConfigProvider,
UseImportsResolver $useImportsResolver
) {
$this->rectorConfigProvider = $rectorConfigProvider;
$this->useImportsResolver = $useImportsResolver;
}

public function getRuleDefinition(): RuleDefinition
Expand Down Expand Up @@ -166,33 +169,28 @@ private function replaceInvokeClassMethodParams(ClassMethod $classMethod): void

private function replaceUseInteropStatementOnAutoImportEnabled(Class_ $class): void
{
if (! $this->rectorConfigProvider->shouldImportNames(Option::AUTO_IMPORT_NAMES)) {
if (! $this->rectorConfigProvider->shouldImportNames()) {
return;
}

$use = $this->betterNodeFinder->findFirstPrevious($class, function (Node $subNode): bool {
if (! $subNode instanceof Use_) {
return false;
}
$uses = $this->useImportsResolver->resolveBareUsesForNode($class);

$uses = $subNode->uses;
if (count($uses) > 1) { // skip group use A\B\C { d, e, f}
return false;
}
foreach ($uses as $use) {
/** @var UseUse|false $useUse */
$useUse = current($use->uses);

if (! isset($uses[0]) || ! $uses[0] instanceof UseUse) { // maybe changed by other rector rule? skip
return false;
if (! $useUse instanceof UseUse) {
continue;
}

if ($uses[0]->alias instanceof Identifier) {
return false;
if ($useUse->alias instanceof Identifier) {
continue;
}

return $uses[0]->name->toString() === 'Interop\Container\ContainerInterface';
});

if ($use instanceof Use_) {
$this->removeNode($use);
if ($useUse->name->toString() === 'Interop\Container\ContainerInterface') {
$this->removeNode($use);
break;
}
}
}
}