Skip to content

Commit 8274b1a

Browse files
committed
typo
1 parent 5fbb3da commit 8274b1a

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

.travis.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ php:
1010
- 7.1
1111

1212
env:
13-
global:
14-
- TEST_COMMAND="composer test"
15-
matrix:
16-
- PACKAGE="php-http/curl-client:dev-master" SUITE="curl"
17-
- PACKAGE="php-http/socket-client:dev-master" SUITE="Socket"
18-
- PACKAGE="php-http/guzzle5-adapter:dev-master" SUITE="Guzzle5"
19-
- PACKAGE="php-http/guzzle6-adapter:dev-master" SUITE="Guzzle6"
20-
- PACKAGE="php-http/react-adapter:dev-master" SUITE="React"
21-
- PACKAGE="php-http/buzz-adapter:dev-master" SUITE="Buzz"
13+
- SUITE="curl" PACKAGE="php-http/curl-client:dev-master zendframework/zend-diactoros"
14+
- SUITE="Socket" PACKAGE="php-http/socket-client:dev-master php-http/client-common"
15+
- SUITE="Guzzle5" PACKAGE="php-http/guzzle5-adapter:dev-master"
16+
- SUITE="Guzzle6" PACKAGE="php-http/guzzle6-adapter:dev-master"
17+
- SUITE="React" PACKAGE="php-http/react-adapter:dev-master"
18+
- SUITE="Buzz" PACKAGE="php-http/buzz-adapter:dev-master"
19+
- SUITE="CakePHP" PACKAGE="php-http/buzz-adapter:dev-master"
20+
- SUITE="Zend" PACKAGE="php-http/buzz-adapter:dev-master"
21+
22+
matrix:
23+
allow_failures:
24+
- env: SUITE="Socket" PACKAGE="php-http/socket-client:dev-master php-http/client-common"
2225

2326
branches:
2427
except:
@@ -32,7 +35,7 @@ install:
3235
- travis_retry composer update --prefer-source --no-interaction
3336

3437
before_script:
35-
- vendor/bin/http_test_server > /dev/null 2>&1 &
38+
- bin/http_test_server > /dev/null 2>&1 &
3639

3740
script:
3841
- ./vendor/bin/phpunit --testsuite ${SUITE}

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
"php-http/httplug": "^1.0",
2121
"php-http/message": "^1.0",
2222
"guzzlehttp/psr7": "^1.0",
23-
"th3n3rd/cartesian-product": "^0.3",
24-
"php-http/guzzle6-adapter": "^1.1"
23+
"th3n3rd/cartesian-product": "^0.3"
2524
},
2625
"autoload": {
2726
"psr-4": {
@@ -30,12 +29,14 @@
3029
},
3130
"autoload-dev": {
3231
"psr-4": {
33-
"Http\\Adapter\\Curl\\Tests\\": "vendor/php-http/curl-client/tests/",
34-
"Http\\Adapter\\Socket\\Tests\\": "vendor/php-http/socket-client/tests/",
32+
"Http\\Client\\Curl\\Tests\\": "vendor/php-http/curl-client/tests/",
33+
"Http\\Client\\Socket\\Tests\\": "vendor/php-http/socket-client/tests/",
3534
"Http\\Adapter\\Guzzle5\\Tests\\": "vendor/php-http/guzzle5-adapter/tests/",
3635
"Http\\Adapter\\Guzzle6\\Tests\\": "vendor/php-http/guzzle6-adapter/tests/",
3736
"Http\\Adapter\\Buzz\\Tests\\": "vendor/php-http/buzz-adapter/tests/",
38-
"Http\\Adapter\\React\\Tests\\": "vendor/php-http/react-adapter/tests/"
37+
"Http\\Adapter\\React\\Tests\\": "vendor/php-http/react-adapter/tests/",
38+
"Http\\Adapter\\Cake\\Tests\\": "vendor/php-http/cachephp-adapter/tests/",
39+
"Http\\Adapter\\Zend\\Tests\\": "vendor/php-http/zend-adapter/tests/"
3940
}
4041
},
4142
"bin": [

phpunit.xml.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
<testsuite name="React">
2020
<directory>vendor/php-http/react-adapter/tests</directory>
2121
</testsuite>
22+
<testsuite name="CakePHP">
23+
<directory>vendor/php-http/cakephp-adapter/tests</directory>
24+
</testsuite>
25+
<testsuite name="Zend">
26+
<directory>vendor/php-http/zend-adapter/tests</directory>
27+
</testsuite>
2228
</testsuites>
2329
<php>
2430
<server name="TEST_SERVER" value="http://127.0.0.1:10000/server.php" />

0 commit comments

Comments
 (0)