guzzle 6

Author: bart-van-amelsvoort

composer.json

@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "^5.2|^6.0"
+        "guzzlehttp/guzzle": "^6.0"
     },
     "autoload": {
         "psr-0": { "FH\\PostcodeAPI": "lib/" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }

lib/FH/PostcodeAPI/Client.php

@@ -6,8 +6,8 @@
 use GuzzleHttp\Client as HTTPClient;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\ResponseInterface;
+use GuzzleHttp\Psr7\Request;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Client library for postcodeapi.nu 2.0 web service.
@@ -16,38 +16,16 @@
  */
 class Client
 {
-    /** @var string */
     const BASE_URI = 'https://postcode-api.apiwise.nl';
 
     /**
      * @var HTTPClient
      */
     private $httpClient;
 
-    /**
-     * @param ClientInterface $httpClient
-     * @param string $apiKey Required API key for authenticating client
-     */
-    public function __construct(ClientInterface $httpClient, $apiKey)
-    {
-        $this->httpClient = $this->prepareClient($httpClient, $apiKey);
-    }
-
-    /**
-     * @param ClientInterface $client
-     * @param string $apiKey
-     *
-     * @return HTTPClient
-     */
-    private function prepareClient(ClientInterface $client, $apiKey)
+    public function __construct(ClientInterface $httpClient)
     {
-        if ($client->getDefaultOption('timeout') === null) {
-            $client->setDefaultOption('timeout', 5.0);
-        }
-
-        $client->setDefaultOption('headers/X-Api-Key', $apiKey);
-
-        return $client;
+        $this->httpClient = $httpClient;
     }
 
     /**
@@ -107,23 +85,23 @@ private function parseResponse(ResponseInterface $response)
         $out = json_decode((string) $response->getBody());
 
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new CouldNotParseResponseException('Could not parse resonse', $response);
+            throw new CouldNotParseResponseException('Could not parse repsonse', $response);
         }
 
         return $out;
     }
 
     /**
      * @param string $method
-     * @param string $path
+     * @param string $url
      * @param array $queryParams
      *
      * @return Request
      */
-    private function createHttpRequest($method, $path, array $queryParams = array())
+    private function createHttpRequest($method, $url, array $queryParams = array())
     {
-        $path = $path . (count($queryParams) > 0 ? '?' . http_build_query($queryParams) : '');
+        $url = $url . (count($queryParams) > 0 ? '?' . http_build_query($queryParams) : '');
 
-        return $this->httpClient->createRequest($method, $path);
+        return new Request($method, $url);
     }
 }

lib/FH/PostcodeAPI/Exception/CouldNotParseResponseException.php

@@ -2,7 +2,7 @@
 
 namespace FH\PostcodeAPI\Exception;
 
-use GuzzleHttp\Message\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * @author Gijs Nieuwenhuis <gijs.nieuwenhuis@freshheads.com>