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

liip · Mar 23, 2024 · 7a267b5 · 7a267b5
2 parents eea41d8 + d68559a
commit 7a267b5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/doc/cache-resolver/aws_s3.rst b/doc/cache-resolver/aws_s3.rst
@@ -307,7 +307,7 @@ You can also use the constructor of the resolver to directly inject multiple opt
             tags:
                 - { name: "liip_imagine.cache.resolver", resolver: "aws_s3_resolver" }
 
-You can find an example with private ACL and signed url on the :doc:`events chapter <../events.rst>`.
+You can find an example with private ACL and signed url on the :doc:`events chapter </events>`.
 
 .. _`aws-sdk-php`: https://github.com/amazonwebservices/aws-sdk-for-php
 .. _`S3 SDK documentation`: https://docs.aws.amazon.com/aws-sdk-php/latest/class-Aws.S3.S3Client.html#_putObject

diff --git a/doc/filters/general.rst b/doc/filters/general.rst
@@ -197,13 +197,13 @@ Resample Options
 
 **filter:** ``string``
     Sets the optional filter to use during the resampling operation. It must be a string resolvable
-    as a constant from `Imagine\Image\ImageInterface`_ (you may omit the ``FILTER_`` prefix)
+    as a constant from ``Imagine\Image\ImageInterface`` (you may omit the ``FILTER_`` prefix)
     or a valid fully qualified constant. By default it is set to ``FILTER_UNDEFINED``.
 
 **tmp_dir:** ``string``
     Sets the optional temporary work directory. This filter requires a temporary location to save
     out and read back in the image binary, as these operations are requires to resample an image.
-    By default, it is set to the value of the `sys_get_temp_dir()`_ function.
+    By default, it is set to the value of the ``sys_get_temp_dir()`` function.
 
 .. _filter-strip:
 

diff --git a/src/Imagine/Cache/Resolver/PsrCacheResolver.php b/src/Imagine/Cache/Resolver/PsrCacheResolver.php
@@ -229,9 +229,9 @@ private function configureOptions(OptionsResolver $resolver): void
         ]);
 
         $allowedTypesList = [
-          'global_prefix' => 'string',
-          'prefix' => 'string',
-          'index_key' => 'string',
+            'global_prefix' => 'string',
+            'prefix' => 'string',
+            'index_key' => 'string',
         ];
 
         foreach ($allowedTypesList as $option => $allowedTypes) {

diff --git a/tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php b/tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php
@@ -61,7 +61,7 @@ public function testItShouldPreserveRatio(): void
             ->willReturn($image);
 
         $loader->load($image, [
-          'to' => 1.0,
+            'to' => 1.0,
         ]);
     }
 

diff --git a/tests/Service/FilterServiceTest.php b/tests/Service/FilterServiceTest.php
@@ -547,8 +547,8 @@ private function expectFilterManagerApplyFilter(bool $webpGenerate, BinaryInterf
                 ->withConsecutive(
                     [$binary, self::FILTER, $runtimeOptions],
                     [$binary, self::FILTER, [
-                            'format' => 'webp',
-                        ] + self::WEBP_OPTIONS + $runtimeOptions]
+                        'format' => 'webp',
+                    ] + self::WEBP_OPTIONS + $runtimeOptions]
                 )
                 ->willReturn($binary);
         } else {