Result cache - hash autoload file and bootstrap files

phpstan · Feb 19, 2021 · 3457e58 · 3457e58
1 parent 527269a
commit 3457e58
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -418,6 +418,7 @@ services:
 			stubFiles: %stubFiles%
 			usedLevel: %usedLevel%
 			cliAutoloadFile: %cliAutoloadFile%
+			bootstrapFiles: %bootstrapFiles%
 
 	-
 		class: PHPStan\Analyser\ResultCache\ResultCacheClearer

diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -16,7 +16,7 @@
 class ResultCacheManager
 {
 
-	private const CACHE_VERSION = 'v7-installed-php';
+	private const CACHE_VERSION = 'v8-executed-hash';
 
 	private ExportedNodeFetcher $exportedNodeFetcher;
 
@@ -37,6 +37,9 @@ class ResultCacheManager
 
 	private ?string $cliAutoloadFile;
 
+	/** @var string[] */
+	private array $bootstrapFiles;
+
 	/** @var array<string, string> */
 	private array $fileHashes = [];
 
@@ -52,6 +55,7 @@ class ResultCacheManager
 	 * @param string[] $stubFiles
 	 * @param string $usedLevel
 	 * @param string|null $cliAutoloadFile
+	 * @param string[] $bootstrapFiles
 	 * @param array<string, string> $fileReplacements
 	 */
 	public function __construct(
@@ -63,6 +67,7 @@ public function __construct(
 		array $stubFiles,
 		string $usedLevel,
 		?string $cliAutoloadFile,
+		array $bootstrapFiles,
 		array $fileReplacements
 	)
 	{
@@ -74,6 +79,7 @@ public function __construct(
 		$this->stubFiles = $stubFiles;
 		$this->usedLevel = $usedLevel;
 		$this->cliAutoloadFile = $cliAutoloadFile;
+		$this->bootstrapFiles = $bootstrapFiles;
 		$this->fileReplacements = $fileReplacements;
 	}
 
@@ -553,7 +559,7 @@ private function getMeta(?array $projectConfigArray): array
 			'analysedPaths' => $this->analysedPaths,
 			'composerLocks' => $this->getComposerLocks(),
 			'composerInstalled' => $this->getComposerInstalled(),
-			'cliAutoloadFile' => $this->cliAutoloadFile,
+			'executedFilesHashes' => $this->getExecutedFileHashes(),
 			'phpExtensions' => $extensions,
 			'stubFiles' => $this->getStubFiles(),
 			'level' => $this->usedLevel,
@@ -578,6 +584,23 @@ private function getFileHash(string $path): string
 		return $hash;
 	}
 
+	/**
+	 * @return array<string, string>
+	 */
+	private function getExecutedFileHashes(): array
+	{
+		$hashes = [];
+		if ($this->cliAutoloadFile !== null) {
+			$hashes[$this->cliAutoloadFile] = $this->getFileHash($this->cliAutoloadFile);
+		}
+
+		foreach ($this->bootstrapFiles as $bootstrapFile) {
+			$hashes[$bootstrapFile] = $this->getFileHash($bootstrapFile);
+		}
+
+		return $hashes;
+	}
+
 	private function getPhpStanVersion(): string
 	{
 		try {