chore: bumped

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

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,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "ext-json": "*",
         "ext-gd": "*",
         "ext-dom": "*",
@@ -27,30 +27,30 @@
         "ext-fileinfo": "*",
         "doctrine/orm": "~2.20.0",
         "enshrined/svg-sanitize": "^0.22",
-        "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.*",
+        "monolog/monolog": "^3.9",
+        "symfony/asset": "7.3.*",
+        "symfony/console": "7.3.*",
+        "symfony/event-dispatcher": "7.3.*",
+        "symfony/filesystem": ">=7.1",
+        "symfony/finder": "7.3.*",
+        "symfony/http-foundation": "7.3.*",
         "symfony/http-client-contracts": "^3.5",
-        "symfony/options-resolver": "6.4.*",
-        "symfony/serializer": "6.4.*",
-        "twig/twig": "^3.16"
+        "symfony/options-resolver": "7.3.*",
+        "symfony/serializer": "7.3.*",
+        "twig/twig": "^3.21"
     },
     "require-dev": {
-        "api-platform/metadata": "~3.3.11",
+        "api-platform/metadata": "^4.1.18",
         "doctrine/doctrine-bundle": "^2.8.1",
         "php-coveralls/php-coveralls": "^2.4",
         "phpstan/phpstan": "^1.5.3",
         "phpstan/phpdoc-parser": "<2",
         "phpstan/phpstan-doctrine": "^1.3",
-        "phpunit/phpunit": "^9.5",
-        "symfony/http-client": "6.4.*",
-        "symfony/process": "6.4.*"
+        "phpunit/phpunit": "^9.6",
+        "symfony/http-client": "7.3.*",
+        "symfony/process": "7.3.*"
     },
     "autoload": {
         "psr-4": {
@@ -70,8 +70,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     }
 }

src/AbstractDocumentFinder.php

