fix: asset cache key with content hash (#2189)

Author: ArnaudLigny

src/Assets/Asset.php

@@ -97,6 +97,7 @@ public function __construct(Builder $builder, string|array $paths, array|null $o
             'height'   => 0,     // image height (in pixels)
             'exif'     => [],    // image exif data
             'content'  => '',    // file content
+            'hash'     => '',    // file content hash (md5)
         ];
 
         // handles options
@@ -142,6 +143,7 @@ public function __construct(Builder $builder, string|array $paths, array|null $o
                     $this->data['subtype'] = Util\File::getMediaType($file)[1];
                     $this->data['size'] += filesize($file);
                     $this->data['content'] .= Util\File::fileGetContents($file);
+                    $this->data['hash'] = hash('md5', $this->data['content']);
                     // bundle default filename
                     $filename = $options['filename'];
                     if ($pathsCount > 1 && empty($filename)) {
@@ -853,6 +855,7 @@ private function getRemoteFileContent(string $path, ?string $userAgent = null):
      */
     private function optimize(string $filepath, string $path, int $quality): int
     {
+        $message = \sprintf('Asset not optimized: "%s"', $path);
         $sizeBefore = filesize($filepath);
         Optimizer::create($quality)->optimize($filepath);
         $sizeAfter = filesize($filepath);

src/Assets/Cache.php

@@ -174,15 +174,25 @@ public function deleteMultiple($keys): bool
     }
 
     /**
-     * Creates key from a string: "$name|uniqid__HASH__VERSION".
+     * Creates key from a name and a hash: "$name__HASH__VERSION".
+     */
+    public function createKey(string $name, string $hash): string
+    {
+        $name = self::sanitizeKey($name);
+
+        return \sprintf('%s__%s__%s', $name, $hash, $this->builder->getVersion());
+    }
+
+    /**
+     * Creates key from a string: "$name__HASH__VERSION".
      * $name is optional to add a human readable name to the key.
      */
-    public function createKey(?string $name, string $value): string
+    public function createKeyFromValue(?string $name, string $value): string
     {
         $hash = hash('md5', $value);
-        $name = $name ? self::sanitizeKey($name) : $hash;
+        $name = $name ?? $hash;
 
-        return \sprintf('%s__%s__%s', $name, $hash, $this->builder->getVersion());
+        return $this->createKey($name, $hash);
     }
 
     /**
@@ -214,7 +224,7 @@ public function createKeyFromAsset(Asset $asset, ?array $tags = null): string
         $tagsInline = implode('_', str_replace('_', '', $tags));
         $name = "{$asset['_path']}_{$asset['ext']}_$tagsInline";
 
-        return $this->createKey($name, $asset['content'] ?? '');
+        return $this->createKey($name, $asset['hash']);
     }
 
     /**
@@ -228,7 +238,7 @@ public function createKeyFromFile(\Symfony\Component\Finder\SplFileInfo $file):
             throw new RuntimeException(\sprintf('Can\'t create cache key for "%s".', $file));
         }
 
-        return $this->createKey($file->getRelativePathname(), $content);
+        return $this->createKeyFromValue($file->getRelativePathname(), $content);
     }
 
     /**

src/Renderer/Extension/Core.php

@@ -430,7 +430,7 @@ public function minifyCss(?string $value): string
         }
 
         $cache = new Cache($this->builder, 'assets');
-        $cacheKey = $cache->createKey(null, $value);
+        $cacheKey = $cache->createKeyFromValue(null, $value);
         if (!$cache->has($cacheKey)) {
             $minifier = new Minify\CSS($value);
             $value = $minifier->minify();
@@ -452,7 +452,7 @@ public function minifyJs(?string $value): string
         }
 
         $cache = new Cache($this->builder, 'assets');
-        $cacheKey = $cache->createKey(null, $value);
+        $cacheKey = $cache->createKeyFromValue(null, $value);
         if (!$cache->has($cacheKey)) {
             $minifier = new Minify\JS($value);
             $value = $minifier->minify();
@@ -472,7 +472,7 @@ public function scssToCss(?string $value): string
         $value = $value ?? '';
 
         $cache = new Cache($this->builder, 'assets');
-        $cacheKey = $cache->createKey(null, $value);
+        $cacheKey = $cache->createKeyFromValue(null, $value);
         if (!$cache->has($cacheKey)) {
             $scssPhp = new Compiler();
             $outputStyles = ['expanded', 'compressed'];