Dive into a trait that starts on the same line as the one in the reflection

ondrejmirtes · ondrejmirtes · commit e6dd87bd194a · 2020-06-24T20:34:24.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2587,7 +2587,7 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
 	private function processNodesForTraitUse($node, ClassReflection $traitReflection, MutatingScope $scope, \Closure $nodeCallback): void
 	{
 		if ($node instanceof Node) {
-			if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName) {
+			if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName && $traitReflection->getNativeReflection()->getStartLine() === $node->getStartLine()) {
 				$this->processStmtNodes($node, $node->stmts, $scope->enterTrait($traitReflection), $nodeCallback);
 				return;
 			}

Original file line number	Diff line number	Diff line change
`@@ -2587,7 +2587,7 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS`
`2587`	`2587`	`private function processNodesForTraitUse($node, ClassReflection $traitReflection, MutatingScope $scope, \Closure $nodeCallback): void`
`2588`	`2588`	`{`
`2589`	`2589`	`if ($node instanceof Node) {`
`2590`		`- if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName) {`
	`2590`	`+ if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName && $traitReflection->getNativeReflection()->getStartLine() === $node->getStartLine()) {`
`2591`	`2591`	`$this->processStmtNodes($node, $node->stmts, $scope->enterTrait($traitReflection), $nodeCallback);`
`2592`	`2592`	`return;`
`2593`	`2593`	`}`