@@ -6,6 +6,7 @@
 
 abstract class AbstractDocumentFinder implements DocumentFinderInterface
 {
+    #[\Override]
     public function findVideosWithFilename(string $fileName): iterable
     {
         $basename = pathinfo($fileName);
@@ -24,6 +25,7 @@ public function findVideosWithFilename(string $fileName): iterable
         return $this->findAllByFilenames($sourcesDocsName);
     }
 
+    #[\Override]
     public function findAudiosWithFilename(string $fileName): iterable
     {
         $basename = pathinfo($fileName);
@@ -40,6 +42,7 @@ public function findAudiosWithFilename(string $fileName): iterable
         return $this->findAllByFilenames($sourcesDocsName);
     }
 
+    #[\Override]
     public function findPicturesWithFilename(string $fileName): iterable
     {
         $pathInfo = pathinfo($fileName);
@@ -60,9 +63,7 @@ public function findPicturesWithFilename(string $fileName): iterable
         // remove current extension from list
         $extensionsList = array_diff($extensionsList, [$currentExtension]);
         // list sources paths for extensions
-        $sourcesDocsName = array_values(array_map(function ($extension) use ($basename) {
-            return $basename.'.'.$extension;
-        }, $extensionsList));
+        $sourcesDocsName = array_values(array_map(fn ($extension) => $basename.'.'.$extension, $extensionsList));
 
         return $this->findAllByFilenames($sourcesDocsName);
     }

src/ArrayDocumentFinder.php

@@ -15,7 +15,7 @@ final class ArrayDocumentFinder extends AbstractDocumentFinder
     /**
      * @var ArrayCollection<int, DocumentInterface>
      */
-    private ArrayCollection $documents;
+    private readonly ArrayCollection $documents;
 
     public function __construct()
     {
@@ -27,24 +27,23 @@ public function __construct()
      *
      * @return ArrayCollection<int, DocumentInterface>
      */
+    #[\Override]
     public function findAllByFilenames(array $fileNames): ArrayCollection
     {
         return $this->documents->filter(
-            function (DocumentInterface $document) use ($fileNames) {
-                return in_array($document->getFilename(), $fileNames);
-            }
+            fn (DocumentInterface $document) => in_array($document->getFilename(), $fileNames)
         );
     }
 
+    #[\Override]
     public function findOneByFilenames(array $fileNames): ?DocumentInterface
     {
         return $this->documents->filter(
-            function (DocumentInterface $document) use ($fileNames) {
-                return in_array($document->getFilename(), $fileNames);
-            }
+            fn (DocumentInterface $document) => in_array($document->getFilename(), $fileNames)
         )->first() ?: null;
     }
 
+    #[\Override]
     public function findOneByHashAndAlgorithm(string $hash, string $algorithm): ?DocumentInterface
     {
         return null;

src/AverageColorResolver.php

@@ -4,28 +4,16 @@
 
 namespace RZ\Roadiz\Documents;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 final readonly class AverageColorResolver
 {
-    public function getAverageColor(Image $image): string
+    /**
+     * Get the average color of an image by resampling the image to 1x1 pixel and pick this pixel color.
+     * Then only use the RGB channels by picking only the 7 first hex chars to get rid of alpha channel.
+     */
+    public function getAverageColor(ImageInterface $image): string
     {
-        $colorArray = $this->getAverageColorAsArray($image);
-
-        return sprintf(
-            '#%02x%02x%02x',
-            $colorArray[0],
-            $colorArray[1],
-            $colorArray[2]
-        );
-    }
-
-    public function getAverageColorAsArray(Image $image): array
-    {
-        $image->resize(1, 1);
-        /** @var array $array */
-        $array = $image->pickColor(0, 0);
-
-        return $array;
+        return substr($image->resize(1, 1)->pickColor(0, 0)->toHex('#'), 0, 7);
     }
 }

src/Console/DocumentAverageColorCommand.php

@@ -4,7 +4,8 @@
 
 namespace RZ\Roadiz\Documents\Console;
 
-use Intervention\Image\Exception\NotReadableException;
+use Intervention\Image\Exceptions\DecoderException;
+use League\Flysystem\FilesystemException;
 use RZ\Roadiz\Documents\AverageColorResolver;
 use RZ\Roadiz\Documents\Models\AdvancedDocumentInterface;
 use RZ\Roadiz\Documents\Models\DocumentInterface;
@@ -16,13 +17,15 @@ class DocumentAverageColorCommand extends AbstractDocumentCommand
 {
     protected SymfonyStyle $io;
 
+    #[\Override]
     protected function configure(): void
     {
         $this->setName('documents:color')
             ->setDescription('Fetch every document medium color and write it in database.')
         ;
     }
 
+    #[\Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->io = new SymfonyStyle($input, $output);
@@ -43,11 +46,11 @@ private function updateDocumentColor(DocumentInterface $document): void
             return;
         }
         try {
-            $mediumColor = (new AverageColorResolver())->getAverageColor($this->imageManager->make(
+            $mediumColor = (new AverageColorResolver())->getAverageColor($this->imageManager->read(
                 $this->documentsStorage->readStream($mountPath)
             ));
             $document->setImageAverageColor($mediumColor);
-        } catch (NotReadableException $exception) {
+        } catch (DecoderException|FilesystemException) {
             /*
              * Do nothing
              * just return 0 width and height

src/Console/DocumentClearFolderCommand.php

@@ -17,6 +17,7 @@ class DocumentClearFolderCommand extends AbstractDocumentCommand
 {
     protected SymfonyStyle $io;
 
+    #[\Override]
     protected function configure(): void
     {
         $this->setName('documents:clear-folder')
@@ -34,6 +35,7 @@ protected function getDocumentQueryBuilder(FolderInterface $folder): QueryBuilde
             ->setParameter(':folderId', $folder);
     }
 
+    #[\Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->io = new SymfonyStyle($input, $output);

src/Console/DocumentDownscaleCommand.php

@@ -5,8 +5,9 @@
 namespace RZ\Roadiz\Documents\Console;
 
 use Doctrine\Persistence\ManagerRegistry;
-use Intervention\Image\Exception\NotReadableException;
+use Intervention\Image\Exceptions\DecoderException;
 use Intervention\Image\ImageManager;
+use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
 use RZ\Roadiz\Documents\DownscaleImageManager;
 use RZ\Roadiz\Documents\Events\CachePurgeAssetsRequestEvent;
@@ -36,6 +37,7 @@ public function __construct(
         parent::__construct($managerRegistry, $imageManager, $documentsStorage, $name);
     }
 
+    #[\Override]
     protected function configure(): void
     {
         $this->setName('documents:downscale')
@@ -45,6 +47,7 @@ protected function configure(): void
             ->setDescription('Downscale every document according to max pixel size defined in configuration.');
     }
 
+    #[\Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
@@ -133,7 +136,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($documents as $document) {
             try {
                 $this->downscaler->processDocumentFromExistingRaw($document);
-            } catch (NotReadableException $exception) {
+            } catch (DecoderException|FilesystemException $exception) {
                 $io->error($exception->getMessage().' - '.(string) $document);
             }
             $io->progressAdvance();

src/Console/DocumentDuplicatesCommand.php

@@ -14,13 +14,15 @@ class DocumentDuplicatesCommand extends AbstractDocumentCommand
 {
     protected SymfonyStyle $io;
 
+    #[\Override]
     protected function configure(): void
     {
         $this->setName('documents:duplicates')
             ->setDescription('Find duplicated documents based on their file hash.')
         ;
     }
 
+    #[\Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->io = new SymfonyStyle($input, $output);