Skip to content

Commit cda009b

Browse files
committed
Revert "Fix fixing nodes in used traits"
This reverts commit 07486f5.
1 parent fabf273 commit cda009b

File tree

3 files changed

+6
-19
lines changed

3 files changed

+6
-19
lines changed

src/Analyser/FileAnalyser.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public function analyseFile(
107107
if ($node instanceof InTraitNode) {
108108
$traitNode = $node->getOriginalNode();
109109
$linesToIgnore[$scope->getFileDescription()] = $this->getLinesToIgnoreFromTokens([$traitNode]);
110-
$parserNodes = $node->getParserNodes();
111110
}
112111
if ($outerNodeCallback !== null) {
113112
$outerNodeCallback($node, $scope);

src/Analyser/NodeScopeResolver.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6291,17 +6291,16 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
62916291
$adaptations[] = $adaptation;
62926292
}
62936293
$parserNodes = $this->parser->parseFile($fileName);
6294-
$this->processNodesForTraitUse($parserNodes, $parserNodes, $traitReflection, $classScope, $adaptations, $nodeCallback);
6294+
$this->processNodesForTraitUse($parserNodes, $traitReflection, $classScope, $adaptations, $nodeCallback);
62956295
}
62966296
}
62976297

62986298
/**
6299-
* @param Node\Stmt[] $parserNodes
63006299
* @param Node[]|Node|scalar|null $node
63016300
* @param Node\Stmt\TraitUseAdaptation[] $adaptations
63026301
* @param callable(Node $node, Scope $scope): void $nodeCallback
63036302
*/
6304-
private function processNodesForTraitUse(array $parserNodes, $node, ClassReflection $traitReflection, MutatingScope $scope, array $adaptations, callable $nodeCallback): void
6303+
private function processNodesForTraitUse($node, ClassReflection $traitReflection, MutatingScope $scope, array $adaptations, callable $nodeCallback): void
63056304
{
63066305
if ($node instanceof Node) {
63076306
if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName && $traitReflection->getNativeReflection()->getStartLine() === $node->getStartLine()) {
@@ -6348,7 +6347,7 @@ private function processNodesForTraitUse(array $parserNodes, $node, ClassReflect
63486347
throw new ShouldNotHappenException();
63496348
}
63506349
$traitScope = $scope->enterTrait($traitReflection);
6351-
$nodeCallback(new InTraitNode($node, $parserNodes, $traitReflection, $scope->getClassReflection()), $traitScope);
6350+
$nodeCallback(new InTraitNode($node, $traitReflection, $scope->getClassReflection()), $traitScope);
63526351
$this->processStmtNodes($node, $stmts, $traitScope, $nodeCallback, StatementContext::createTopLevel());
63536352
return;
63546353
}
@@ -6360,11 +6359,11 @@ private function processNodesForTraitUse(array $parserNodes, $node, ClassReflect
63606359
}
63616360
foreach ($node->getSubNodeNames() as $subNodeName) {
63626361
$subNode = $node->{$subNodeName};
6363-
$this->processNodesForTraitUse($parserNodes, $subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
6362+
$this->processNodesForTraitUse($subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
63646363
}
63656364
} elseif (is_array($node)) {
63666365
foreach ($node as $subNode) {
6367-
$this->processNodesForTraitUse($parserNodes, $subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
6366+
$this->processNodesForTraitUse($subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
63686367
}
63696368
}
63706369
}

src/Node/InTraitNode.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
final class InTraitNode extends Node\Stmt implements VirtualNode
1212
{
1313

14-
/**
15-
* @param Node\Stmt[] $parserNodes
16-
*/
17-
public function __construct(private Node\Stmt\Trait_ $originalNode, private array $parserNodes, private ClassReflection $traitReflection, private ClassReflection $implementingClassReflection)
14+
public function __construct(private Node\Stmt\Trait_ $originalNode, private ClassReflection $traitReflection, private ClassReflection $implementingClassReflection)
1815
{
1916
parent::__construct($originalNode->getAttributes());
2017
}
@@ -24,14 +21,6 @@ public function getOriginalNode(): Node\Stmt\Trait_
2421
return $this->originalNode;
2522
}
2623

27-
/**
28-
* @return Node\Stmt[]
29-
*/
30-
public function getParserNodes(): array
31-
{
32-
return $this->parserNodes;
33-
}
34-
3524
public function getTraitReflection(): ClassReflection
3625
{
3726
return $this->traitReflection;

0 commit comments

Comments
 (0)