Skip to content

Commit

Permalink
use fixed discovery instead of declaring conflict with old guzzlehttp…
Browse files Browse the repository at this point in the history
…/psr
  • Loading branch information
dbu committed Mar 28, 2024
1 parent f5ad06e commit 1d93faf
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"symfony/event-dispatcher": "^6.4 || ^7.0",
"symfony/options-resolver": "^6.4 || ^7.0",
"php-http/client-common": "^1.1.0 || ^2.0",
"php-http/discovery": "^1.12",
"php-http/discovery": "dev-fix-interop-stickyness as 1.16.0",
"php-http/async-client-implementation": "^1.1.0 || ^2.0",
"psr/http-client-implementation": "^1.0 || ^2.0",
"psr/http-factory": "^1.0"
Expand All @@ -41,8 +41,7 @@
},
"conflict": {
"toflar/psr6-symfony-http-cache-store": "<2.2.1",
"phpunit/phpunit": "<10",
"guzzlehttp/psr7": "<2"
"phpunit/phpunit": "<10"
},
"suggest": {
"friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",
Expand Down

0 comments on commit 1d93faf

Please sign in to comment.