From e14c8a528b720aac8a48bae7203e908162407f7f Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 23 Mar 2024 16:49:42 +0000 Subject: [PATCH] Updated Rector to commit aac889be3d845974d3ab924ff7ad22784b9e3cb5 https://github.com/rectorphp/rector-src/commit/aac889be3d845974d3ab924ff7ad22784b9e3cb5 [AutoImport] Remove unused compare removed use on FullyQualifiedNameClassNameImportSkipVoter (#5764) --- ...FullyQualifiedNameClassNameImportSkipVoter.php | 15 ++------------- src/Application/VersionResolver.php | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php index 9fa3232bcb7..318b7c7c5aa 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php @@ -7,7 +7,6 @@ use RectorPrefix202403\Nette\Utils\Strings; use PhpParser\Node; use Rector\CodingStyle\ClassNameImport\ShortNameResolver; use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface; -use Rector\Configuration\RenamedClassesDataCollector; use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType; use Rector\ValueObject\Application\File; /** @@ -26,15 +25,9 @@ final class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImpor * @var \Rector\CodingStyle\ClassNameImport\ShortNameResolver */ private $shortNameResolver; - /** - * @readonly - * @var \Rector\Configuration\RenamedClassesDataCollector - */ - private $renamedClassesDataCollector; - public function __construct(ShortNameResolver $shortNameResolver, RenamedClassesDataCollector $renamedClassesDataCollector) + public function __construct(ShortNameResolver $shortNameResolver) { $this->shortNameResolver = $shortNameResolver; - $this->renamedClassesDataCollector = $renamedClassesDataCollector; } public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool { @@ -43,7 +36,6 @@ final class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImpor $shortNamesToFullyQualifiedNames = $this->shortNameResolver->resolveFromFile($file); $fullyQualifiedObjectTypeShortName = $fullyQualifiedObjectType->getShortName(); $className = $fullyQualifiedObjectType->getClassName(); - $removedUses = $this->renamedClassesDataCollector->getOldClasses(); foreach ($shortNamesToFullyQualifiedNames as $shortName => $fullyQualifiedName) { if ($fullyQualifiedObjectTypeShortName !== $shortName) { $shortName = $this->cleanShortName($shortName); @@ -52,10 +44,7 @@ final class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImpor continue; } $fullyQualifiedName = \ltrim($fullyQualifiedName, '\\'); - if ($className === $fullyQualifiedName) { - return \false; - } - return !\in_array($fullyQualifiedName, $removedUses, \true); + return $className !== $fullyQualifiedName; } return \false; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 526351e0e96..4b1c3635e26 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'e3e741edd3ca55fc2c24c040f43c8974bda7e953'; + public const PACKAGE_VERSION = 'aac889be3d845974d3ab924ff7ad22784b9e3cb5'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-03-23 21:34:02'; + public const RELEASE_DATE = '2024-03-23 23:47:25'; /** * @var int */