chore: Bumped

Author: roadiz-ci

composer.json

@@ -48,7 +48,9 @@
         "phpstan/phpstan": "^1.5.3",
         "phpstan/phpdoc-parser": "<2",
         "phpstan/phpstan-doctrine": "^1.3",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5",
+        "symfony/http-client": "6.4.*",
+        "symfony/process": "6.4.*"
     },
     "autoload": {
         "psr-4": {
@@ -68,8 +70,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4.x-dev",
-            "dev-develop": "2.5.x-dev"
+            "dev-master": "2.5.x-dev",
+            "dev-develop": "2.6.x-dev"
         }
     }
 }

src/AbstractDocumentFactory.php

@@ -8,7 +8,6 @@
 use League\Flysystem\FilesystemOperator;
 use League\Flysystem\MountManager;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 use RZ\Roadiz\Documents\Models\DocumentInterface;
 use RZ\Roadiz\Documents\Models\FileHashInterface;
 use RZ\Roadiz\Documents\Models\FolderInterface;
@@ -23,23 +22,17 @@
  */
 abstract class AbstractDocumentFactory
 {
-    private LoggerInterface $logger;
     private ?File $file = null;
     private ?FolderInterface $folder = null;
-    private FilesystemOperator $documentsStorage;
-    private DocumentFinderInterface $documentFinder;
 
     public function __construct(
-        FilesystemOperator $documentsStorage,
-        DocumentFinderInterface $documentFinder,
-        ?LoggerInterface $logger = null,
+        protected readonly FilesystemOperator $documentsStorage,
+        protected readonly DocumentFinderInterface $documentFinder,
+        protected readonly LoggerInterface $logger,
     ) {
         if (!$documentsStorage instanceof MountManager) {
             trigger_error('Document Storage must be a MountManager to address public and private files.', E_USER_WARNING);
         }
-        $this->documentsStorage = $documentsStorage;
-        $this->documentFinder = $documentFinder;
-        $this->logger = $logger ?? new NullLogger();
     }
 
     public function getFile(): File
@@ -133,10 +126,10 @@ public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = fa
         if (false !== $fileHash && !$allowDuplicates) {
             $existingDocument = $this->documentFinder->findOneByHashAndAlgorithm($fileHash, $this->getHashAlgorithm());
             if (null !== $existingDocument) {
-                if (
-                    $existingDocument->isRaw()
-                    && null !== $existingDownscaledDocument = $existingDocument->getDownscaledDocument()
-                ) {
+                /*
+                 * If existing document is a RAW, serve its downscaled version
+                 */
+                if (null !== $existingDownscaledDocument = $existingDocument->getDownscaledDocument()) {
                     $existingDocument = $existingDownscaledDocument;
                 }
                 if (null !== $this->folder) {
@@ -146,7 +139,10 @@ public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = fa
                 $this->logger->info(sprintf(
                     'File %s already exists with same checksum, do not upload it twice.',
                     $existingDocument->getFilename()
-                ));
+                ), [
+                    'path' => $existingDocument->getMountPath(),
+                ]);
+                (new Filesystem())->remove($file->getPathname());
 
                 return $existingDocument;
             }
@@ -217,7 +213,7 @@ public function updateDocument(DocumentInterface $document): DocumentInterface
                 }
             }
 
-            $document->setFolder(\mb_substr(hash('crc32b', date('YmdHi')), 0, 12));
+            $document->setFolder(DocumentFolderGenerator::generateFolderName());
         }
 
         $document->setFilename($this->getFileName());

src/AverageColorResolver.php

@@ -6,7 +6,7 @@
 
 use Intervention\Image\Image;
 
-class AverageColorResolver
+final readonly class AverageColorResolver
 {
     public function getAverageColor(Image $image): string
     {

src/DocumentArchiver.php

@@ -14,9 +14,9 @@
 /**
  * Easily create and serve ZIP archives from your Roadiz documents.
  */
-final class DocumentArchiver
+final readonly class DocumentArchiver
 {
-    public function __construct(private readonly FilesystemOperator $documentsStorage)
+    public function __construct(private FilesystemOperator $documentsStorage)
     {
     }
 

src/DocumentFolderGenerator.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\Documents;
+
+final readonly class DocumentFolderGenerator
+{
+    /**
+     * Generate a random folder name for documents, 12 characters long.
+     */
+    public static function generateFolderName(): string
+    {
+        return \mb_substr(hash('crc32c', microtime()), 0, 12);
+    }
+}