move to AnalyserIntegrationTest and increase cache key

Author: samsonasik

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('v4-%s', ComposerHelper::getPhpDocParserVersion());
+			$variableCacheKey = sprintf('v5-%s', ComposerHelper::getPhpDocParserVersion());
 			$cached = $this->loadCachedPhpDocNodeMap($cacheKey, $variableCacheKey);
 			if ($cached === null) {
 				[$nameScopeMap, $files] = $this->createPhpDocNodeMap($fileName, null, null, [], $fileName);

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1529,6 +1529,13 @@ public function testBug14439(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBugInfiniteLoopOnFileTypeMapper(): void
+	{
+		// endless loop crash on self referencing trait
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-self-referenced-trait/BaseModelUseTrait.php');
+		$this->assertCount(0, $errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return list<Error>

…f-referenced-trait/BaseModelUseTrait.php …f-referenced-trait/BaseModelUseTrait.phptests/PHPStan/Type/data/bug-self-referenced-trait/BaseModelUseTrait.php renamed to tests/PHPStan/Analyser/data/bug-self-referenced-trait/BaseModelUseTrait.php tests/PHPStan/Type/data/bug-self-referenced-trait/BaseModelUseTrait.php renamed to tests/PHPStan/Analyser/data/bug-self-referenced-trait/BaseModelUseTrait.php

@@ -2,19 +2,12 @@
 
 namespace PHPStan\Type;
 
-use BugSelfReferencedTrait\BaseModelUseTrait;
 use DependentPhpDocs\Foo;
 use PHPStan\PhpDoc\Tag\ReturnTag;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\PHPStanTestCase;
 use RuntimeException;
-use function clearstatcache;
-use function hash;
-use function is_file;
 use function realpath;
-use function sprintf;
-use function substr;
-use function unlink;
 
 class FileTypeMapperTest extends PHPStanTestCase
 {
@@ -217,53 +210,4 @@ public function testFilesWithIdenticalPhpDocsUsingDifferentAliases(): void
 		$this->assertSame('AliasCollisionNamespace2\Foo', $doc2->getVarTags()['x']->getType()->describe(VerbosityLevel::precise()));
 	}
 
-	public function testRecursiveTraitUsedInAnonymousClassDoesNotLoopIndefinitely(): void
-	{
-		$realpath = realpath(__DIR__ . '/data/bug-self-referenced-trait/BaseModelUseTrait.php');
-		if ($realpath === false) {
-			throw new ShouldNotHappenException();
-		}
-
-		$container = self::getContainer();
-		$this->clearFileTypeMapperCache($container->getParameter('tmpDir'), $realpath);
-		self::createReflectionProvider();
-
-		/** @var FileTypeMapper $fileTypeMapper */
-		$fileTypeMapper = $container->getByType(FileTypeMapper::class);
-
-		$resolved = $fileTypeMapper->getResolvedPhpDoc(
-			$realpath,
-			BaseModelUseTrait::class,
-			null,
-			null,
-			'/** @method static Builder<static>|BaseModelUseTrait query() */',
-		);
-
-		$this->assertArrayHasKey('query', $resolved->getMethodTags());
-		$returnTypeDescription = $resolved->getMethodTags()['query']->getReturnType()->describe(VerbosityLevel::precise());
-		$this->assertStringContainsString('BugSelfReferencedTrait\BaseModelUseTrait', $returnTypeDescription);
-		$this->assertStringContainsString('BugSelfReferencedTrait\Builder<static(BugSelfReferencedTrait\BaseModelUseTrait)>', $returnTypeDescription);
-	}
-
-	/**
-	 * This ensure test result consistent regardless FileTypeMapper when just rolled back to verify back
-	 */
-	private function clearFileTypeMapperCache(string $tmpDir, string $fileName): void
-	{
-		$cacheKeyHash = hash('sha256', sprintf('ftm-%s', $fileName));
-
-		$directory1 = substr($cacheKeyHash, 0, 2);
-		$directory2 = substr($cacheKeyHash, 2, 2);
-
-		$cacheTmpRootDir = sprintf('%s/cache/PHPStan', $tmpDir);
-		$cacheFilePath = $cacheTmpRootDir . '/' . $directory1 . '/' . $directory2 . '/' . $cacheKeyHash . '.php';
-
-		if (!is_file($cacheFilePath)) {
-			return;
-		}
-
-		unlink($cacheFilePath);
-		clearstatcache();
-	}
-
 }