Merge pull request #8714 from kkmuffme/dont-rewrite-config-hash-to-ca…

…che-when-unchanged Fix cache race condition due to missing repopulation of lock files cache
vimeo · Nov 18, 2022 · 4e17585 · 4e17585
2 parents 4a83f88 + ff49dfc
commit 4e17585
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php b/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php
@@ -369,7 +369,7 @@ private function clearCacheDirectoryIfConfigOrComposerLockfileChanged(): void
             }
 
             if ($this->file_reference_provider->cache) {
-                $this->file_reference_provider->cache->hasConfigChanged();
+                $this->file_reference_provider->cache->setConfigHashCache();
             }
 
             $this->project_cache_provider->updateComposerLockHash();
@@ -385,8 +385,10 @@ private function clearCacheDirectoryIfConfigOrComposerLockfileChanged(): void
                 Config::removeCacheDirectory($cache_directory);
             }
 
+            $this->file_reference_provider->cache->setConfigHashCache();
+
             if ($this->project_cache_provider) {
-                $this->project_cache_provider->hasLockfileChanged();
+                $this->project_cache_provider->updateComposerLockHash();
             }
         }
     }

diff --git a/src/Psalm/Internal/Provider/FileReferenceCacheProvider.php b/src/Psalm/Internal/Provider/FileReferenceCacheProvider.php
@@ -66,9 +66,7 @@ public function __construct(Config $config)
     public function hasConfigChanged(): bool
     {
         $new_hash = $this->config->computeHash();
-        $has_changed = $new_hash !== $this->getConfigHashCache();
-        $this->setConfigHashCache($new_hash);
-        return $has_changed;
+        return $new_hash !== $this->getConfigHashCache();
     }
 
     /**
@@ -998,14 +996,18 @@ public function getConfigHashCache()
         return false;
     }
 
-    public function setConfigHashCache(string $hash): void
+    public function setConfigHashCache(string $hash = ''): void
     {
         $cache_directory = Config::getInstance()->getCacheDirectory();
 
         if (!$cache_directory) {
             return;
         }
 
+        if ($hash === '') {
+            $hash = $this->config->computeHash();
+        }
+
         if (!is_dir($cache_directory)) {
             try {
                 if (mkdir($cache_directory, 0777, true) === false) {