fix with detect nested trait

Author: samsonasik

src/Type/FileTypeMapper.php

@@ -394,9 +394,10 @@ private function loadCachedPhpDocNodeMap(string $cacheKey, string $variableCache
 
 	/**
 	 * @param array<string, string> $traitMethodAliases
+	 * @param array<string, true> $activeTraitResolutions
 	 * @return array{array<string, IntermediaryNameScope>, list<string>}
 	 */
-	private function createPhpDocNodeMap(string $fileName, ?string $lookForTrait, ?string $traitUseClass, array $traitMethodAliases, string $originalClassFileName): array
+	private function createPhpDocNodeMap(string $fileName, ?string $lookForTrait, ?string $traitUseClass, array $traitMethodAliases, string $originalClassFileName, array $activeTraitResolutions = []): array
 	{
 		/** @var array<string, IntermediaryNameScope> $nameScopeMap */
 		$nameScopeMap = [];
@@ -425,7 +426,7 @@ private function createPhpDocNodeMap(string $fileName, ?string $lookForTrait, ?s
 		$constUses = [];
 		$this->processNodes(
 			$this->phpParser->parseFile($fileName),
-			function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodAliases, $originalClassFileName, &$nameScopeMap, &$typeMapStack, &$typeAliasStack, &$classStack, &$namespace, &$functionStack, &$uses, &$constUses, &$files): ?int {
+			function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodAliases, $originalClassFileName, $activeTraitResolutions, &$nameScopeMap, &$typeMapStack, &$typeAliasStack, &$classStack, &$namespace, &$functionStack, &$uses, &$constUses, &$files): ?int {
 				if ($node instanceof Node\Stmt\ClassLike) {
 					if ($traitFound && $fileName === $originalClassFileName) {
 						return self::SKIP_NODE;
@@ -635,12 +636,21 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
 							throw new ShouldNotHappenException();
 						}
 
+						$traitResolutionKey = $this->getTraitResolutionKey($traitReflection->getFileName(), $traitName, $className, $originalClassFileName);
+						if (isset($activeTraitResolutions[$traitResolutionKey])) {
+							continue;
+						}
+
+						$nestedActiveTraitResolutions = $activeTraitResolutions;
+						$nestedActiveTraitResolutions[$traitResolutionKey] = true;
+
 						[$traitNameScopeMap, $traitFiles] = $this->createPhpDocNodeMap(
 							$traitReflection->getFileName(),
 							$traitName,
 							$className,
 							$traitMethodAliases[$traitName] ?? [],
 							$originalClassFileName,
+							$nestedActiveTraitResolutions,
 						);
 						$nameScopeMap = array_merge($nameScopeMap, array_map(static fn ($originalNameScope) => $originalNameScope->getTraitData() === null ? $originalNameScope->withTraitData($originalClassFileName, $className, $traitName, $lookForTrait, $docComment) : $originalNameScope, $traitNameScopeMap));
 						$files = array_merge($files, $traitFiles);
@@ -818,4 +828,9 @@ private function getPhpDocKey(string $nameScopeKey, string $docComment): string
 		return md5(sprintf('%s-%s', $nameScopeKey, $doc->getReformattedText()));
 	}
 
+	private function getTraitResolutionKey(string $fileName, string $traitName, string $className, string $originalClassFileName): string
+	{
+		return md5(sprintf('%s-%s-%s-%s', $fileName, $traitName, $className, $originalClassFileName));
+	}
+
 }

tests/PHPStan/Type/FileTypeMapperTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use BugSelfReferencedTrait\BaseModel;
 use DependentPhpDocs\Foo;
 use PHPStan\PhpDoc\Tag\ReturnTag;
 use PHPStan\ShouldNotHappenException;
@@ -217,23 +218,23 @@ public function testRecursiveTraitUsedInAnonymousClassDoesNotLoopIndefinitely():
 		/** @var FileTypeMapper $fileTypeMapper */
 		$fileTypeMapper = self::getContainer()->getByType(FileTypeMapper::class);
 
-		$realpath = realpath(__DIR__ . '/data/bug-9684/BaseModel.php');
+		$realpath = realpath(__DIR__ . '/data/bug-self-referenced-trait/BaseModel.php');
 		if ($realpath === false) {
 			throw new ShouldNotHappenException();
 		}
 
 		$resolved = $fileTypeMapper->getResolvedPhpDoc(
 			$realpath,
-			\Bug9684\BaseModel::class,
+			BaseModel::class,
 			null,
 			null,
 			'/** @method static Builder<static>|BaseModel query() */',
 		);
 
 		$this->assertArrayHasKey('query', $resolved->getMethodTags());
 		$returnTypeDescription = $resolved->getMethodTags()['query']->getReturnType()->describe(VerbosityLevel::precise());
-		$this->assertStringContainsString('Bug9684\BaseModel', $returnTypeDescription);
-		$this->assertStringContainsString('Bug9684\Builder<static(Bug9684\BaseModel)>', $returnTypeDescription);
+		$this->assertStringContainsString('BugSelfReferencedTrait\BaseModel', $returnTypeDescription);
+		$this->assertStringContainsString('BugSelfReferencedTrait\Builder<static(BugSelfReferencedTrait\BaseModel)>', $returnTypeDescription);
 	}
 
 }

…PHPStan/Type/data/bug-9684/BaseModel.php …/bug-self-referenced-trait/BaseModel.phptests/PHPStan/Type/data/bug-9684/BaseModel.php renamed to tests/PHPStan/Type/data/bug-self-referenced-trait/BaseModel.php tests/PHPStan/Type/data/bug-9684/BaseModel.php renamed to tests/PHPStan/Type/data/bug-self-referenced-trait/BaseModel.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace Bug9684;
+namespace BugSelfReferencedTrait;
 
-use Bug9684\RecursiveTrait;
+use BugSelfReferencedTrait\RecursiveTrait;
 
 class Model
 {

…an/Type/data/bug-9684/RecursiveTrait.php …self-referenced-trait/RecursiveTrait.phptests/PHPStan/Type/data/bug-9684/RecursiveTrait.php renamed to tests/PHPStan/Type/data/bug-self-referenced-trait/RecursiveTrait.php tests/PHPStan/Type/data/bug-9684/RecursiveTrait.php renamed to tests/PHPStan/Type/data/bug-self-referenced-trait/RecursiveTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Bug9684;
+namespace BugSelfReferencedTrait;
 
 trait RecursiveTrait
 {