Merge 0a4212c into 4fd52f7

PHPCSStandards · May 8, 2024 · 51feab3 · 51feab3
2 parents 4fd52f7 + 0a4212c
commit 51feab3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/src/Files/LocalFile.php b/src/Files/LocalFile.php
@@ -96,7 +96,8 @@ public function process()
         $hash  = md5_file($this->path);
         $hash .= fileperms($this->path);
         $cache = Cache::get($this->path);
-        if ($cache !== false && $cache['hash'] === $hash) {
+
+        if ($cache !== false && $cache['hash'] === $hash && (PHP_CODESNIFFER_CBF === false || (PHP_CODESNIFFER_CBF === true && $cache['fixableCount'] === 0))) {
             // We can't filter metrics, so just load all of them.
             $this->metrics = $cache['metrics'];
 
@@ -112,9 +113,7 @@ public function process()
                 $this->fixableCount = $cache['fixableCount'];
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY > 0
-                || (PHP_CODESNIFFER_CBF === true && empty($this->config->files) === false)
-            ) {
+            if (PHP_CODESNIFFER_VERBOSITY > 0) {
                 echo "[loaded from cache]... ";
             }
 
@@ -129,18 +128,22 @@ public function process()
 
         parent::process();
 
-        $cache = [
-            'hash'         => $hash,
-            'errors'       => $this->errors,
-            'warnings'     => $this->warnings,
-            'metrics'      => $this->metrics,
-            'errorCount'   => $this->errorCount,
-            'warningCount' => $this->warningCount,
-            'fixableCount' => $this->fixableCount,
-            'numTokens'    => $this->numTokens,
-        ];
-
-        Cache::set($this->path, $cache);
+        if (PHP_CODESNIFFER_CBF === false || $this->fixedCount === 0) {
+            $cache = [
+                'hash'         => $hash,
+                'errors'       => $this->errors,
+                'warnings'     => $this->warnings,
+                'metrics'      => $this->metrics,
+                'errorCount'   => $this->errorCount,
+                'warningCount' => $this->warningCount,
+                'fixableCount' => $this->fixableCount,
+                'numTokens'    => $this->numTokens,
+            ];
+
+            Cache::set($this->path, $cache);
+        } else {
+            Cache::set($this->path, false);
+        }
 
         // During caching, we don't filter out errors in any way, so
         // we need to do that manually now by replaying them.

diff --git a/src/Fixer.php b/src/Fixer.php
@@ -146,6 +146,8 @@ public function fixFile()
             return false;
         }
 
+        $this->currentFile->disableCaching();
+
         $this->enabled = true;
 
         $this->loops = 0;

diff --git a/src/Runner.php b/src/Runner.php
@@ -190,13 +190,11 @@ public function runPHPCBF()
             }
 
             // Override some of the command line settings that might break the fixes.
-            $this->config->generator    = null;
-            $this->config->explain      = false;
-            $this->config->interactive  = false;
-            $this->config->cache        = false;
-            $this->config->showSources  = false;
-            $this->config->recordErrors = false;
-            $this->config->reportFile   = null;
+            $this->config->generator   = null;
+            $this->config->explain     = false;
+            $this->config->interactive = false;
+            $this->config->showSources = false;
+            $this->config->reportFile  = null;
 
             // Only use the "Cbf" report, but allow for the Performance report as well.
             $originalReports = array_change_key_case($this->config->reports, CASE_LOWER);