From 3b9cb5f882071710e39a7309f93688fd5b90c5cd Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 22 Mar 2024 13:05:20 +0100 Subject: [PATCH 1/2] [Doc] Misc fixes in some doc pages --- Resources/doc/cache-resolver/aws_s3.rst | 2 +- Resources/doc/filters/general.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/doc/cache-resolver/aws_s3.rst b/Resources/doc/cache-resolver/aws_s3.rst index b9f99f57..a8748db8 100644 --- a/Resources/doc/cache-resolver/aws_s3.rst +++ b/Resources/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 `. .. _`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/Resources/doc/filters/general.rst b/Resources/doc/filters/general.rst index 048d2c2b..36d43aad 100644 --- a/Resources/doc/filters/general.rst +++ b/Resources/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: From d68559aa80638533ad5a2a40363e25411958acdc Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Sat, 23 Mar 2024 09:02:22 +0100 Subject: [PATCH 2/2] adjust indentations to latest php-cs-fixer --- Imagine/Cache/Resolver/CacheResolver.php | 6 +++--- Imagine/Cache/Resolver/PsrCacheResolver.php | 6 +++--- Tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php | 2 +- Tests/Service/FilterServiceTest.php | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Imagine/Cache/Resolver/CacheResolver.php b/Imagine/Cache/Resolver/CacheResolver.php index 9b72e271..b851900c 100644 --- a/Imagine/Cache/Resolver/CacheResolver.php +++ b/Imagine/Cache/Resolver/CacheResolver.php @@ -228,9 +228,9 @@ protected function configureOptions(OptionsResolver $resolver) ]); $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/Imagine/Cache/Resolver/PsrCacheResolver.php b/Imagine/Cache/Resolver/PsrCacheResolver.php index 392c3817..c34b61f5 100644 --- a/Imagine/Cache/Resolver/PsrCacheResolver.php +++ b/Imagine/Cache/Resolver/PsrCacheResolver.php @@ -239,9 +239,9 @@ private function configureOptions(OptionsResolver $resolver) ]); $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 index 653cda29..f54a9f62 100644 --- a/Tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php +++ b/Tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php @@ -59,7 +59,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 index 1c019cd0..1b3b8fd6 100644 --- a/Tests/Service/FilterServiceTest.php +++ b/Tests/Service/FilterServiceTest.php @@ -579,8 +579,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 {