From b54887d01a50b9c8eb089d9ba92a512b99f1aa65 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 28 Mar 2024 09:27:07 +0100 Subject: [PATCH] use fixed discovery instead of declaring conflict with old guzzlehttp/psr --- .github/workflows/ci.yml | 4 ++++ composer.json | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54af1ca1..e9e0d5b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,9 @@ jobs: sh ${GITHUB_WORKSPACE}/.github/workflows/setup-nginx.sh - name: Install composer dependencies + # Lowest discovery can end up with an incompatible psr7 implementation, see discussion in https://github.com/FriendsOfSymfony/FOSHttpCache/pull/567 run: | + composer require --no-update --no-interaction "guzzlehttp/psr7:2.*" composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress - name: Execute tests @@ -133,6 +135,7 @@ jobs: - name: Install composer dependencies run: | + composer require --no-update --no-interaction "guzzlehttp/psr7:2.*" composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress - name: Execute tests @@ -169,6 +172,7 @@ jobs: - name: Install composer dependencies run: | + composer require --no-update --no-interaction "guzzlehttp/psr7:2.*" composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress - name: Execute tests diff --git a/composer.json b/composer.json index cf648e03..2210731c 100644 --- a/composer.json +++ b/composer.json @@ -40,8 +40,7 @@ "phpunit/phpunit": "^10.5" }, "conflict": { - "toflar/psr6-symfony-http-cache-store": "<2.2.1", - "guzzlehttp/psr7": "<2" + "toflar/psr6-symfony-http-cache-store": "<2.2.1" }, "suggest": { "friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",