Fixed issues with same folder names

Author: le0daniel

src/Http/Controllers/ImageController.php

@@ -36,7 +36,7 @@ private function expired()
     public function image(string $folder, string $path, string $extension)
     {
         try {
-            $imageRepresentation = $this->imageEngine->getImageSignedString($folder . $path);
+            $imageRepresentation = $this->imageEngine->getImageSignedString($folder . '::' . $path);
             if ($imageRepresentation->isExpired) {
                 return $this->expired();
             }

src/Image/ImageEngine.php

@@ -107,7 +107,7 @@ private function getTmpPath(string $extension)
     public function serializeImage(ImageRepresentation $imageRepresentation): array
     {
         $signature = Signatures::sign($this->secret, $imageRepresentation->serialize());
-        return Strings::splitAtIndex($signature, 20);
+        return explode('::', $signature, 2);
     }
 
     public function getImageSignedString(string $signedString): ImageRepresentation

src/Utility/Images.php

@@ -49,7 +49,7 @@ public static function realPath(ImageRepresentation $imageRepresentation): strin
         }
 
         $baseCachePath = config('image-engine.original_cache_dir');
-        [$folder, $name] = Strings::splitAtIndex(md5($imageRepresentation->filePath), 20);
+        [$folder, $name] = Strings::splitAtIndex(md5($imageRepresentation->filePath), 6);
         $cacheFilePath = "{$baseCachePath}/{$folder}/{$name}.{$imageRepresentation->extension}";
 
         Directories::makeRecursive(dirname($cacheFilePath));

src/routes/resources.php

@@ -12,7 +12,7 @@
     ->where(
         [
             'folder' => '[a-zA-Z0-9\_\-]+',
-            'path' => '[a-zA-Z0-9\_\-]+::[a-zA-Z0-9\_\-]+',
+            'path' => '[a-zA-Z0-9\_\-]+',
             'extension' => '(jpg|jpeg|png)',
         ]
     )