Skip to content

Commit a7eb860

Browse files
committed
remove use imrpots remover
1 parent 2ca157e commit a7eb860

4 files changed

Lines changed: 76 additions & 114 deletions

File tree

‎rules/CodingStyle/Application/UseImportsRemover.php‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/PhpParser/Node/FileNode.php‎

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ public function __construct(
3636
parent::__construct($attributes);
3737
}
3838

39-
/**
40-
* Seeded once right after node decoration, when namespaced names are resolvable
41-
*/
42-
public function setUsedImports(UsedImports $usedImports): void
43-
{
44-
$this->usedImports = $usedImports;
45-
}
46-
4739
/**
4840
* Adds new use imports into the file/namespace and keeps the tracked used imports in sync,
4941
* so the next traversal iteration converges without re-resolving.
@@ -132,6 +124,38 @@ public function addImports(
132124
return true;
133125
}
134126

127+
/**
128+
* Removes the given use imports from the file/namespace
129+
*
130+
* @param string[] $removedUses
131+
*/
132+
public function removeImports(array $removedUses): bool
133+
{
134+
$node = $this->resolvePlacementNamespace() ?? $this;
135+
136+
$hasRemoved = false;
137+
foreach ($node->stmts as $key => $stmt) {
138+
if (! $stmt instanceof Use_) {
139+
continue;
140+
}
141+
142+
if ($this->removeUseFromUse($removedUses, $stmt)) {
143+
$hasRemoved = true;
144+
}
145+
146+
// remove empty uses
147+
if ($stmt->uses === []) {
148+
unset($node->stmts[$key]);
149+
}
150+
}
151+
152+
if ($hasRemoved) {
153+
$node->stmts = array_values($node->stmts);
154+
}
155+
156+
return $hasRemoved;
157+
}
158+
135159
/**
136160
* This triggers Printed method with "pFileNode" name
137161
* @see \Rector\PhpParser\Printer\BetterStandardPrinter::pStmt_FileNode()
@@ -360,4 +384,27 @@ private function mirrorUseComments(array $stmts, array $newUses, int $indexStmt
360384
}
361385
}
362386
}
387+
388+
/**
389+
* @param string[] $removedUses
390+
*/
391+
private function removeUseFromUse(array $removedUses, Use_ $use): bool
392+
{
393+
$hasChanged = false;
394+
foreach ($use->uses as $usesKey => $useUse) {
395+
$useName = $useUse->name->toString();
396+
if (! in_array($useName, $removedUses, true)) {
397+
continue;
398+
}
399+
400+
unset($use->uses[$usesKey]);
401+
$hasChanged = true;
402+
}
403+
404+
if ($hasChanged) {
405+
$use->uses = array_values($use->uses);
406+
}
407+
408+
return $hasChanged;
409+
}
363410
}

‎src/PostRector/Rector/ClassRenamingPostRector.php‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
use Override;
88
use PhpParser\Node;
9-
use PhpParser\Node\Stmt\Namespace_;
109
use PhpParser\NodeVisitor;
11-
use Rector\CodingStyle\Application\UseImportsRemover;
1210
use Rector\Configuration\RenamedClassesDataCollector;
1311
use Rector\PhpParser\Node\FileNode;
1412
use Rector\PostRector\Guard\AddUseStatementGuard;
@@ -23,34 +21,22 @@ final class ClassRenamingPostRector extends AbstractPostRector
2321

2422
public function __construct(
2523
private readonly RenamedClassesDataCollector $renamedClassesDataCollector,
26-
private readonly UseImportsRemover $useImportsRemover,
2724
private readonly RenamedNameCollector $renamedNameCollector,
2825
private readonly AddUseStatementGuard $addUseStatementGuard,
2926
) {
3027
}
3128

32-
public function enterNode(Node $node): Namespace_|FileNode|int|null
29+
public function enterNode(Node $node): FileNode|int
3330
{
31+
// the FileNode resolves the namespace-or-file placement internally
3432
if ($node instanceof FileNode) {
35-
// handle in Namespace_ node
36-
if ($node->isNamespaced()) {
37-
return null;
38-
}
39-
40-
// handle here
41-
$removedUses = $this->renamedClassesDataCollector->getOldClasses();
42-
if ($this->useImportsRemover->removeImportsFromStmts($node, $removedUses)) {
43-
$this->addRectorClassWithLine($node);
44-
}
45-
46-
$this->renamedNameCollector->reset();
47-
48-
return $node;
49-
}
33+
// keep only the uses that were actually renamed
34+
$removedUses = array_values(array_filter(
35+
$this->renamedClassesDataCollector->getOldClasses(),
36+
fn (string $removedUse): bool => $this->renamedNameCollector->has($removedUse)
37+
));
5038

51-
if ($node instanceof Namespace_) {
52-
$removedUses = $this->renamedClassesDataCollector->getOldClasses();
53-
if ($this->useImportsRemover->removeImportsFromStmts($node, $removedUses)) {
39+
if ($node->removeImports($removedUses)) {
5440
$this->addRectorClassWithLine($node);
5541
}
5642

@@ -59,7 +45,7 @@ public function enterNode(Node $node): Namespace_|FileNode|int|null
5945
return $node;
6046
}
6147

62-
// nothing else to handle here, as first 2 nodes we'll hit are handled above
48+
// nothing else to handle here, as the first node we'll hit is handled above
6349
return NodeVisitor::STOP_TRAVERSAL;
6450
}
6551

‎src/Testing/TestingParser/TestingParser.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
use Nette\Utils\FileSystem;
88
use PhpParser\Node;
9+
use PhpParser\NodeTraverser;
10+
use PhpParser\NodeVisitor\NameResolver;
911
use Rector\Application\Provider\CurrentFileProvider;
1012
use Rector\CodingStyle\ClassNameImport\UsedImportsResolver;
11-
use Rector\CodingStyle\ClassNameImport\ValueObject\UsedImports;
1213
use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
1314
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
1415
use Rector\PhpParser\Node\FileNode;
@@ -56,15 +57,17 @@ private function parseToFileAndStmts(string $filePath): array
5657
$file = new File($filePath, $fileContent);
5758
$stmts = $this->rectorParser->parseString($fileContent);
5859

59-
// wrap in FileNode to enable file-level rules
60-
$stmts = [new FileNode($stmts, new UsedImports([], [], []))];
61-
$stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
60+
// resolve names up front, so used imports are resolvable at construction, before decoration;
61+
// only annotates namespacedName, does not replace name nodes
62+
$nameResolvingTraverser = new NodeTraverser(new NameResolver(null, [
63+
'preserveOriginalNames' => true,
64+
'replaceNodes' => false,
65+
]));
66+
$stmts = $nameResolvingTraverser->traverse($stmts);
6267

63-
// seed used imports once, after decoration when namespaced names are resolvable
64-
$fileNode = $stmts[0] ?? null;
65-
if ($fileNode instanceof FileNode) {
66-
$fileNode->setUsedImports($this->usedImportsResolver->resolveForStmts($fileNode->stmts));
67-
}
68+
// wrap in FileNode to enable file-level rules; seed used imports once, kept in sync incrementally
69+
$stmts = [new FileNode($stmts, $this->usedImportsResolver->resolveForStmts($stmts))];
70+
$stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
6871

6972
$file->hydrateStmtsAndTokens($stmts, $stmts, []);
7073
$this->currentFileProvider->setFile($file);

0 commit comments

Comments
 (0)