Merge pull request #25 from robinallezard/feat/fallback-img

add palceholder  when model doesn't have an image

Author: robinallezard

Service/ImagePluginService.php

@@ -38,16 +38,6 @@ private function getHtmlImageRender(array $image, array $params): string
         $sources = $image['sources'];
         $data = $image['data'];
         $render = '';
-        if (empty($sources) && !isset($params['placeholder'])) {
-            return '';
-        }
-
-        if (empty($sources)) {
-            $sources[] = [
-                'url' => $params['placeholder'],
-                'breakpoint' => 'default'
-            ];
-        }
 
         foreach ($sources as $source) {
             if ($source['breakpoint'] === "default" || count($sources) <= 1) {
@@ -71,11 +61,6 @@ private function getHtmlImageRender(array $image, array $params): string
         return $render;
     }
 
-
-
-
-
-
     private function concatHtmlAttrs(?array $htmlAttrs): string
     {
         $attrs = '';

Service/ImageService.php

@@ -45,7 +45,7 @@ public function getUrlForImage(
         $region = 'full',
         $size = 'max',
         $rotation = 0,
-        $quality = 'default'
+        $quality = 'default',
     ) {
         return "/image-library/$identifier/$region/$size/$rotation/$quality.$format";
     }
@@ -56,7 +56,7 @@ public function geFormattedImage(
         $size,
         $rotation,
         $quality,
-        $format
+        $format,
     ) {
         if (!\in_array(strtolower($format), ['jpg', 'jpeg', 'png', 'gif', 'jp2', 'webp'])) {
             throw new HttpException(400, 'Bad format value');
@@ -65,7 +65,7 @@ public function geFormattedImage(
         $formattedImagePath = THELIA_WEB_DIR.'image-library'.DS.$identifier.DS.$region.DS.$size.DS.$rotation;
         if (!is_dir($formattedImagePath)) {
             if (!@mkdir($formattedImagePath, 0755, true)) {
-                throw new \RuntimeException(sprintf('Failed to create %s file in cache directory', $formattedImagePath));
+                throw new \RuntimeException(\sprintf('Failed to create %s file in cache directory', $formattedImagePath));
             }
         }
 
@@ -104,7 +104,7 @@ public function applyRegion(ImageInterface $image, $region)
         }
 
         // If region start with pct: values are percent of size
-        $regionMode = strpos($region, 'pct:') === false ? 'value' : 'percentage';
+        $regionMode = !str_contains($region, 'pct:') ? 'value' : 'percentage';
         $values = explode(',', str_replace('pct:', '', $region));
 
         if (\count($values) !== 4) {
@@ -137,9 +137,9 @@ public function applyRegion(ImageInterface $image, $region)
 
     public function applySize(ImageInterface $image, $size)
     {
-        $upscaleMode = false !== strpos($size, '^');
-        $keepAspectRatio = false !== strpos($size, '!');
-        $borders = false !== strpos($size, '*');
+        $upscaleMode = str_contains($size, '^');
+        $keepAspectRatio = str_contains($size, '!');
+        $borders = str_contains($size, '*');
         $size = str_replace('^', '', $size);
         $size = str_replace('!', '', $size);
         $size = str_replace('*', '', $size);
@@ -155,7 +155,7 @@ public function applySize(ImageInterface $image, $size)
         $width = $image->getSize()->getWidth();
         $height = $image->getSize()->getHeight();
 
-        if (false !== strpos($size, 'pct:')) {
+        if (str_contains($size, 'pct:')) {
             $values = explode(':', $size);
             if (!isset($values[1])) {
                 throw new HttpException(400, 'Bad size values');
@@ -221,7 +221,7 @@ public function applySize(ImageInterface $image, $size)
 
     public function applyRotation(ImageInterface $image, $rotation, $format)
     {
-        if (false !== strpos($rotation, '!')) {
+        if (str_contains($rotation, '!')) {
             $image = $image->flipHorizontally();
         }
 
@@ -266,7 +266,7 @@ public function applyQuality(ImageInterface $image, $quality)
     }
 
     public function getImageFileName(
-        LibraryImage $image = null
+        ?LibraryImage $image = null,
     ) {
         if (null == $image) {
             return null;
@@ -288,7 +288,7 @@ public function getImageFileName(
         return $fileName;
     }
 
-    public function getImageModel($identifier, $type = "library", $imageId = null)
+    public function getImageModel($identifier, $type = 'library', $imageId = null)
     {
         $query = LibraryImageQuery::create();
 
@@ -306,7 +306,6 @@ public function getImageModel($identifier, $type = "library", $imageId = null)
         return $query->find();
     }
 
-
     public function openImage($identifier)
     {
         $imageModel = LibraryImageQuery::create()->filterById($identifier)->findOne();
@@ -379,7 +378,7 @@ public function getImageDataWithType(array $params): array
                 'description' => $image?->getDescription(),
                 'chapo' => $image?->getChapo(),
                 'postscriptum' => $image?->getPostscriptum(),
-                'id' => $image?->getId()
+                'id' => $image?->getId(),
             ];
         }
 
@@ -390,7 +389,7 @@ private function createSearchQuery($source, $sourceId, $imageId = null)
     {
         $queryClass = 'Thelia\\Model\\'.ucfirst($source).'ImageQuery';
 
-        $filterMethod = sprintf('filterBy%sId', $imageId ? '' : $source);
+        $filterMethod = \sprintf('filterBy%sId', $imageId ? '' : $source);
         // xxxImageQuery::create()
         $method = new \ReflectionMethod($queryClass, 'create');
         $search = $method->invoke(null); // Static !
@@ -402,10 +401,10 @@ private function createSearchQuery($source, $sourceId, $imageId = null)
         return $search;
     }
 
-    public function getProcessedImages(array $imagesData, array | string  $filters): array
+    public function getProcessedImages(array $imagesData, array|string $filters, ?string $placeholder): array
     {
         $processedImages = [];
-        if (!is_array($filters)) {
+        if (!\is_array($filters)) {
             $filters = ['default' => $filters];
         }
 
@@ -419,7 +418,7 @@ public function getProcessedImages(array $imagesData, array | string  $filters):
                     );
                     $sources[] = [
                         'breakpoint' => $breakpoint,
-                        'url' => $url
+                        'url' => $url,
                     ];
                 }
             }
@@ -429,20 +428,21 @@ public function getProcessedImages(array $imagesData, array | string  $filters):
             ];
         }
 
-        return $processedImages;
+        return !empty($processedImages) ? $processedImages : $this->getFallbackImg($placeholder);
     }
 
     protected function getLibraryImageData($imageQuery)
     {
         $locale = $this->requestStack?->getCurrentRequest()?->getSession()?->getLang()->getLocale();
 
         $images = [];
+
         foreach ($imageQuery as $image) {
             $image->setlocale($locale);
             $images[] = [
                 'path' => $this->getImageFileName($image),
                 'title' => $image->getTitle(),
-                'id' => $image->getTitle()
+                'id' => $image->getTitle(),
             ];
         }
 
@@ -453,12 +453,27 @@ public function getImages(array $params): array
     {
         if ($params['source_type'] === self::LIBRARY || $params['source_type'] === self::PAGE) {
             $imageModel = $this->getImageModel($params['source_id'] ?? null, $params['source_type'], $params['img_id'] ?? null);
-
             $imagesData = $imageModel ? $this->getLibraryImageData($imageModel) : [];
         } else {
             $imagesData = $this->getImageDataWithType($params);
         }
-        return $this->getProcessedImages($imagesData, $params['filters']);
 
+        return $this->getProcessedImages($imagesData, $params['filters'], $params['placeholder'] ?? null);
+    }
+
+
+    private function getFallbackImg(?string $placeholder): array
+    {
+        return [
+            [
+               'sources' => [
+                   [
+                       'breakpoint' => 'default',
+                       'url' => $placeholder ?? ''
+                   ]
+               ],
+               'data' => []
+            ]
+           ];
     }
 }