merge 2.x up to 3.x

.github/workflows/php-cs-fixer.yml

@@ -10,10 +10,10 @@ on:
 
 jobs:
   php-cs-fixer:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/phpstan.yml

@@ -10,10 +10,10 @@ on:
 
 jobs:
   phpstan:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,5 +27,8 @@ jobs:
       - name: Add vips
         run: composer require rokka/imagine-vips
 
+      - name: Add asset mapper
+        run: composer require symfony/asset-mapper
+
       - name: Run PHPStan
         run: vendor/bin/phpstan analyze

.github/workflows/phpunit.yml

@@ -11,52 +11,44 @@ on:
 jobs:
   phpunit:
     name: "PHP ${{ matrix.php }} + ${{ matrix.dependencies }} dependencies + Symfony ${{ matrix.symfony }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         php: ['8.1', '8.2', '8.3']
         dependencies: [highest]
         symfony: ['*']
-        stability: ['stable']
         include:
           # Minimum supported dependencies with the oldest supported PHP version
           - php: '8.1'
             dependencies: lowest
             symfony: '*'
-            stability: 'stable'
 
           # Minimum supported dependencies with the latest supported PHP version
-          - php: '8.3'
+          - php: '8.5'
             dependencies: lowest
             symfony: '*'
-            stability: 'stable'
 
           # Test each supported Symfony version with the lowest supported PHP version
           - php: '8.1'
             dependencies: highest
             symfony: '6.4.*'
-            stability: 'stable'
 
           - php: '8.2'
             dependencies: highest
             symfony: '7.0.*'
-            stability: 'stable'
 
           - php: '8.3'
             dependencies: highest
             symfony: '7.0.*'
-            stability: 'stable'
 
-          # Test Symfony 7.1 dev
-          - php: '8.2'
+          - php: '8.4'
             dependencies: highest
-            symfony: '7.1.*'
-            stability: 'dev'
+            symfony: '8.0.*'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure coverage driver
         id: coverage
@@ -69,8 +61,7 @@ jobs:
           coverage: ${{ steps.coverage.outputs.driver }}
           extensions: gd, imagick
 
-      - name: Require Symfony version
-        if: matrix.symfony != '*'
+      - name: Install symfony/flex
         run: |
           composer global config --no-plugins allow-plugins.symfony/flex true
           composer global require --no-interaction --no-progress symfony/flex
@@ -84,6 +75,9 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
+      - name: Lint container
+        run: ./Tests/Functional/app/bin/console lint:container
+
       - name: Cache PHPUnit
         uses: actions/cache@v3
         with:
@@ -114,7 +108,7 @@ jobs:
 
   coveralls-finish:
     needs: [phpunit]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Notify Coveralls when build is finished
         uses: coverallsapp/github-action@master

CHANGELOG.md

