Merge branch hotfix/v2.7.33

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.1', '8.2', '8.3']
+                php-version: ['8.3', '8.4', '8.5']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -35,9 +35,7 @@ jobs:
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
-            - name: Run Unit tests
-              run: vendor/bin/phpunit -v --whitelist ./src tests
-            - name: Run PHP Code Sniffer
-              run: vendor/bin/phpcs -p ./src
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon
+            - name: Run Unit tests
+              run: vendor/bin/phpunit -v --whitelist ./src tests

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2024 Ambroise Maupate
+Copyright © 2025 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

composer.json

@@ -18,37 +18,39 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.3",
         "ext-json": "*",
         "ext-gd": "*",
         "ext-dom": "*",
         "ext-zip": "*",
         "ext-simplexml": "*",
         "ext-fileinfo": "*",
-        "doctrine/orm": "~2.19.0",
+        "doctrine/orm": "~2.20.0",
         "enshrined/svg-sanitize": "^0.22",
-        "guzzlehttp/guzzle": "^7.2.0",
-        "guzzlehttp/psr7": "^2.0",
-        "intervention/image": "^2.5",
+        "intervention/image": "^3.11",
         "league/flysystem": "^3.0",
-        "monolog/monolog": "^1.24.0 || ^2.1.1",
-        "symfony/asset": "6.4.*",
-        "symfony/console": "6.4.*",
-        "symfony/event-dispatcher": "6.4.*",
-        "symfony/filesystem": "6.4.*",
-        "symfony/finder": "6.4.*",
-        "symfony/http-foundation": "6.4.*",
-        "symfony/options-resolver": "6.4.*",
-        "symfony/serializer": "6.4.*",
-        "twig/twig": "^3.1"
+        "monolog/monolog": "^3.9",
+        "symfony/asset": "7.4.*",
+        "symfony/console": "7.4.*",
+        "symfony/event-dispatcher": "7.4.*",
+        "symfony/filesystem": ">=7.1",
+        "symfony/finder": "7.4.*",
+        "symfony/http-foundation": "7.4.*",
+        "symfony/http-client-contracts": "^3.5",
+        "symfony/options-resolver": "7.4.*",
+        "symfony/serializer": "7.4.*",
+        "twig/twig": "^3.21"
     },
     "require-dev": {
+        "api-platform/metadata": "^4.1.18",
+        "doctrine/doctrine-bundle": "^2.8.1",
         "php-coveralls/php-coveralls": "^2.4",
-        "phpunit/phpunit": "^9.5",
-        "api-platform/metadata": "^3.2.12",
-        "squizlabs/php_codesniffer": "^3.5",
-        "phpstan/phpstan": "^1.5.3",
-        "phpstan/phpstan-doctrine": "^1.3"
+        "phpstan/phpstan": "^2.1.36",
+        "phpstan/phpdoc-parser": "<2",
+        "phpstan/phpstan-doctrine": "^2.0.13",
+        "phpunit/phpunit": "^9.6",
+        "symfony/http-client": "7.4.*",
+        "symfony/process": "7.4.*"
     },
     "autoload": {
         "psr-4": {
@@ -68,8 +70,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     }
 }

phpcs.xml.dist

@@ -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,88 +22,69 @@
  */
 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();
     }
 
-    /**
-     * @return File
-     */
     public function getFile(): File
     {
         if (null === $this->file) {
             throw new \BadMethodCallException('File should be defined before using it.');
         }
+
         return $this->file;
     }
 
     /**
-     * @param  File $file
      * @return $this
      */
     public function setFile(File $file): static
     {
         $this->file = $file;
+
         return $this;
     }
 
-    /**
-     * @return FolderInterface|null
-     */
     public function getFolder(): ?FolderInterface
     {
         return $this->folder;
     }
 
     /**
-     * @param FolderInterface|null $folder
      * @return $this
      */
     public function setFolder(?FolderInterface $folder = null): static
     {
         $this->folder = $folder;
+
         return $this;
     }
 
     /**
      * Special case for SVG without XML statement.
-     *
-     * @param DocumentInterface $document
      */
     protected function parseSvgMimeType(DocumentInterface $document): void
     {
         if (
-            ($document->getMimeType() === 'text/plain' || $document->getMimeType() === 'text/html') &&
-            preg_match('#\.svg$#', $document->getFilename())
+            ('text/plain' === $document->getMimeType() || 'text/html' === $document->getMimeType())
+            && preg_match('#\.svg$#', $document->getFilename())
         ) {
             $this->logger->debug('Uploaded a SVG without xml declaration. Presuming it’s a valid SVG file.');
             $document->setMimeType('image/svg+xml');
         }
     }
 
