use fixed discovery instead of declaring conflict with old guzzlehttp…

…/psr
FriendsOfSymfony · Mar 28, 2024 · c1e0add · c1e0add
1 parent b36ddb5
commit c1e0add
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -25,24 +25,23 @@
         "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"
     },
     "require-dev": {
         "mockery/mockery": "^1.6.0",
         "monolog/monolog": "^1.0",
-        "php-http/guzzle7-adapter": "^0.1.1",
+        "php-http/guzzle7-adapter": "^1",
         "php-http/mock-client": "^1.6.0",
         "symfony/process": "^6.4|| ^7.0",
         "symfony/http-kernel": "^6.4|| ^7.0",
         "phpunit/phpunit": "^10.5"
     },
     "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",