Skip to content

Commit 064ab07

Browse files
authored
Merge pull request #567 from FriendsOfSymfony/correct-setup
use fixed discovery instead of declaring conflict with old guzzlehttp…
2 parents 24a47d5 + b54887d commit 064ab07

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ jobs:
9696
sh ${GITHUB_WORKSPACE}/.github/workflows/setup-nginx.sh
9797
9898
- name: Install composer dependencies
99+
# Lowest discovery can end up with an incompatible psr7 implementation, see discussion in https://github.com/FriendsOfSymfony/FOSHttpCache/pull/567
99100
run: |
101+
composer require --no-update --no-interaction "guzzlehttp/psr7:2.*"
100102
composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
101103
102104
- name: Execute tests
@@ -133,6 +135,7 @@ jobs:
133135
134136
- name: Install composer dependencies
135137
run: |
138+
composer require --no-update --no-interaction "guzzlehttp/psr7:2.*"
136139
composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
137140
138141
- name: Execute tests
@@ -169,6 +172,7 @@ jobs:
169172
170173
- name: Install composer dependencies
171174
run: |
175+
composer require --no-update --no-interaction "guzzlehttp/psr7:2.*"
172176
composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
173177
174178
- name: Execute tests

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
"phpunit/phpunit": "^10.5"
4141
},
4242
"conflict": {
43-
"toflar/psr6-symfony-http-cache-store": "<2.2.1",
44-
"guzzlehttp/psr7": "<2"
43+
"toflar/psr6-symfony-http-cache-store": "<2.2.1"
4544
},
4645
"suggest": {
4746
"friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",

0 commit comments

Comments
 (0)