Cache version needs to be part of cacheKey after all

Author: ondrejmirtes

src/Type/FileTypeMapper.php

@@ -189,8 +189,8 @@ private function resolvePhpDocStringToDocNode(string $phpDocString): PhpDocNode
 	private function getNameScopeMap(string $fileName): array
 	{
 		if (!isset($this->memoryCache[$fileName])) {
-			$cacheKey = sprintf('%s-phpdocstring', $fileName);
-			$variableCacheKey = sprintf('%s-%s-v17-require-once', implode(',', array_map(static fn (array $file): string => sprintf('%s-%d', $file['filename'], $file['modifiedTime']), $this->getCachedDependentFilesWithTimestamps($fileName))), $this->phpVersion->getVersionString());
+			$cacheKey = sprintf('%s-phpdocstring-v17-require-once', $fileName);
+			$variableCacheKey = sprintf('%s-%s', implode(',', array_map(static fn (array $file): string => sprintf('%s-%d', $file['filename'], $file['modifiedTime']), $this->getCachedDependentFilesWithTimestamps($fileName))), $this->phpVersion->getVersionString());
 			$map = $this->cache->load($cacheKey, $variableCacheKey);
 
 			if ($map === null) {
@@ -633,12 +633,12 @@ private function getNameScopeKey(
 	 */
 	private function getCachedDependentFilesWithTimestamps(string $fileName): array
 	{
-		$cacheKey = sprintf('dependentFilesTimestamps-%s', $fileName);
+		$cacheKey = sprintf('dependentFilesTimestamps-%s-v2-enum', $fileName);
 		$fileModifiedTime = filemtime($fileName);
 		if ($fileModifiedTime === false) {
 			$fileModifiedTime = time();
 		}
-		$variableCacheKey = sprintf('%d-%s-v2-enum', $fileModifiedTime, $this->phpVersion->getVersionString());
+		$variableCacheKey = sprintf('%d-%s', $fileModifiedTime, $this->phpVersion->getVersionString());
 		/** @var array<array{filename: string, modifiedTime: int}>|null $cachedFilesTimestamps */
 		$cachedFilesTimestamps = $this->cache->load($cacheKey, $variableCacheKey);
 		if ($cachedFilesTimestamps !== null) {