Fixed infinite recursion with a class and trait in the same file

build.xml

@@ -50,6 +50,7 @@
 			<arg value="--encoding=utf-8"/>
 			<arg value="--tab-width=4"/>
 			<arg value="--ignore=tests/*/data"/>
+			<arg value="--ignore=tests/*/traits"/>
 			<arg value="-sp"/>
 			<arg path="src"/>
 			<arg path="tests"/>

src/Analyser/NodeScopeResolver.php

@@ -1028,11 +1028,35 @@ private function processTraitUse(Node\Stmt\TraitUse $node, Scope $classScope, \C
 					$classScope->getClass() !== null ? sprintf('class %s', $classScope->getClass()) : 'anonymous class'
 				)
 			);
-			$this->processNodes($parserNodes, new Scope($this->broker, $this->printer, $fileName), function (\PhpParser\Node $node) use ($traitName, $classScope, $nodeCallback) {
-				if ($node instanceof Node\Stmt\Trait_ && $traitName === (string) $node->namespacedName) {
-					$this->processNodes($node->stmts, $classScope->enterFirstLevelStatements(), $nodeCallback);
-				}
-			});
+
+			$this->processNodesForTraitUse($parserNodes, $traitName, $classScope, $nodeCallback);
+		}
+	}
+
+	/**
+	 * @param \PhpParser\Node[]|\PhpParser\Node $node
+	 * @param string $traitName
+	 * @param \PHPStan\Analyser\Scope $classScope
+	 * @param \Closure $nodeCallback
+	 */
+	private function processNodesForTraitUse($node, string $traitName, Scope $classScope, \Closure $nodeCallback)
+	{
+		if ($node instanceof Node) {
+			if ($node instanceof Node\Stmt\Trait_ && $traitName === (string) $node->namespacedName) {
+				$this->processNodes($node->stmts, $classScope->enterFirstLevelStatements(), $nodeCallback);
+				return;
+			}
+			if ($node instanceof Node\Stmt\ClassLike) {
+				return;
+			}
+			foreach ($node->getSubNodeNames() as $subNodeName) {
+				$subNode = $node->{$subNodeName};
+				$this->processNodesForTraitUse($subNode, $traitName, $classScope, $nodeCallback);
+			}
+		} elseif (is_array($node)) {
+			foreach ($node as $subNode) {
+				$this->processNodesForTraitUse($subNode, $traitName, $classScope, $nodeCallback);
+			}
 		}
 	}
 

tests/PHPStan/Analyser/AnalyserTraitsIntegrationTest.php

@@ -53,6 +53,12 @@ public function testTraitsAreNotAnalysedDirectly()
 		$this->assertEmpty($errors);
 	}
 
+	public function testClassAndTraitInTheSameFile()
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/traits/classAndTrait.php');
+		$this->assertEmpty($errors);
+	}
+
 	/**
 	 * @param string $file
 	 * @return \PHPStan\Analyser\Error[]|string[]

tests/PHPStan/Analyser/traits/classAndTrait.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace ClassAndTrait;
+
+class Foo
+{
+
+	use FooTrait;
+
+}
+
+trait FooTrait
+{
+
+}