@@ -12,9 +12,35 @@ for a given releases. Unreleased, upcoming changes will be updated here periodic
 - Removed deprecated code and BC for old Symfony versions.
 - The response when the `filter` parameter in a resolve request is not an array is now 400 bad request, and no longer 404 not found.
 - Simplified the `ProxyResolver` to no longer do the undocumented regex replace logic on domain names (reverting [#687](https://github.com/liip/LiipImagineBundle/pull/687)).
+- Removed `use_psr_cache`, the cache now always needs to be a PSR cache and Doctrine cache is no longer supported.
 
 # 2.x
 
+## [2.17.1](https://github.com/liip/LiipImagineBundle/tree/2.17.1)
+
+- Fix for AssetMapperLoaderFactory service definition to not fail when not configured ([dbu](https://github.com/liip/LiipImagineBundle/pull/1649))
+
+## [2.17.0](https://github.com/liip/LiipImagineBundle/tree/2.17.0)
+
+- Add AssetMapperLocator to work with the asset mapper in development mode ([tito10047](https://github.com/liip/LiipImagineBundle/pull/1645))
+- Drop support for PHP 7 ([dbu](https://github.com/liip/LiipImagineBundle/pull/1646))
+
+## [2.16.0](https://github.com/liip/LiipImagineBundle/tree/2.16.0)
+
+- Compatible with Symfony 8 ([dmaicher](https://github.com/liip/LiipImagineBundle/pull/1642)) (including a bunch of PRs to change all XML configuration to PHP configuration)
+- Test with PHP 8.5 and fix deprecations([dbu](https://github.com/liip/LiipImagineBundle/pull/1644))
+- Drop support for unmaintained Symfony versions ([dmaicher](https://github.com/liip/LiipImagineBundle/pull/1639))
+
+## [2.15.0](https://github.com/liip/LiipImagineBundle/tree/2.15.0)
+
+- Refactored `Request::get()` to `Request::query::get()` to avoid deprecation with Symfony 7.4 ([dmaicher](https://github.com/liip/LiipImagineBundle/pull/1636))
+
+## [2.14.0](https://github.com/liip/LiipImagineBundle/tree/2.14.0)
+
+- Allow configuring empty ACLs on AWS S3 resolver to skip ACLs ([deguif](https://github.com/liip/LiipImagineBundle/pull/1629))
+- Add `use_psr_cache` option to AWS S3 resolver configuration in order to support PSR cache. Configuring a doctrine cache now will trigger a deprecation ([deguif](https://github.com/liip/LiipImagineBundle/pull/1630))
+- Add ability to specify a custom s3 client service in aws s3 resolver configuration ([deguif](https://github.com/liip/LiipImagineBundle/pull/1632))
+
 ## [2.13.3](https://github.com/liip/LiipImagineBundle/tree/2.13.3)
 
 - Prevent InvalidArgumentException from FileinfoMimeTypeGuesser when chain loading an image that is not a file ([revoltek-daniel](https://github.com/liip/LiipImagineBundle/pull/1614))

Tests/Functional/app/bin/console

@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+
+use Liip\ImagineBundle\Tests\Functional\app\AppKernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+$vendorDir = dirname(dirname(dirname(dirname(__DIR__)))).'/vendor';
+if (!is_dir($vendorDir)) {
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
+}
+
+if (!is_file("$vendorDir/autoload_runtime.php")) {
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
+}
+
+require_once "$vendorDir/autoload_runtime.php";
+
+return function (array $context) {
+    $kernel = new AppKernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+
+    return new Application($kernel);
+};

composer.json

@@ -25,12 +25,14 @@
         "php": "^8.1",
         "ext-mbstring": "*",
         "imagine/imagine": "^1.3.2",
-        "symfony/filesystem": "^6.4|^7.0",
-        "symfony/finder": "^6.4|^7.0",
-        "symfony/framework-bundle": "^6.4|^7.0",
-        "symfony/mime": "^6.4|^7.0",
-        "symfony/options-resolver": "^6.4|^7.0",
-        "symfony/process": "^6.4|^7.0",
+        "symfony/dependency-injection": "^6.4|^7.4|^8.0",
+        "symfony/deprecation-contracts": "^2.5 || ^3",
+        "symfony/filesystem": "^6.4|^7.3|^8.0",
+        "symfony/finder": "^6.4|^7.3|^8.0",
+        "symfony/framework-bundle": "^6.4|^7.3|^8.0",
+        "symfony/mime": "^6.4|^7.3|^8.0",
+        "symfony/options-resolver": "^6.4|^7.3|^8.0",
+        "symfony/process": "^6.4|^7.3|^8.0",
         "twig/twig": "^2.9|^3.0"
     },
     "require-dev": {
@@ -42,16 +44,16 @@
         "phpstan/phpstan-symfony": "^1.0",
         "psr/cache": "^3.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "symfony/asset": "^6.4|^7.0",
-        "symfony/browser-kit": "^6.4|^7.0",
-        "symfony/cache": "^6.4|^7.0",
-        "symfony/console": "^6.4|^7.0",
-        "symfony/dependency-injection": "^6.4|^7.0",
-        "symfony/form": "^6.4|^7.0",
-        "symfony/messenger": "^6.4|^7.0",
-        "symfony/phpunit-bridge": "^7.0.2",
-        "symfony/validator": "^6.4|^7.0",
-        "symfony/yaml": "^6.4|^7.0"
+        "symfony/asset": "^6.4|^7.3|^8.0",
+        "symfony/browser-kit": "^6.4|^7.3|^8.0",
+        "symfony/cache": "^6.4|^7.3|^8.0",
+        "symfony/console": "^6.4|^7.3|^8.0",
+        "symfony/form": "^6.4|^7.3|^8.0",
+        "symfony/messenger": "^6.4|^7.3|^8.0",
+        "symfony/phpunit-bridge": "^7.3",
+        "symfony/runtime": "^6.4|^7.3|^8.0",
+        "symfony/validator": "^6.4|^7.3|^8.0",
+        "symfony/yaml": "^6.4|^7.3|^8.0"
     },
     "suggest": {
         "ext-exif": "required to read EXIF metadata from images",
@@ -70,6 +72,9 @@
         "symfony/messenger": "If you like to process images in background"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/runtime": true
+        }
     }
 }

doc/cache-resolver/aws_s3.rst

@@ -83,6 +83,24 @@ Create Resolver from a Factory
                     region: "%amazon.s3.region%"
                     bucket: "%amazon.s3.bucket%"
 
+Create Resolver from a custom S3 client service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: yaml
+
+    # app/config/config.yml
+
+    liip_imagine:
+        resolvers:
+            aws_s3_resolver:
+                aws_s3:
+                    client_id: 'custom_aws_s3_client_service'
+                    bucket: "%amazon.s3.bucket%"
+                    get_options:
+                        Scheme: https
+                    put_options:
+                        CacheControl: "max-age=86400"
+
 Create Resolver as a Service
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -204,8 +222,11 @@ current. You just need to configure them with defined options.
               aws_s3:
                   #...
                   proxies: ["https://one.domain.com", "https://two.domain.com"]
-                  cache: true
+                  cache: 'cache_name'
+
+.. note::
 
+    The ``cache`` needs to be a PSR cache instance.
 
 If enabled both first one will be :ref:`Cache <cache-resolver-cache>`, then
 :ref:`Proxy <cache-resolver-proxy>` and after all process delegates to AwsS3 resolver.

doc/configuration.rst

@@ -77,7 +77,8 @@ There are several configuration options available:
 * ``cache`` - default cache resolver. Default value: ``web_path`` (which means
   the standard web_path resolver is used)
 * ``data_loader`` - name of a custom data loader. Default value: ``filesystem``
-  (which means the standard filesystem loader is used).
+  (which means the standard filesystem loader is used). Built-in loaders include:
+  ``filesystem``, ``chain``, ``flysystem``, ``stream``, and ``asset_mapper``.
 * ``twig.mode`` - Twig filter integration. ``none`` disables the twig filters, ``lazy`` enables
   Twig using the Twig runtime for lazy loading. The default value is ``lazy``.
   The twig filter automatically picks up the ``framework.assets.version`` configuration. You can
@@ -97,7 +98,8 @@ There are several configuration options available:
     * ``cache`` - default cache resolver. Default value: ``web_path`` (which means
       the standard web_path resolver is used)
     * ``data_loader`` - name of a custom data loader. Default value: ``filesystem``
-      (which means the standard filesystem loader is used).
+      (which means the standard filesystem loader is used). Built-in loaders include:
+      ``filesystem``, ``chain``, ``flysystem``, ``stream``, and ``asset_mapper``.
     * ``post_processors`` - sets post-processors to be applied on filtered image
       (see Post-Processors section in the :doc:`filters chapter <filters>` for details).
 * ``driver`` - one of the drivers: ``gd``, ``imagick``, ``gmagick``, ``vips``.

phpunit.xml.dist

@@ -22,6 +22,7 @@
     <ini name="intl.default_locale" value="en"/>
     <ini name="intl.error_level" value="0"/>
     <ini name="memory_limit" value="-1"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
   </php>
   <listeners>
     <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>

src/Binary/Loader/ChainLoader.php

@@ -25,7 +25,7 @@ class ChainLoader implements LoaderInterface
      */
     public function __construct(array $loaders)
     {
-        $this->loaders = array_filter($loaders, function ($loader) {
+        $this->loaders = array_filter($loaders, static function ($loader) {
             return $loader instanceof LoaderInterface;
         });
     }

src/Binary/Loader/FileSystemLoader.php

@@ -38,7 +38,7 @@ public function __construct(
     public function find($path)
     {
         $path = $this->locator->locate($path);
-        if (false === \is_file($path)) {
+        if (false === is_file($path)) {
             throw new NotLoadableException(\sprintf('Source image: "%s" is no file.', $path));
         }
         $mimeType = $this->mimeTypeGuesser->guessMimeType($path);

src/Binary/Locator/FileSystemLocator.php

@@ -101,7 +101,7 @@ private function sanitizeRootPath(string $path, bool $allowUnresolvable): ?strin
      */
     private function sanitizeAbsolutePath(string $path): string
     {
-        $roots = array_filter($this->roots, function (string $root) use ($path): bool {
+        $roots = array_filter($this->roots, static function (string $root) use ($path): bool {
             return 0 === mb_strpos($path, $root);
         });
 

src/Command/CacheCommandTrait.php

@@ -82,7 +82,7 @@ private function outputCommandHeader(): void
     private function outputCommandResult(array $images, array $filters, string $singularAction): void
     {
         if (!$this->outputMachineReadable) {
-            $wordPluralizer = function (int $count, string $singular) {
+            $wordPluralizer = static function (int $count, string $singular) {
                 return 1 === $count ? $singular : \sprintf('%ss', $singular);
             };
 

src/Component/Console/Style/ImagineStyle.php

@@ -146,6 +146,6 @@ private function compileString(string $format, array $replacements = []): string
         } catch (\ValueError $error) {
         }
 
-        throw new InvalidArgumentException(\sprintf('Invalid string format "%s" or replacements "%s".', $format, implode(', ', array_map(function ($replacement) { return var_export($replacement, true); }, $replacements))));
+        throw new InvalidArgumentException(\sprintf('Invalid string format "%s" or replacements "%s".', $format, implode(', ', array_map(static function ($replacement) { return var_export($replacement, true); }, $replacements))));
     }
 }

src/Config/Stack.php

@@ -64,7 +64,7 @@ public function getFilters(): array
     private function setFilters(array $filters): void
     {
         foreach ($filters as $filter) {
-            if (!($filter instanceof FilterInterface)) {
+            if (!$filter instanceof FilterInterface) {
                 throw new InvalidArgumentException('Unknown filter provided.');
             }
         }

src/Controller/ImagineController.php

@@ -59,7 +59,7 @@ public function __construct(
     public function filterAction(Request $request, string $path, string $filter): RedirectResponse
     {
         $path = PathHelper::urlPathToFilePath($path);
-        $resolver = $request->get('resolver');
+        $resolver = $request->query->has('resolver') ? $request->query->getString('resolver') : null;
 
         return $this->createRedirectResponse(function () use ($path, $filter, $resolver, $request) {
             return $this->filterService->getUrlOfFilteredImage(
@@ -84,7 +84,7 @@ public function filterAction(Request $request, string $path, string $filter): Re
      */
     public function filterRuntimeAction(Request $request, string $hash, string $path, string $filter): RedirectResponse
     {
-        $resolver = $request->get('resolver');
+        $resolver = $request->query->has('resolver') ? $request->query->getString('resolver') : null;
         $path = PathHelper::urlPathToFilePath($path);
         $runtimeConfig = $request->query->all('filters');