DX: Cache optimisation (#7985)

PHP-CS-Fixer · May 6, 2024 · c3af946 · c3af946
1 parent 6a9351f
commit c3af946
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/src/Cache/CacheManagerInterface.php b/src/Cache/CacheManagerInterface.php
@@ -24,4 +24,6 @@ interface CacheManagerInterface
     public function needFixing(string $file, string $fileContent): bool;
 
     public function setFile(string $file, string $fileContent): void;
+
+    public function setFileHash(string $file, string $hash): void;
 }
diff --git a/src/Cache/FileCacheManager.php b/src/Cache/FileCacheManager.php
@@ -103,9 +103,12 @@ public function needFixing(string $file, string $fileContent): bool
 
     public function setFile(string $file, string $fileContent): void
     {
-        $file = $this->cacheDirectory->getRelativePathTo($file);
+        $this->setFileHash($file, $this->calcHash($fileContent));
+    }
 
-        $hash = $this->calcHash($fileContent);
+    public function setFileHash(string $file, string $hash): void
+    {
+        $file = $this->cacheDirectory->getRelativePathTo($file);
 
         if ($this->isDryRun && $this->cache->has($file) && $this->cache->get($file) !== $hash) {
             $this->cache->clear($file);

diff --git a/src/Cache/NullCacheManager.php b/src/Cache/NullCacheManager.php
@@ -16,6 +16,7 @@
 
 /**
  * @author Andreas Möller <am@localheinz.com>
+ * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * @internal
  */
@@ -27,4 +28,6 @@ public function needFixing(string $file, string $fileContent): bool
     }
 
     public function setFile(string $file, string $fileContent): void {}
+
+    public function setFileHash(string $file, string $hash): void {}
 }
diff --git a/src/Runner/Runner.php b/src/Runner/Runner.php
@@ -154,8 +154,8 @@ private function fixFile(\SplFileInfo $file, LintingResultInterface $lintingResu
         $tokens = Tokens::fromCode($old);
         $oldHash = $tokens->getCodeHash();
 
-        $newHash = $oldHash;
         $new = $old;
+        $newHash = $oldHash;
 
         $appliedFixers = [];
 
@@ -266,7 +266,7 @@ private function fixFile(\SplFileInfo $file, LintingResultInterface $lintingResu
             }
         }
 
-        $this->cacheManager->setFile($name, $new);
+        $this->cacheManager->setFileHash($name, $newHash);
 
         $this->dispatchEvent(
             FixerFileProcessedEvent::NAME,

diff --git a/tests/Runner/FileFilterIteratorTest.php b/tests/Runner/FileFilterIteratorTest.php
@@ -229,6 +229,11 @@ public function setFile(string $file, string $fileContent): void
             {
                 throw new \LogicException('Not implemented.');
             }
+
+            public function setFileHash(string $file, string $hash): void
+            {
+                throw new \LogicException('Not implemented.');
+            }
         };
     }
 }