diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 490137cab66..d932732ad93 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -127,14 +127,14 @@ final class NameImportingPostRector extends \Rector\PostRector\Rector\AbstractPo } /** @var Use_[]|GroupUse[] $currentUses */ $currentUses = $this->useImportsResolver->resolve(); - if ($this->classNameImportSkipper->shouldImportName($name, $currentUses)) { - $nameInUse = $this->resolveNameInUse($name, $currentUses); - if ($nameInUse instanceof Name) { - return $nameInUse; - } - return $this->nameImporter->importName($name, $file); + if ($this->classNameImportSkipper->shouldSkipName($name, $currentUses)) { + return null; } - return null; + $nameInUse = $this->resolveNameInUse($name, $currentUses); + if ($nameInUse instanceof Name) { + return $nameInUse; + } + return $this->nameImporter->importName($name, $file); } /** * @param Use_[]|GroupUse[] $currentUses diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php index aa255d11e39..30ce8c5bc24 100644 --- a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php +++ b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php @@ -45,10 +45,10 @@ final class ClassNameImportSkipper /** * @param Use_[]|GroupUse[] $uses */ - public function shouldImportName(Name $name, array $uses) : bool + public function shouldSkipName(Name $name, array $uses) : bool { if (\substr_count($name->toCodeString(), '\\') <= 1) { - return \true; + return \false; } $stringName = $name->toString(); $lastUseName = $name->getLast(); @@ -62,12 +62,12 @@ final class ClassNameImportSkipper continue; } if ($this->isConflictedShortNameInUse($useUse, $useName, $lastUseName, $stringName)) { - return \false; + return \true; } - return $prefix . $useUse->name->toString() === $stringName; + return $prefix . $useUse->name->toString() !== $stringName; } } - return \true; + return \false; } private function isConflictedShortNameInUse(UseUse $useUse, string $useName, string $lastUseName, string $stringName) : bool { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 33761ba5e30..b50810798de 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 = 'dae8c61493b22119f0ece2e1d870ff5a0cb91993'; + public const PACKAGE_VERSION = '8c9fe9ac64330acd0271bc1494dbbb86281310ca'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-10-02 23:46:04'; + public const RELEASE_DATE = '2023-10-03 00:53:30'; /** * @var int */