From 52f70e5eae38c07bd0fbf69e51990026a4ca4f91 Mon Sep 17 00:00:00 2001 From: Jan Adams Date: Sun, 1 Mar 2026 13:10:30 +0100 Subject: [PATCH 1/2] Add support for FOSHttpCache(Bundle) v3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The adapter API (invalidateTags, addTags, CacheManager, service IDs) is identical in v3 — no code changes are needed. Pimcore 10 + Symfony 5.4 installs continue to use v2 automatically. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/tests.yaml | 6 +++--- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9337e47..78b1313 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -39,12 +39,12 @@ jobs: matrix: include: - php-version: "8.1" - dependencies: "lowest" # Pimcore 10.6.0 + dependencies: "lowest" # Pimcore 10.6.0, Symfony 5.4, FOSHttpCacheBundle 2.* - php-version: "8.1" - dependencies: "highest" # Pimcore 11.* + dependencies: "highest" # Pimcore 11.*, Symfony 6.4, FOSHttpCacheBundle 3.* tests: --fail-on-risky - php-version: "8.2" - dependencies: "highest" # Pimcore 11.* + dependencies: "highest" # Pimcore 11.*, Symfony 6.4, FOSHttpCacheBundle 3.* tests: --fail-on-risky steps: diff --git a/composer.json b/composer.json index e81eafc..d376716 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ ], "require": { "php": "~8.1.0 || ~8.2.0", - "friendsofsymfony/http-cache": "^2.16", - "friendsofsymfony/http-cache-bundle": "^2.17", + "friendsofsymfony/http-cache": "^2.16 || ^3.0", + "friendsofsymfony/http-cache-bundle": "^2.17 || ^3.0", "pimcore/pimcore": "^10.6 || ^11.2", "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/config": "^5.4 || ^6.4", From 95c48b3914b93ed72e8c6b048693c70727e24b63 Mon Sep 17 00:00:00 2001 From: Jan Adams Date: Sun, 1 Mar 2026 13:15:28 +0100 Subject: [PATCH 2/2] Add CI matrix entry for FOSHttpCacheBundle 2.* on Symfony 6.4 Explicitly tests the combination of FOSHttpCacheBundle v2 with Symfony 6.4 to catch regressions in that configuration, which was previously untested. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/tests.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 78b1313..e9f58cb 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -43,6 +43,10 @@ jobs: - php-version: "8.1" dependencies: "highest" # Pimcore 11.*, Symfony 6.4, FOSHttpCacheBundle 3.* tests: --fail-on-risky + - php-version: "8.2" + dependencies: "highest" # Pimcore 11.*, Symfony 6.4, FOSHttpCacheBundle 2.* + composer-options: "--with=friendsofsymfony/http-cache:^2.16 --with=friendsofsymfony/http-cache-bundle:^2.17" + tests: --fail-on-risky - php-version: "8.2" dependencies: "highest" # Pimcore 11.*, Symfony 6.4, FOSHttpCacheBundle 3.* tests: --fail-on-risky