From 340d4dff67f3b62e56c1e575f70631dfc8731c89 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Sun, 3 Mar 2024 08:39:07 +0100 Subject: [PATCH 1/3] do not specify branch name for clients to test --- .github/workflows/ci.yml | 18 ++++++++++-------- README.md | 6 +++--- composer.json | 7 ++++--- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfd4d27..1e083d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,16 @@ 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: "Guzzle5", php: '7.4', package: "php-http/guzzle5-adapter php-http/message-factory" } + - { suite: "Guzzle6", php: '7.4', package: "php-http/guzzle6-adapter 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 index d1c6caa..19dd4bf 100644 --- 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 index 15f85ac..60ffbc0 100644 --- a/composer.json +++ b/composer.json @@ -15,10 +15,11 @@ } ], "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": { From 7dbe19cc3de6f2eee42a746a31070852a0aed0a4 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 5 Mar 2024 09:37:17 +0100 Subject: [PATCH 2/3] remove builds for abandoned adapters --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e083d5..4c3515a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,6 @@ jobs: batch: - { 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: "Guzzle5", php: '7.4', package: "php-http/guzzle5-adapter php-http/message-factory" } - - { suite: "Guzzle6", php: '7.4', package: "php-http/guzzle6-adapter 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" } From 5857666b3d561d81f79833ea593d07acf3b3327a Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 5 Mar 2024 09:56:21 +0100 Subject: [PATCH 3/3] add nyholm psr7 for buzz tests --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 60ffbc0..57e1fe3 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "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": {