Skip to content

Commit f72fddf

Browse files
committed
CI: Update travis matrix to test on curl-client v2.
This will blacklist the curl-client v1 installation since there is no way to detect which version is installed and adapt the Factory based on that information.
1 parent 876d2e5 commit f72fddf

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ matrix:
3838

3939
# Test with httplug 1.x clients
4040
- php: 7.2
41-
env: DEPENDENCIES="php-http/buzz-adapter:^1.0 php-http/curl-client:^1.0 php-http/guzzle6-adapter:^1.1.1 php-http/react-adapter:^0.2.1 php-http/socket-client:^1.0"
41+
env: DEPENDENCIES="php-http/buzz-adapter:^1.0 php-http/guzzle6-adapter:^1.1.1 php-http/react-adapter:^0.2.1 php-http/socket-client:^1.0"
4242

4343
# Test with httplug 2.x clients
4444
- php: 7.2
45-
env: DEPENDENCIES="php-http/guzzle6-adapter:^2.0.1"
45+
env: DEPENDENCIES="php-http/guzzle6-adapter:^2.0.1 php-http/curl-client:^2.0.0"
4646

4747
# Latest commit to master
4848
- php: 7.3

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"symfony/options-resolver": "^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1"
4343
},
4444
"conflict": {
45-
"php-http/guzzle6-adapter": "<1.1"
45+
"php-http/guzzle6-adapter": "<1.1",
46+
"php-http/curl-client": "<2.0"
4647
},
4748
"require-dev": {
4849
"guzzlehttp/psr7": "^1.0",

0 commit comments

Comments
 (0)