Skip to content

Docblock fix on ShortNameResolver #5077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsonasik merged 1 commit into from
Sep 24, 2023
Merged

Docblock fix on ShortNameResolver #5077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/Config/RectorConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function paths(array $paths): void
{
Assert::allString($paths);

foreach($paths as $path) {
foreach ($paths as $path) {
if (str_contains($path, '*')) {
continue;
}
Expand Down
9 changes: 6 additions & 3 deletions rules/CodingStyle/ClassNameImport/ShortNameResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ public function resolveShortClassLikeNames(File $file): array
{
$newStmts = $file->getNewStmts();

/** @var Namespace_[] $namespaces */
$namespaces = array_filter($newStmts, static fn (Stmt $stmt): bool => $stmt instanceof Namespace_ || $stmt instanceof FileWithoutNamespace);
/** @var Namespace_[]|FileWithoutNamespace[] $namespaces */
$namespaces = array_filter(
$newStmts,
static fn (Stmt $stmt): bool => $stmt instanceof Namespace_ || $stmt instanceof FileWithoutNamespace
);
if (count($namespaces) !== 1) {
// only handle single namespace nodes
return [];
Expand All @@ -89,7 +92,7 @@ public function resolveShortClassLikeNames(File $file): array
$namespace = current($namespaces);

/** @var ClassLike[] $classLikes */
$classLikes = $this->betterNodeFinder->findInstanceOf($namespace, ClassLike::class);
$classLikes = $this->betterNodeFinder->findInstanceOf($namespace->stmts, ClassLike::class);

$shortClassLikeNames = [];
foreach ($classLikes as $classLike) {
Expand Down