fix after rebase

staabm · staabm · commit e24b20e7fe1e · 2022-08-31T13:04:16.000+02:00
diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -616,7 +616,7 @@ private function getCacheFilePath(?string $resultCacheName, ?array $projectConfi
 			(!array_key_exists('tmpDir', $projectConfig['parameters']) || $projectConfig['parameters']['tmpDir'] === null)
 		) {
 
-			return dirname($this->cacheFilePath) . '/resultCache-' . md5(Neon::encode([$this->analysedPaths, $this->getPhpStanVersion()])) . '.php';
+			return dirname($this->cacheFilePath) . '/resultCache-' . md5(Neon::encode([$this->analysedPaths, ComposerHelper::getPhpStanVersion()])) . '.php';
 		}
 
 		return $this->cacheFilePath;

Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ private function getCacheFilePath(?string $resultCacheName, ?array $projectConfi`
`616`	`616`	`(!array_key_exists('tmpDir', $projectConfig['parameters']) \|\| $projectConfig['parameters']['tmpDir'] === null)`
`617`	`617`	`) {`
`618`	`618`
`619`		`- return dirname($this->cacheFilePath) . '/resultCache-' . md5(Neon::encode([$this->analysedPaths, $this->getPhpStanVersion()])) . '.php';`
	`619`	`+ return dirname($this->cacheFilePath) . '/resultCache-' . md5(Neon::encode([$this->analysedPaths, ComposerHelper::getPhpStanVersion()])) . '.php';`
`620`	`620`	`}`
`621`	`621`
`622`	`622`	`return $this->cacheFilePath;`