octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit dae8c61493b22119f0ece2e1d870ff5a0cb91993 

dae8c61493 [Performance][AutoImport] Remove just renamed check on ClassNameImportSkipper (#5106)
This commit is contained in:
Tomas Votruba 2023-10-02 16:48:47 +00:00
parent 1425f0b38c
commit f7114d03e6
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php
View File

@ -10,7 +10,6 @@ use PhpParser\Node\Stmt\GroupUse;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
use Rector\Core\Configuration\RenamedClassesDataCollector;
use Rector\Core\ValueObject\Application\File;
use Rector\Naming\Naming\UseImportsResolver;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@ -21,11 +20,6 @@ final class ClassNameImportSkipper
* @readonly
*/
private $classNameImportSkipVoters;
/**
* @readonly
* @var \Rector\Core\Configuration\RenamedClassesDataCollector
*/
private $renamedClassesDataCollector;
/**
* @readonly
* @var \Rector\Naming\Naming\UseImportsResolver
@ -34,10 +28,9 @@ final class ClassNameImportSkipper
/**
* @param ClassNameImportSkipVoterInterface[] $classNameImportSkipVoters
*/
public function __construct(iterable $classNameImportSkipVoters, RenamedClassesDataCollector $renamedClassesDataCollector, UseImportsResolver $useImportsResolver)
public function __construct(iterable $classNameImportSkipVoters, UseImportsResolver $useImportsResolver)
{
$this->classNameImportSkipVoters = $classNameImportSkipVoters;
$this->renamedClassesDataCollector = $renamedClassesDataCollector;
$this->useImportsResolver = $useImportsResolver;
}
public function shouldSkipNameForFullyQualifiedObjectType(File $file, Node $node, FullyQualifiedObjectType $fullyQualifiedObjectType) : bool
@ -68,9 +61,6 @@ final class ClassNameImportSkipper
if ($useUseLastName !== $nameLastName) {
continue;
}
if ($this->isJustRenamedClass($stringName, $prefix, $useUse)) {
continue;
}
if ($this->isConflictedShortNameInUse($useUse, $useName, $lastUseName, $stringName)) {
return \false;
}
@ -86,20 +76,4 @@ final class ClassNameImportSkipper
}
return $useUse->alias instanceof Identifier && $useUse->alias->toString() === $stringName;
}
private function isJustRenamedClass(string $stringName, string $prefix, UseUse $useUse) : bool
{
$useUseNameString = $prefix . $useUse->name->toString();
// is in renamed classes? skip it
foreach ($this->renamedClassesDataCollector->getOldToNewClasses() as $oldClass => $newClass) {
// is class being renamed in use imports?
if ($stringName !== $newClass) {
continue;
}
if ($useUseNameString !== $oldClass) {
continue;
}
return \true;
}
return \false;
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '478b257792be25a6f32e1a7bf672d33d2832a574';
public const PACKAGE_VERSION = 'dae8c61493b22119f0ece2e1d870ff5a0cb91993';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-10-02 22:38:10';
public const RELEASE_DATE = '2023-10-02 23:46:04';
/**
* @var int
*/