Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions rules/CodingStyle/ClassNameImport/ClassNameImportContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ public function resolveShortNamesToFullyQualifiedNames(File $file): array
return $this->shortNameResolver->resolveFromFile($file);
}

/**
* Short names of class-likes (class, interface, trait) declared in the file
*
* @return string[]
*/
public function resolveShortClassLikeNames(File $file): array
{
return $this->shortNameResolver->resolveShortClassLikeNames($file);
}

/**
* @return string[]
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

use PhpParser\Node;
use PHPStan\Analyser\Scope;
use Rector\CodingStyle\ClassNameImport\ClassNameImportContext;
use Rector\CodingStyle\ClassNameImport\NamespaceBeforeClassNameResolver;
use Rector\CodingStyle\ClassNameImport\ShortNameResolver;
use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
Expand All @@ -25,14 +25,14 @@
final readonly class ClassLikeNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface
{
public function __construct(
private ShortNameResolver $shortNameResolver,
private ClassNameImportContext $classNameImportContext,
private NamespaceBeforeClassNameResolver $namespaceBeforeClassNameResolver
) {
}

public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
{
$classLikeNames = $this->shortNameResolver->resolveShortClassLikeNames($file);
$classLikeNames = $this->classNameImportContext->resolveShortClassLikeNames($file);
if ($classLikeNames === []) {
return false;
}
Expand Down
Loading