typo

Author: Nyholm

.travis.yml

@@ -10,15 +10,18 @@ php:
     - 7.1
 
 env:
-    global:
-        - TEST_COMMAND="composer test"
-    matrix:
-        - PACKAGE="php-http/curl-client:dev-master" SUITE="curl"
-        - PACKAGE="php-http/socket-client:dev-master" SUITE="Socket"
-        - PACKAGE="php-http/guzzle5-adapter:dev-master" SUITE="Guzzle5"
-        - PACKAGE="php-http/guzzle6-adapter:dev-master" SUITE="Guzzle6"
-        - PACKAGE="php-http/react-adapter:dev-master" SUITE="React"
-        - PACKAGE="php-http/buzz-adapter:dev-master" SUITE="Buzz"
+    - SUITE="curl" PACKAGE="php-http/curl-client:dev-master zendframework/zend-diactoros"
+    - SUITE="Socket" PACKAGE="php-http/socket-client:dev-master php-http/client-common"
+    - SUITE="Guzzle5" PACKAGE="php-http/guzzle5-adapter:dev-master"
+    - SUITE="Guzzle6" PACKAGE="php-http/guzzle6-adapter:dev-master"
+    - SUITE="React" PACKAGE="php-http/react-adapter:dev-master"
+    - SUITE="Buzz" PACKAGE="php-http/buzz-adapter:dev-master"
+    - SUITE="CakePHP" PACKAGE="php-http/buzz-adapter:dev-master"
+    - SUITE="Zend" PACKAGE="php-http/buzz-adapter:dev-master"
+
+matrix:
+    allow_failures:
+        - env: SUITE="Socket" PACKAGE="php-http/socket-client:dev-master php-http/client-common"
 
 branches:
     except:
@@ -32,7 +35,7 @@ install:
     - travis_retry composer update --prefer-source --no-interaction
 
 before_script:
-    - vendor/bin/http_test_server > /dev/null 2>&1 &
+    - bin/http_test_server > /dev/null 2>&1 &
 
 script:
     - ./vendor/bin/phpunit --testsuite ${SUITE}

composer.json

@@ -20,8 +20,7 @@
         "php-http/httplug": "^1.0",
         "php-http/message": "^1.0",
         "guzzlehttp/psr7": "^1.0",
-        "th3n3rd/cartesian-product": "^0.3",
-        "php-http/guzzle6-adapter": "^1.1"
+        "th3n3rd/cartesian-product": "^0.3"
     },
     "autoload": {
         "psr-4": {
@@ -30,12 +29,14 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Http\\Adapter\\Curl\\Tests\\": "vendor/php-http/curl-client/tests/",
-            "Http\\Adapter\\Socket\\Tests\\": "vendor/php-http/socket-client/tests/",
+            "Http\\Client\\Curl\\Tests\\": "vendor/php-http/curl-client/tests/",
+            "Http\\Client\\Socket\\Tests\\": "vendor/php-http/socket-client/tests/",
             "Http\\Adapter\\Guzzle5\\Tests\\": "vendor/php-http/guzzle5-adapter/tests/",
             "Http\\Adapter\\Guzzle6\\Tests\\": "vendor/php-http/guzzle6-adapter/tests/",
             "Http\\Adapter\\Buzz\\Tests\\": "vendor/php-http/buzz-adapter/tests/",
-            "Http\\Adapter\\React\\Tests\\": "vendor/php-http/react-adapter/tests/"
+            "Http\\Adapter\\React\\Tests\\": "vendor/php-http/react-adapter/tests/",
+            "Http\\Adapter\\Cake\\Tests\\": "vendor/php-http/cachephp-adapter/tests/",
+            "Http\\Adapter\\Zend\\Tests\\": "vendor/php-http/zend-adapter/tests/"
         }
     },
     "bin": [

phpunit.xml.dist

@@ -19,6 +19,12 @@
         <testsuite name="React">
             <directory>vendor/php-http/react-adapter/tests</directory>
         </testsuite>
+        <testsuite name="CakePHP">
+            <directory>vendor/php-http/cakephp-adapter/tests</directory>
+        </testsuite>
+        <testsuite name="Zend">
+            <directory>vendor/php-http/zend-adapter/tests</directory>
+        </testsuite>
     </testsuites>
     <php>
         <server name="TEST_SERVER" value="http://127.0.0.1:10000/server.php" />