Upgrade to CakePHP 3.4 (#6)

* Update client for CakePHP 3.4.

* Don't use dev packages.

* Fix code styling issue.

* Don't test on PHP 5.5 and min. PHP version supported by CakePHP is 5.6

* Bump CakePHP version to 3.4.12.

* Bump PHP version to 5.6 since thats the min. version Cake 3.4 supports.

* Revert to "yoda" syntax.

Author: ADmad

.travis.yml

@@ -7,7 +7,6 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
@@ -26,7 +25,7 @@ matrix:
           dist: trusty
     fast_finish: true
     include:
-        - php: 5.5
+        - php: 5.6
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
         - php: hhvm
           dist: trusty

composer.json

@@ -11,10 +11,10 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "php-http/httplug": "^1.0",
         "php-http/discovery": "^1.0",
-        "cakephp/cakephp": "^3.1"
+        "cakephp/cakephp": "^3.4.12"
     },
     "require-dev": {
         "php-http/client-integration-tests": "^0.6"
@@ -40,7 +40,5 @@
         "branch-alias": {
             "dev-master": "0.1-dev"
         }
-    },
-    "prefer-stable": true,
-    "minimum-stability": "dev"
+    }
 }

src/Client.php

@@ -3,16 +3,16 @@
 namespace Http\Adapter\Cake;
 
 use Cake\Core\Exception\Exception;
-use Cake\Network\Http\Client as CakeClient;
-use Cake\Network\Http\Request;
+use Cake\Http\Client as CakeClient;
+use Cake\Http\Client\Request;
 use Http\Client\Exception\NetworkException;
 use Http\Client\HttpClient;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\ResponseFactory;
 use Psr\Http\Message\RequestInterface;
 
 /**
- * Client compatible with PSR7 and Httplug interfaces, using a cackephp client.
+ * Client compatible with PSR7 and Httplug interfaces, using a CakePHP client.
  */
 class Client implements HttpClient
 {
@@ -37,32 +37,26 @@ public function __construct(CakeClient $client = null, ResponseFactory $response
      */
     public function sendRequest(RequestInterface $request)
     {
-        $cakeRequest = new Request();
-        $cakeRequest->method($request->getMethod());
-        $cakeRequest->url((string) $request->getUri());
-        $cakeRequest->version($request->getProtocolVersion());
-        $cakeRequest->body($request->getBody()->getContents());
+        $cakeRequest = new Request(
+            (string) $request->getUri(),
+            $request->getMethod(),
+            $request->getHeaders()
+        );
 
-        foreach ($request->getHeaders() as $header => $values) {
-            $cakeRequest->header($header, $request->getHeaderLine($header));
-        }
+        $cakeRequest = $cakeRequest
+            ->withProtocolVersion($request->getProtocolVersion())
+            ->withBody($request->getBody());
 
         if (null === $cakeRequest->header('Content-Type')) {
             $cakeRequest->header('Content-Type', 'application/x-www-form-urlencoded');
         }
 
         try {
-            $cakeResponse = $this->client->send($cakeRequest, $this->client->config());
+            $response = $this->client->send($cakeRequest, $this->client->config());
         } catch (Exception $exception) {
             throw new NetworkException('Failed to send request', $request, $exception);
         }
 
-        return $this->responseFactory->createResponse(
-            $cakeResponse->statusCode(),
-            null,
-            $cakeResponse->headers(),
-            $cakeResponse->body(),
-            $cakeResponse->version()
-        );
+        return $response;
     }
 }