Skip to content

[Performance] [PostRector] Reduce repetitive resolve uses statements on NameImportingPostRector #4579

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

Merged
samsonasik merged 2 commits into from
Jul 22, 2023
Merged

[Performance] [PostRector] Reduce repetitive resolve uses statements on NameImportingPostRector #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb5b4dd
[PostRector] Reduce repetitive resolve uses statements on NameImporti…
samsonasik Jul 22, 2023
913515d
[PostRector] Reduce repetitive resolve uses statements on NameImporti…
samsonasik Jul 22, 2023
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
2 changes: 1 addition & 1 deletion packages/PostRector/Rector/NameImportingPostRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private function resolveNameInUse(Name $name, array $currentUses): null|Name|Ful
return null;
}

$aliasName = $this->aliasNameResolver->resolveByName($name);
$aliasName = $this->aliasNameResolver->resolveByName($name, $currentUses);
if (is_string($aliasName)) {
return new Name($aliasName);
}
Expand Down
12 changes: 10 additions & 2 deletions rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Rector\Core\Rector\AbstractRector;
use Rector\Naming\Naming\AliasNameResolver;
use Rector\Naming\Naming\PropertyNaming;
use Rector\Naming\Naming\UseImportsResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand All @@ -39,7 +40,8 @@ final class CatchExceptionNameMatchingTypeRector extends AbstractRector

public function __construct(
private readonly PropertyNaming $propertyNaming,
private readonly AliasNameResolver $aliasNameResolver
private readonly AliasNameResolver $aliasNameResolver,
private readonly UseImportsResolver $useImportsResolver
) {
}

Expand Down Expand Up @@ -105,6 +107,8 @@ public function refactor(Node $node): ?Node
}

$hasChanged = false;
$uses = null;

foreach ($node->stmts as $key => $stmt) {
if ($this->shouldSkip($stmt)) {
continue;
Expand All @@ -125,10 +129,14 @@ public function refactor(Node $node): ?Node
/** @var string $oldVariableName */
$oldVariableName = (string) $this->getName($catchVar);

if ($uses === null) {
$uses = $this->useImportsResolver->resolve();
}

$type = $catch->types[0];
$typeShortName = $this->nodeNameResolver->getShortName($type);
$aliasName = $this->aliasNameResolver->resolveByName($type, $uses);

$aliasName = $this->aliasNameResolver->resolveByName($type);
if (is_string($aliasName)) {
$typeShortName = $aliasName;
}
Expand Down
8 changes: 6 additions & 2 deletions rules/Naming/Naming/AliasNameResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\GroupUse;
use PhpParser\Node\Stmt\Use_;

final class AliasNameResolver
{
Expand All @@ -14,9 +16,11 @@ public function __construct(
) {
}

public function resolveByName(Name $name): ?string
/**
* @param Use_[]|GroupUse[] $uses
*/
public function resolveByName(Name $name, array $uses): ?string
{
$uses = $this->useImportsResolver->resolve();
$nameString = $name->toString();

foreach ($uses as $use) {
Expand Down