Merge pull request #11 from thelia-modules/feature/format-in-loop

add format param in image loop
thelia-modules · Feb 20, 2024 · 4505577 · 4505577
2 parents d9c37bc + 9b9215c
commit 4505577
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -20,7 +20,7 @@
  <language>en_US</language>
  <language>fr_FR</language>
  </languages>
- <version>1.2.3</version>
+ <version>1.2.4</version>
  <authors>
  <author>
  <name></name>

diff --git a/Loop/LibraryImage.php b/Loop/LibraryImage.php
@@ -49,6 +49,7 @@ protected function getArgDefinitions()
  Argument::createBooleanTypeArgument('only_visible'),
  Argument::createIntTypeArgument('width'),
  Argument::createIntTypeArgument('height'),
+ Argument::createAlphaNumStringTypeArgument('format'),
  new Argument(
  'resize_mode',
  new TypeCollection(
@@ -113,7 +114,8 @@ public function parseResults(LoopResult $loopResult)
  $imageUrl = $libraryImageService->getImagePublicUrl(
  $image,
  $this->getWidth(),
- $this->getHeight()
+ $this->getHeight(),
+ $this->getFormat()
  );
 
  $row = new LoopResultRow($image);

diff --git a/Service/LibraryImageService.php b/Service/LibraryImageService.php
@@ -97,15 +97,16 @@ public function deleteImage(
  public function getImagePublicUrl(
  LibraryImage $image = null,
  $width = null,
- $height = null
+ $height = null,
+ $format = null
  ) {
  if (null == $image) {
  return null;
  }
 
  $fileName = $this->imageService->getImageFileName($image);
 
- $format = pathinfo($fileName, \PATHINFO_EXTENSION);
+ $format = $format ?? pathinfo($fileName, \PATHINFO_EXTENSION);
  $size = 'max';
  if ($width || $height) {
  $size = $width.','.$height;