Skip to content

[Performance] Resolve short names once per file version in ShortNameResolver::resolveFromFile() #8525

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

Closed
TomasVotruba wants to merge 1 commit into from
Closed

[Performance] Resolve short names once per file version in ShortNameResolver::resolveFromFile() #8525

Show file tree
Hide file tree
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
28 changes: 28 additions & 0 deletions rules-tests/CodingStyle/ClassNameImport/ShortNameResolver/ShortNameResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,34 @@ public function test(string $filePath, array $expectedShortNames): void
$this->assertSame($expectedShortNames, $shortNames);
}

public function testResolveFromFileAgainAfterStmtsChange(): void
{
$file = $this->testingParser->parseFilePathToFile(__DIR__ . '/Fixture/various_imports.php.inc');
$this->assertNotSame([], $this->shortNameResolver->resolveFromFile($file));

$file->changeNewStmts([]);

$this->assertSame([], $this->shortNameResolver->resolveFromFile($file));
}

public function testResolveFromFilePerFile(): void
{
$firstFile = $this->testingParser->parseFilePathToFile(__DIR__ . '/Fixture/various_imports.php.inc');
$secondFile = $this->testingParser->parseFilePathToFile(__DIR__ . '/Fixture/partial_names.php.inc');

$firstExpected = [
'VariousImports' => 'Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\Fixture\VariousImports',
'SomeFile' => 'Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\Source\SomeFile',
];
$secondExpected = [
'PartialNames' => 'Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\Fixture\PartialNames',
];

$this->assertSame($firstExpected, $this->shortNameResolver->resolveFromFile($firstFile));
$this->assertSame($secondExpected, $this->shortNameResolver->resolveFromFile($secondFile));
$this->assertSame($firstExpected, $this->shortNameResolver->resolveFromFile($firstFile));
}

public function testResolveShortClassLikeNamesAgainAfterStmtsChange(): void
{
$file = $this->testingParser->parseFilePathToFile(__DIR__ . '/Fixture/various_imports.php.inc');
Expand Down
22 changes: 13 additions & 9 deletions rules/CodingStyle/ClassNameImport/ShortNameResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@
*/
final class ShortNameResolver
{
private ?File $shortNamesFile = null;

private int $shortNamesVersion = 0;

/**
* @var array<string, string[]>
* @var array<string, string>
*/
private array $shortNamesByFilePath = [];
private array $shortNamesToFullyQualifiedNames = [];

private ?File $shortClassLikeNamesFile = null;

Expand All @@ -54,16 +58,16 @@ public function __construct(
*/
public function resolveFromFile(File $file): array
{
$filePath = $file->getFilePath();

if (isset($this->shortNamesByFilePath[$filePath])) {
return $this->shortNamesByFilePath[$filePath];
// asked for every imported name, while the short names only change with a new version of the file stmts
if ($file === $this->shortNamesFile && $file->getNewStmtsVersion() === $this->shortNamesVersion) {
return $this->shortNamesToFullyQualifiedNames;
}

$shortNamesToFullyQualifiedNames = $this->resolveForStmts($file->getNewStmts());
$this->shortNamesByFilePath[$filePath] = $shortNamesToFullyQualifiedNames;
$this->shortNamesFile = $file;
$this->shortNamesVersion = $file->getNewStmtsVersion();
$this->shortNamesToFullyQualifiedNames = $this->resolveForStmts($file->getNewStmts());

return $shortNamesToFullyQualifiedNames;
return $this->shortNamesToFullyQualifiedNames;
}

/**
Expand Down
Loading