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 8c9fe9ac64330acd0271bc1494dbbb86281310ca 

8c9fe9ac64 [DX] Rename shouldImportName() to shouldSkipName() on ClassNameImportSkipper (#5107)
This commit is contained in:
Tomas Votruba 2023-10-02 17:56:25 +00:00
parent f7114d03e6
commit dc3682f340
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/PostRector/Rector/NameImportingPostRector.php
View File

@ -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

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

@ -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
{

4
src/Application/VersionResolver.php
View File

@ -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
*/