Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 to 3 #1577

Merged
merged 4 commits into from
Mar 23, 2024
Merged

2 to 3 #1577

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading