improves cache

Author: nunomaduro

.gitignore

@@ -11,4 +11,4 @@ coverage.xml
 *.swo
 .php
 .phpunit.cache
-/temp
+/.temp

src/Analyser.php

@@ -29,27 +29,22 @@ public static function analyse(array $files, Closure $postProcessedFile, Closure
         }
 
         $filesTouched = [];
-        $filesInCache = [];
 
         foreach ($files as $file) {
             if ($cache->has($file)) {
-                $filesInCache[] = $file;
+                [$file, $errors, $ignored] = $cache->get($file);
+
+                $result = Result::fromPHPStanErrors($file, $errors, $ignored);
+
+                $postProcessedFile($result);
+                $onProcessedFile($result);
             } else {
                 $filesTouched[] = $file;
             }
         }
 
         unset($files);
 
-        self::analyseChunks(
-            [$filesInCache],
-            $testCase,
-            $postProcessedFile,
-            $onProcessedFile,
-            $cache,
-            false,
-        );
-
         // next, if we don't have touched files, we can return early
 
         if (count($filesTouched) === 0) {
@@ -85,7 +80,7 @@ public static function analyse(array $files, Closure $postProcessedFile, Closure
             $testCase,
             $postProcessedFile,
             $onProcessedFile,
-            $cache
+            $cache,
         );
     }
 
@@ -111,7 +106,7 @@ private static function analyseChunks(
         }
 
         foreach ($chunks as $files) {
-            $promises[] = async(function () use ($files, $testCase, $onProcessedFile) {
+            $promises[] = async(function () use ($cache, $files, $testCase, $onProcessedFile) {
                 $testCase->resetIgnoredErrors();
                 $results = [];
 
@@ -125,6 +120,8 @@ private static function analyseChunks(
                     $errors = array_values($errors);
                     $ignored = array_values($ignored);
 
+                    $cache->persist($file, [$file, $errors, $ignored]);
+
                     $result = Result::fromPHPStanErrors($file, $errors, $ignored);
 
                     $onProcessedFile($result);

src/Support/Cache.php

@@ -4,6 +4,7 @@
 
 namespace Pest\TypeCoverage\Support;
 
+use LogicException;
 use PHPStan\Analyser\Error;
 
 /**
@@ -14,7 +15,7 @@ final class Cache
     /**
      * The cache version.
      */
-    private const string CACHE_VERSION = 'v2';
+    private const string CACHE_VERSION = 'v3';
 
     /**
      * The cache instance.
@@ -40,6 +41,26 @@ public function has(string $file): bool
         return array_key_exists($fileHash, $items);
     }
 
+    /**
+     * Gets the cached contents for the given file.
+     *
+     * @return array{0: string, 1: array<int, Error>, 2: array<int, Error>}
+     *
+     * @throws LogicException
+     */
+    public function get(string $file): array
+    {
+        $fileHash = md5_file($file);
+
+        if ($fileHash === false) {
+            throw new LogicException('Failed to compute the hash for the file: '.$file);
+        }
+
+        $items = $this->all();
+
+        return $items[$fileHash] ?? throw new LogicException('No cache found for the file: '.$file);
+    }
+
     /**
      * Flushes all the cache contents.
      */
@@ -57,7 +78,7 @@ private function file(): string
     {
         return dirname(__DIR__, 2)
             .DIRECTORY_SEPARATOR
-            .'temp'
+            .'.temp'
             .DIRECTORY_SEPARATOR
             .self::CACHE_VERSION
             .'.php';
@@ -82,8 +103,10 @@ private function all(): array
     /**
      * Persists the cache contents.
      */
-    public function persist(string $key, array $values): void
+    public function persist(string $file, array $values): void
     {
+        $fileHash = md5_file($file);
+
         foreach ($values as $value) {
             if (is_array($value)) {
                 foreach ($value as $item) {
@@ -102,7 +125,7 @@ public function persist(string $key, array $values): void
             chmod($dirPath, 0755);
         }
 
-        $this->withinLock(function () use ($key, $values) {
+        $this->withinLock(function () use ($fileHash, $values) {
             $filePath = $this->file();
             $cache = [];
 
@@ -113,7 +136,7 @@ public function persist(string $key, array $values): void
                 }
             }
 
-            $cache[$key] = $values;
+            $cache[$fileHash] = $values;
 
             $content = '<?php return '.var_export($cache, true).';';