Skip to content

Commit

Permalink
Merge pull request #1577 from liip/2-to-3
Browse files Browse the repository at this point in the history
2 to 3
  • Loading branch information
dbu authored Mar 23, 2024
2 parents eea41d8 + 7a267b5 commit 0085c1d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doc/cache-resolver/aws_s3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/filters/general.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
6 changes: 3 additions & 3 deletions src/Imagine/Cache/Resolver/PsrCacheResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testItShouldPreserveRatio(): void
->willReturn($image);

$loader->load($image, [
'to' => 1.0,
'to' => 1.0,
]);
}

Expand Down
4 changes: 2 additions & 2 deletions tests/Service/FilterServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0085c1d

Please sign in to comment.