Use different psalm cache for different error levels

Fixes vimeo#4952
TysonAndre · Aug 6, 2021 · 3486490 · 3486490
1 parent 457695e
commit 3486490
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -633,6 +633,14 @@ public static function loadFromXMLFile(string $file_path, string $current_dir):
         return $config;
     }
 
+    /**
+     * Computes the hash to use for a cache folder from CLI flags and from the config file's xml contents
+     */
+    public function computeHash(): string
+    {
+        return sha1($this->hash . ':' . $this->level);
+    }
+
     /**
      * Creates a new config object from an XML string
      * @param  string|null      $current_dir Current working directory, if different to $base_dir

diff --git a/src/Psalm/Internal/Provider/ClassLikeStorageCacheProvider.php b/src/Psalm/Internal/Provider/ClassLikeStorageCacheProvider.php
@@ -65,7 +65,7 @@ public function __construct(Config $config)
             $this->modified_timestamps .= ' ' . filemtime($dependent_file_path);
         }
 
-        $this->modified_timestamps .= $this->config->hash;
+        $this->modified_timestamps .= $this->config->computeHash();
     }
 
     public function writeToCache(ClassLikeStorage $storage, ?string $file_path, ?string $file_contents): void

diff --git a/src/Psalm/Internal/Provider/FileReferenceCacheProvider.php b/src/Psalm/Internal/Provider/FileReferenceCacheProvider.php
@@ -54,8 +54,9 @@ public function __construct(Config $config)
 
     public function hasConfigChanged() : bool
     {
-        $has_changed = $this->config->hash !== $this->getConfigHashCache();
-        $this->setConfigHashCache($this->config->hash);
+        $new_hash = $this->config->computeHash();
+        $has_changed = $new_hash !== $this->getConfigHashCache();
+        $this->setConfigHashCache($new_hash);
         return $has_changed;
     }
 

diff --git a/src/Psalm/Internal/Provider/FileStorageCacheProvider.php b/src/Psalm/Internal/Provider/FileStorageCacheProvider.php
@@ -66,7 +66,7 @@ public function __construct(Config $config)
             $this->modified_timestamps .= ' ' . filemtime($dependent_file_path);
         }
 
-        $this->modified_timestamps .= $this->config->hash;
+        $this->modified_timestamps .= $this->config->computeHash();
     }
 
     public function writeToCache(FileStorage $storage, string $file_contents): void