Merge remote-tracking branch 'origin/2.x' into 3.x

liip · May 16, 2024 · 569e9d8 · 569e9d8
2 parents 0085c1d + fa2baa6
commit 569e9d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,8 +15,14 @@ for a given releases. Unreleased, upcoming changes will be updated here periodic
 
 # 2.x
 
+## [2.12.3](https://github.com/liip/LiipImagineBundle/tree/2.12.3)
+
+- Add alias for `Imagine\Image\ImagineInterface` to help autowiring.
+
 ## [2.12.2](https://github.com/liip/LiipImagineBundle/tree/2.12.2)
 
+- Autoconfigure tags `'liip_imagine.filter.loader`, `liip_imagine.filter.post_processor` and `liip_imagine.binary.loader`
+  and allow to specify these by class name in addition to service names ([homersimpsons](https://github.com/liip/LiipImagineBundle/pull/1486))
 - Avoid PHP 8.3 warning with default empty prefix ([simonberger](https://github.com/liip/LiipImagineBundle/pull/1568))
 
 ## [2.12.1](https://github.com/liip/LiipImagineBundle/tree/2.12.1)

diff --git a/doc/optimizations/avoid-redirects.rst b/doc/optimizations/avoid-redirects.rst
@@ -33,7 +33,7 @@ configure your webserver to route requests for missing images to Symfony.
       try_files $uri $uri/ /index.php?$query_string;
     }
 
-    location ~* .(js|jpg|jpeg|gif|png|css|tgz|gz|rar|bz2|doc|pdf|ppt|tar|wav|bmp|rtf|swf|ico|flv|txt|woff|woff2|svg)$ {
+    location ~* \.(js|jpg|jpeg|gif|png|css|tgz|gz|rar|bz2|doc|pdf|ppt|tar|wav|bmp|rtf|swf|ico|flv|txt|woff|woff2|svg)$ {
         expires 30d;
         add_header Pragma "public";
         add_header Cache-Control "public";

diff --git a/src/Resources/config/imagine.xml b/src/Resources/config/imagine.xml
@@ -181,6 +181,7 @@
         <!-- ImagineInterface instances -->
 
         <service id="liip_imagine" alias="liip_imagine.gd" />
+        <service id="Imagine\Image\ImagineInterface" alias="liip_imagine" />
 
         <service id="liip_imagine.gd" class="Imagine\Gd\Imagine" public="false">
             <call method="setMetadataReader">

diff --git a/src/Service/FilterService.php b/src/Service/FilterService.php
@@ -40,8 +40,8 @@ public function __construct(
         DataManager $dataManager,
         FilterManager $filterManager,
         CacheManager $cacheManager,
-        bool $webpGenerate,
-        array $webpOptions,
+        bool $webpGenerate = false,
+        array $webpOptions = [],
         ?LoggerInterface $logger = null
     ) {
         $this->dataManager = $dataManager;