chore: Bumped

roadiz · Feb 10, 2025 · 6ad8461 · 6ad8461
1 parent 58f2d47
commit 6ad8461
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 43 deletions.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.0', '8.1']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ext-json": "*",
         "ext-gd": "*",
         "ext-dom": "*",
         "ext-zip": "*",
         "ext-simplexml": "*",
         "ext-fileinfo": "*",
-        "doctrine/orm": "<2.17",
+        "doctrine/orm": "~2.17.0",
         "enshrined/svg-sanitize": "^0.15",
         "guzzlehttp/guzzle": "^7.2.0",
         "guzzlehttp/psr7": "^2.0",
@@ -62,8 +62,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-master": "2.2.x-dev",
+            "dev-develop": "2.3.x-dev"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -17,6 +17,8 @@ parameters:
         - '#Doctrine\\ORM\\Mapping\\GeneratedValue constructor expects#'
         - '#type mapping mismatch: property can contain Doctrine\\Common\\Collections\\Collection<int, [^\>]+> but database expects Doctrine\\Common\\Collections\\Collection&iterable<[^\>]+>#'
         - '#should return Doctrine\\Common\\Collections\\Collection<int, [^\>]+Interface> but returns Doctrine\\Common\\Collections\\Collection<int, [^\>]+>#'
+        - '#but returns Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
+        - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
     reportUnmatchedIgnoredErrors: false
     checkMissingIterableValueType: false
     checkGenericClassInNonGenericObjectType: false

diff --git a/src/AbstractDocumentFinder.php b/src/AbstractDocumentFinder.php
@@ -53,7 +53,10 @@ public function findPicturesWithFilename(string $fileName): iterable
     {
         $pathInfo = pathinfo($fileName);
         $basename = $pathInfo['filename'];
-        $currentExtension = $pathInfo['extension'];
+        $currentExtension = $pathInfo['extension'] ?? null;
+        if (null === $currentExtension) {
+            return [];
+        }
         $extensionsList = [
             'jpg',
             'gif',

diff --git a/src/DocumentArchiver.php b/src/DocumentArchiver.php
@@ -24,13 +24,13 @@ public function __construct(FilesystemOperator $documentsStorage)
     }
 
     /**
-     * @param array $documents
+     * @param iterable<DocumentInterface> $documents
      * @param string $name
      * @param bool $keepFolders
      * @return string Zip file path
      * @throws FilesystemException
      */
-    public function archive(array $documents, string $name, bool $keepFolders = true): string
+    public function archive(iterable $documents, string $name, bool $keepFolders = true): string
     {
         $filename = (new AsciiSlugger())->slug($name . ' ' . date('YmdHis'), '_') . '.zip';
         $tmpFileName = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $filename;
@@ -60,8 +60,16 @@ public function archive(array $documents, string $name, bool $keepFolders = true
         return $tmpFileName;
     }
 
+    /**
+     * @param iterable<DocumentInterface> $documents
+     * @param string $name
+     * @param bool $keepFolders
+     * @param bool $unlink
+     * @return BinaryFileResponse
+     * @throws FilesystemException
+     */
     public function archiveAndServe(
-        array $documents,
+        iterable $documents,
         string $name,
         bool $keepFolders = true,
         bool $unlink = true

diff --git a/src/DownscaleImageManager.php b/src/DownscaleImageManager.php
@@ -97,7 +97,7 @@ public function processDocumentFromExistingRaw(?DocumentInterface $document = nu
                     null !== $this->createDocumentFromImage($document, $processImage, true)
                     && null !== $this->logger
                 ) {
-                    $this->logger->info('Document has been downscaled.', ['path' => $documentPath]);
+                    $this->logger->info('Document has been downscaled.', ['path' => $documentPath, 'entity' => $document]);
                 }
             }
         }

diff --git a/src/Models/AdvancedDocumentInterface.php b/src/Models/AdvancedDocumentInterface.php
@@ -4,19 +4,8 @@
 
 namespace RZ\Roadiz\Documents\Models;
 
-interface AdvancedDocumentInterface extends DocumentInterface, SizeableInterface
+interface AdvancedDocumentInterface extends DocumentInterface, SizeableInterface, DisplayableInterface
 {
-    /**
-     * @return string|null
-     */
-    public function getImageAverageColor(): ?string;
-
-    /**
-     * @param string|null $imageAverageColor
-     * @return $this
-     */
-    public function setImageAverageColor(?string $imageAverageColor): static;
-
     /**
      * @return int|null
      */

diff --git a/src/Models/DocumentInterface.php b/src/Models/DocumentInterface.php
@@ -156,7 +156,7 @@ public function setRawDocument(?DocumentInterface $rawDocument = null): static;
     public function isRaw(): bool;
 
     /**
-     * @param boolean $raw the raw
+     * @param bool $raw the raw
      * @return $this
      */
     public function setRaw(bool $raw): static;

diff --git a/src/Viewers/SvgDocumentViewer.php b/src/Viewers/SvgDocumentViewer.php
@@ -32,7 +32,7 @@ class SvgDocumentViewer
      * @param FilesystemOperator $documentsStorage
      * @param DocumentInterface $document
      * @param array $attributes
-     * @param boolean $asObject Default false
+     * @param bool $asObject Default false
      * @param string $imageUrl Only needed if you set $asObject to true.
      */
     public function __construct(