Skip to content
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

Jump to bottom

UseImportsTraverser: don't deep traverse #4994

Merged
merged 4 commits into from
Sep 11, 2023
Merged

UseImportsTraverser: don't deep traverse #4994

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31e4afa
UseImportsTraverser: don't deep traverse
staabm Sep 11, 2023
789def2
Update UseImportsTraverser.php
staabm Sep 11, 2023
05c0a48
Update UseImportsTraverser.php
staabm Sep 11, 2023
1880cc2
UseImportsTraverser: don't deep traverse
staabm Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions rules/CodingStyle/ClassNameImport/UseImportsTraverser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@

namespace Rector\CodingStyle\ClassNameImport;

use PhpParser\Node\Stmt\Namespace_;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use PhpParser\Node;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\GroupUse;
use PhpParser\Node\Stmt\Use_;
use PhpParser\Node\Stmt\UseUse;
use PhpParser\NodeTraverser;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;

Expand Down Expand Up @@ -57,27 +60,24 @@ private function traverseForType(array $stmts, callable $callable, int $desiredT
$callable,
$desiredType
) {
if ($node instanceof Use_) {
// only import uses
if ($node->type !== $desiredType) {
return null;
}
if ($node instanceof Namespace_ || $node instanceof FileWithoutNamespace) {
// traverse into namespaces
return null;
}

if ($node instanceof Use_ && $node->type === $desiredType) {
foreach ($node->uses as $useUse) {
$name = $this->nodeNameResolver->getName($useUse);
if ($name === null) {
continue;
}

$callable($useUse, $name);
}
}

if ($node instanceof GroupUse) {
} elseif ($node instanceof GroupUse) {
$this->processGroupUse($node, $desiredType, $callable);
}

return null;
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
});
}

Expand Down