Refactored "isFresh" logic for "CacheState" class

Author: WalterWoshid

src/Service/Cache/CacheState.php

@@ -2,6 +2,8 @@
 
 namespace Okapi\CodeTransformer\Service\Cache;
 
+use Okapi\CodeTransformer\Service\TransformerContainer;
+
 /**
  * # Cache State
  *
@@ -13,12 +15,14 @@ class CacheState
      * CacheState constructor.
      *
      * @param string      $originalFilePath
+     * @param string      $className
      * @param string|null $cachedFilePath
      * @param int         $transformedTime
      * @param string[]    $transformerFilePaths
      */
     public function __construct(
         public string  $originalFilePath,
+        public string  $className,
         public ?string $cachedFilePath,
         public int     $transformedTime,
         public array   $transformerFilePaths,
@@ -32,6 +36,7 @@ public function __construct(
     public function toArray(): array
     {
         return [
+            'className'            => $this->className,
             'cachedFilePath'       => $this->cachedFilePath,
             'transformedTime'      => $this->transformedTime,
             'transformerFilePaths' => $this->transformerFilePaths,
@@ -45,12 +50,14 @@ public function toArray(): array
      */
     public function isFresh(): bool
     {
-        // Prevent infinite recursion
-        if ($this->originalFilePath === $this->cachedFilePath) {
-            // @codeCoverageIgnoreStart
-            // This should only happen if the project is misconfigured
-            return false;
-            // @codeCoverageIgnoreEnd
+        if ($this->cachedFilePath !== null) {
+            // Prevent infinite recursion
+            if ($this->originalFilePath === $this->cachedFilePath) {
+                // @codeCoverageIgnoreStart
+                // This should only happen if the project is misconfigured
+                return false;
+                // @codeCoverageIgnoreEnd
+            }
         }
 
         $allFiles = array_merge(
@@ -64,13 +71,25 @@ public function isFresh(): bool
             return false;
         }
 
+        if ($this->cachedFilePath !== null) {
+            $allFiles[] = $this->cachedFilePath;
+        }
+
         // Check if the cache file exists
-        foreach (array_merge($allFiles, [$this->cachedFilePath]) as $file) {
+        foreach ($allFiles as $file) {
             if (!file_exists($file)) {
                 return false;
             }
         }
 
+        // Check if the transformer count is the same
+        // Checking the count alone should be enough
+        $cachedTransformerCount = count($this->transformerFilePaths);
+        $currentTransformerCount = count(TransformerContainer::matchTransformers($this->className));
+        if ($cachedTransformerCount !== $currentTransformerCount) {
+            return false;
+        }
+
         return true;
     }
 }

src/Service/CacheStateManager.php

@@ -105,15 +105,27 @@ private function loadCacheState(): void
         // Unserialize
         $cacheState = eval($cacheStateContent);
 
+        // Filter out invalid items
+        $cacheState = array_filter(
+            $cacheState,
+            function ($cacheStateItem) {
+                return key_exists('className', $cacheStateItem)
+                    && key_exists('cachedFilePath', $cacheStateItem)
+                    && key_exists('transformedTime', $cacheStateItem)
+                    && key_exists('transformerFilePaths', $cacheStateItem);
+            },
+        );
+
         // Convert to array of CacheState objects
         array_walk(
             $cacheState,
             function (&$cacheStateItem, $originalFilePath) {
                 $cacheStateItem = new CacheState(
-                    $originalFilePath,
-                    $cacheStateItem['cachedFilePath'],
-                    $cacheStateItem['transformedTime'],
-                    $cacheStateItem['transformerFilePaths']
+                    originalFilePath:     $originalFilePath,
+                    className:            $cacheStateItem['className'],
+                    cachedFilePath:       $cacheStateItem['cachedFilePath'],
+                    transformedTime:      $cacheStateItem['transformedTime'],
+                    transformerFilePaths: $cacheStateItem['transformerFilePaths']
                 );
             },
         );

src/Service/TransformerContainer.php

@@ -169,6 +169,7 @@ public static function transform(Metadata $metadata)
         $transformerFilePaths = $instance->getTransformerFilePaths($transformers);
         $cacheState           = new CacheState(
             originalFilePath:     $originalFilePath,
+            className:            $fullClassName,
             cachedFilePath:       $transformed ? $cacheFilePath : null,
             transformedTime:      $fileModificationTime,
             transformerFilePaths: $transformerFilePaths,