Rework hash file cache logic to avoid generating new file on each container regeneration

Author: xificurk

src/Symfony/SymfonyContainerResultCacheMetaExtension.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Analyser\ResultCache\ResultCacheMetaExtension;
 use function array_map;
+use function basename;
 use function file_get_contents;
 use function file_put_contents;
 use function hash;
@@ -44,23 +45,27 @@ public function getHash(): string
 			if ($xmlHash === false) {
 				throw new XmlContainerNotExistsException(sprintf('Container %s does not exist', $this->containerXmlPath));
 			}
-			$hashFile = sprintf('%s/%s-%s.hash', $this->tmpDir, $this->getKey(), $xmlHash);
-			$hash = @file_get_contents($hashFile);
-			if ($hash !== false) {
-				return $hash;
+			$xmlHashFile = sprintf('%s/%s-%s.hash', $this->tmpDir, $this->getKey(), basename($this->containerXmlPath));
+			$storedXmlHash = @file_get_contents($xmlHashFile);
+
+			$hashForResultCacheFile = sprintf('%s/%s-%s-result-cache-meta.hash', $this->tmpDir, $this->getKey(), basename($this->containerXmlPath));
+			$storedHashForResultCache = @file_get_contents($hashForResultCacheFile);
+			if ($storedXmlHash === $xmlHash && $storedHashForResultCache !== false) {
+				return $storedHashForResultCache;
 			}
 		}
 
-		$hash = $this->calculateHash();
+		$hashForResultCache = $this->calculateHash();
 
 		if ($this->containerXmlPath !== null) {
-			file_put_contents($hashFile, $hash);
+			file_put_contents($hashForResultCacheFile, $hashForResultCache);
+			file_put_contents($xmlHashFile, $xmlHash);
 		}
 
-		return $hash;
+		return $hashForResultCache;
 	}
 
-	public function calculateHash(): string
+	private function calculateHash(): string
 	{
 		$services = $parameters = [];
 

tests/Symfony/SymfonyContainerResultCacheMetaExtensionTest.php

@@ -54,16 +54,22 @@ public function testHashIsCalculatedAndWrittenToCacheFileOnCacheMiss(): void
 
 		$hash = $extension->getHash();
 
-		$cacheFile = sprintf('%s/symfonyDiContainer-c55d6ac45b535d6ecc9402cbb93825c38ec7b11b03f66577d0d3549b3d9ef75f.hash', $this->tmpDir);
-		self::assertFileExists($cacheFile);
-		self::assertSame($hash, file_get_contents($cacheFile));
+		$resultCacheHashFile = sprintf('%s/symfonyDiContainer-container.xml-result-cache-meta.hash', $this->tmpDir);
+		self::assertFileExists($resultCacheHashFile);
+		self::assertSame($hash, file_get_contents($resultCacheHashFile));
+
+		$xmlHashFile = sprintf('%s/symfonyDiContainer-container.xml.hash', $this->tmpDir);
+		self::assertFileExists($xmlHashFile);
+		self::assertSame('c55d6ac45b535d6ecc9402cbb93825c38ec7b11b03f66577d0d3549b3d9ef75f', file_get_contents($xmlHashFile));
 	}
 
 	public function testCachedHashIsReturnedOnCacheHit(): void
 	{
 		$containerXmlPath = __DIR__ . '/container.xml';
-		$cacheFile = sprintf('%s/symfonyDiContainer-c55d6ac45b535d6ecc9402cbb93825c38ec7b11b03f66577d0d3549b3d9ef75f.hash', $this->tmpDir);
-		file_put_contents($cacheFile, 'pre-computed-hash');
+		$xmlHashFile = sprintf('%s/symfonyDiContainer-container.xml.hash', $this->tmpDir);
+		file_put_contents($xmlHashFile, 'c55d6ac45b535d6ecc9402cbb93825c38ec7b11b03f66577d0d3549b3d9ef75f');
+		$resultCacheHashFile = sprintf('%s/symfonyDiContainer-container.xml-result-cache-meta.hash', $this->tmpDir);
+		file_put_contents($resultCacheHashFile, 'pre-computed-hash');
 
 		$extension = new SymfonyContainerResultCacheMetaExtension(
 			new DefaultParameterMap([]),