Skip to content

Commit 15f59b2

Browse files
authored
Merge pull request #59 from php-http/fix-dependencies
do not specify branch name for clients to test
2 parents 42ca4c5 + 5857666 commit 15f59b2

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.github/workflows/ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
max-parallel: 10
1616
matrix:
1717
batch:
18-
- { suite: "curl", php: '7.4', package: "php-http/curl-client:dev-master laminas/laminas-diactoros" }
19-
- { suite: "Socket", php: '7.4', package: "php-http/socket-client:dev-master php-http/client-common" }
20-
- { suite: "Guzzle5", php: '7.1', package: "php-http/guzzle5-adapter:dev-master" }
21-
- { suite: "Guzzle6", php: '7.4', package: "php-http/guzzle6-adapter:dev-master" }
22-
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle:dev-master" }
23-
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle:dev-master phpunit/phpunit:^8.5.8" }
24-
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle:dev-master phpunit/phpunit:^7.5.20" }
25-
- { suite: "Buzz", php: '7.4', package: "kriswallsmith/buzz:dev-master" }
18+
- { suite: "curl", php: '7.4', package: "php-http/curl-client laminas/laminas-diactoros php-http/message-factory" }
19+
- { suite: "Socket", php: '7.4', package: "php-http/socket-client php-http/client-common php-http/message-factory" }
20+
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle php-http/message-factory" }
21+
- { suite: "Guzzle", php: '8.3', package: "guzzlehttp/guzzle php-http/message-factory" }
22+
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle phpunit/phpunit:^8.5.8 php-http/message-factory" }
23+
- { suite: "Guzzle", php: '7.4', package: "guzzlehttp/guzzle phpunit/phpunit:^7.5.20 php-http/message-factory" }
24+
- { suite: "Buzz", php: '7.4', package: "kriswallsmith/buzz psr/log php-http/message-factory" }
25+
- { suite: "Buzz", php: '8.3', package: "kriswallsmith/buzz psr/log php-http/message-factory" }
2626

2727
steps:
2828
- name: Set up PHP

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Via Composer
1313

1414
```bash
15-
$ composer require php-http/client-integration-tests
15+
composer require php-http/client-integration-tests
1616
```
1717

1818

@@ -26,13 +26,13 @@ This package should not be used on its own. It provides integration tests for HT
2626
Start the HTTP Test server:
2727

2828
```bash
29-
$ vendor/bin/http_test_server
29+
vendor/bin/http_test_server
3030
```
3131

3232
Install an adapter.
3333

3434
```bash
35-
$ composer require php-http/curl-client:dev-master laminas/laminas-diactoros
35+
composer require php-http/curl-client laminas/laminas-diactoros
3636
```
3737

3838
Run the tests.

composer.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.1 || ^8.0",
19-
"phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.11",
18+
"php": "^7.4 || ^8.0",
19+
"phpunit/phpunit": "^9.6.17",
2020
"php-http/message": "^1.0 || ^2.0",
21-
"guzzlehttp/psr7": "^1.7 || ^2.0",
21+
"php-http/message-factory": "^1.0",
22+
"guzzlehttp/psr7": "^1.9 || ^2.0",
2223
"th3n3rd/cartesian-product": "^0.3"
2324
},
2425
"suggest": {
2526
"php-http/httplug": "To test async client"
2627
},
2728
"require-dev": {
28-
"php-http/httplug": "^2.0"
29+
"php-http/httplug": "^2.0",
30+
"nyholm/psr7": "^1.8@dev"
2931
},
3032
"autoload": {
3133
"psr-4": {

0 commit comments

Comments
 (0)