fix: nested trait @use, use original class file name to get trait data

.github/workflows/e2e-tests.yml

@@ -293,6 +293,9 @@ jobs:
               OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan")
               echo "$OUTPUT"
               ../bashunit -a contains 'Method StubFiles\Foo::doFoo() has no return type specified.' "$OUTPUT"
+          - script: |
+              cd e2e/nested-trait-use
+              ../../bin/phpstan analyze
 
     steps:
       - name: "Checkout"

e2e/nested-trait-use/framework/Builder.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace NestedTraitUse\Framework;
+
+class Builder {}

e2e/nested-trait-use/framework/HasBuilder.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace NestedTraitUse\Framework;
+
+/** @template TBuilder of Builder */
+trait HasBuilder
+{
+    /** @return TBuilder */
+    public function newBuilder(): Builder
+    {
+        return parent::newBuilder();
+    }
+}

e2e/nested-trait-use/framework/Model.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace NestedTraitUse\Framework;
+
+class Model
+{
+	/** @var class-string<Builder> */
+	protected static string $builder = Builder::class;
+
+	public function newBuilder(): Builder
+	{
+		return new static::$builder();
+	}
+}

e2e/nested-trait-use/main.php

@@ -0,0 +1,10 @@
+<?php
+
+use NestedTraitUse\Src\ChildModel;
+
+use function PHPStan\Testing\assertType;
+
+function test(ChildModel $model): void
+{
+	assertType('NestedTraitUse\Src\CustomBuilder', $model->newBuilder());
+}

e2e/nested-trait-use/phpstan.neon

@@ -0,0 +1,8 @@
+parameters:
+	level: 9
+	tmpDir: tmp
+	paths:
+		- main.php
+	scanDirectories:
+		- src
+		- framework

e2e/nested-trait-use/src/ChildModel.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace NestedTraitUse\Src;
+
+use NestedTraitUse\Framework\Model;
+
+class ChildModel extends Model
+{
+    /** @use HasBuilder<CustomBuilder> */
+    use HasBuilder;
+	protected static string $builder = CustomBuilder::class;
+}

e2e/nested-trait-use/src/CustomBuilder.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace NestedTraitUse\Src;
+
+use NestedTraitUse\Framework\Builder;
+
+class CustomBuilder extends Builder {}

e2e/nested-trait-use/src/HasBuilder.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace NestedTraitUse\Src;
+
+use NestedTraitUse\Framework\Builder;
+use NestedTraitUse\Framework\HasBuilder as BaseHasBuilder;
+
+/** @template TBuilder of Builder */
+trait HasBuilder
+{
+    /** @use BaseHasBuilder<TBuilder> */
+    use BaseHasBuilder;
+}

e2e/nested-trait-use/tmp/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

src/Type/FileTypeMapper.php

@@ -329,7 +329,7 @@ private function getNameScopeMap(string $fileName): array
 	{
 		if (!isset($this->memoryCache[$fileName])) {
 			$cacheKey = sprintf('ftm-%s', $fileName);
-			$variableCacheKey = sprintf('v3-%s', ComposerHelper::getPhpDocParserVersion());
+			$variableCacheKey = sprintf('v4-%s', ComposerHelper::getPhpDocParserVersion());
 			$cached = $this->loadCachedPhpDocNodeMap($cacheKey, $variableCacheKey);
 			if ($cached === null) {
 				[$nameScopeMap, $files] = $this->createPhpDocNodeMap($fileName, null, null, [], $fileName);
@@ -642,7 +642,7 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
 							$traitMethodAliases[$traitName] ?? [],
 							$originalClassFileName,
 						);
-						$nameScopeMap = array_merge($nameScopeMap, array_map(static fn ($originalNameScope) => $originalNameScope->getTraitData() === null ? $originalNameScope->withTraitData($fileName, $className, $traitName, $lookForTrait, $docComment) : $originalNameScope, $traitNameScopeMap));
+						$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);
 					}
 				}