Merge pull request #59 from php-http/fix-dependencies

do not specify branch name for clients to test
php-http · Mar 5, 2024 · 15f59b2 · 15f59b2
2 parents 42ca4c5 + 5857666
commit 15f59b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
       max-parallel: 10
       matrix:
         batch:
-          - { suite: "curl",    php: '7.4', package: "php-http/curl-client:dev-master laminas/laminas-diactoros" }
-          - { suite: "Socket",  php: '7.4', package: "php-http/socket-client:dev-master php-http/client-common" }
-          - { suite: "Guzzle5", php: '7.1', package: "php-http/guzzle5-adapter:dev-master" }
-          - { suite: "Guzzle6", php: '7.4', package: "php-http/guzzle6-adapter:dev-master" }
-          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle:dev-master" }
-          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle:dev-master phpunit/phpunit:^8.5.8" }
-          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle:dev-master phpunit/phpunit:^7.5.20" }
-          - { suite: "Buzz",    php: '7.4', package: "kriswallsmith/buzz:dev-master" }
+          - { suite: "curl",    php: '7.4', package: "php-http/curl-client laminas/laminas-diactoros php-http/message-factory" }
+          - { suite: "Socket",  php: '7.4', package: "php-http/socket-client php-http/client-common php-http/message-factory" }
+          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle php-http/message-factory" }
+          - { suite: "Guzzle",  php: '8.3', package: "guzzlehttp/guzzle php-http/message-factory" }
+          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle phpunit/phpunit:^8.5.8 php-http/message-factory" }
+          - { suite: "Guzzle",  php: '7.4', package: "guzzlehttp/guzzle phpunit/phpunit:^7.5.20 php-http/message-factory" }
+          - { suite: "Buzz",    php: '7.4', package: "kriswallsmith/buzz psr/log php-http/message-factory" }
+          - { suite: "Buzz",    php: '8.3', package: "kriswallsmith/buzz psr/log php-http/message-factory" }
 
     steps:
       - name: Set up PHP

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 Via Composer
 
 ```bash
-$ composer require php-http/client-integration-tests
+composer require php-http/client-integration-tests
 ```
 
 
@@ -26,13 +26,13 @@ This package should not be used on its own. It provides integration tests for HT
 Start the HTTP Test server:
 
 ```bash
-$ vendor/bin/http_test_server
+vendor/bin/http_test_server
 ```
 
 Install an adapter.
 
 ```bash
-$ composer require php-http/curl-client:dev-master laminas/laminas-diactoros
+composer require php-http/curl-client laminas/laminas-diactoros
 ```
 
 Run the tests.

diff --git a/composer.json b/composer.json
@@ -15,17 +15,19 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0",
-        "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.11",
+        "php": "^7.4 || ^8.0",
+        "phpunit/phpunit": "^9.6.17",
         "php-http/message": "^1.0 || ^2.0",
-        "guzzlehttp/psr7": "^1.7 || ^2.0",
+        "php-http/message-factory": "^1.0",
+        "guzzlehttp/psr7": "^1.9 || ^2.0",
         "th3n3rd/cartesian-product": "^0.3"
     },
     "suggest": {
         "php-http/httplug": "To test async client"
     },
     "require-dev": {
-        "php-http/httplug": "^2.0"
+        "php-http/httplug": "^2.0",
+        "nyholm/psr7": "^1.8@dev"
     },
     "autoload": {
         "psr-4": {