-    /**
-     * @return DocumentInterface
-     */
     abstract protected function createDocument(): DocumentInterface;
 
-    /**
-     * @param DocumentInterface $document
-     */
     abstract protected function persistDocument(DocumentInterface $document): void;
 
     protected function getHashAlgorithm(): string
@@ -116,22 +96,25 @@ protected function getHashAlgorithm(): string
      * Create a document from UploadedFile, Be careful, this method does not flush, only
      * persists current Document.
      *
-     * @param bool $allowEmpty Default false, requires a local file to create new document entity
+     * @param bool $allowEmpty      Default false, requires a local file to create new document entity
      * @param bool $allowDuplicates Default false, always import new document even if file already exists
-     * @return null|DocumentInterface
+     *
      * @throws FilesystemException
      */
     public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = false): ?DocumentInterface
     {
-        if ($allowEmpty === false) {
+        if (false === $allowEmpty) {
             // Getter throw exception on null file
             $file = $this->getFile();
         } else {
             $file = $this->file;
         }
 
         if (null === $file) {
-            return null;
+            $document = $this->createDocument();
+            $this->persistDocument($document);
+
+            return $document;
         }
 
         if ($file instanceof UploadedFile && !$file->isValid()) {
@@ -146,10 +129,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) {
@@ -159,7 +142,11 @@ 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;
             }
         }
@@ -175,8 +162,8 @@ public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = fa
         $this->parseSvgMimeType($document);
 
         if (
-            $document instanceof FileHashInterface &&
-            false !== $fileHash
+            $document instanceof FileHashInterface
+            && false !== $fileHash
         ) {
             $document->setFileHash($fileHash);
             $document->setFileHashAlgorithm($this->getHashAlgorithm());
@@ -196,8 +183,6 @@ public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = fa
     /**
      * Updates a document from UploadedFile, Be careful, this method does not flush.
      *
-     * @param DocumentInterface $document
-     * @return DocumentInterface
      * @throws FilesystemException
      */
     public function updateDocument(DocumentInterface $document): DocumentInterface
@@ -231,7 +216,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());
@@ -247,9 +232,6 @@ public function updateDocument(DocumentInterface $document): DocumentInterface
     }
 
     /**
-     * @param File $localFile
-     * @param DocumentInterface $document
-     * @return void
      * @throws FilesystemException
      */
     public function moveFile(File $localFile, DocumentInterface $document): void
@@ -267,9 +249,6 @@ public function moveFile(File $localFile, DocumentInterface $document): void
         }
     }
 
-    /**
-     * @return string
-     */
     protected function getFileName(): string
     {
         $file = $this->getFile();
@@ -278,8 +257,8 @@ protected function getFileName(): string
             $fileName = $file->getClientOriginalName();
         } elseif (
             $file instanceof DownloadedFile
-            && $file->getOriginalFilename() !== null
-            && $file->getOriginalFilename() !== ''
+            && null !== $file->getOriginalFilename()
+            && '' !== $file->getOriginalFilename()
         ) {
             $fileName = $file->getOriginalFilename();
         } else {
@@ -292,9 +271,6 @@ protected function getFileName(): string
     /**
      * Create a Document from an external URL.
      *
-     * @param string $downloadUrl
-     *
-     * @return DocumentInterface|null
      * @throws FilesystemException
      */
     public function getDocumentFromUrl(string $downloadUrl): ?DocumentInterface
@@ -303,6 +279,7 @@ public function getDocumentFromUrl(string $downloadUrl): ?DocumentInterface
         if (null !== $downloadedFile) {
             return $this->setFile($downloadedFile)->getDocument();
         }
+
         return null;
     }
 }