From 98f65f50a69fca3a816fefd293f236acdd205769 Mon Sep 17 00:00:00 2001
From: Brooke Bryan <brooke@bajb.net>
Date: Mon, 11 Sep 2017 14:10:11 +0100
Subject: [PATCH] Upgrade guzzle

---
 .travis.yml                           |   3 -
 composer.json                         |   9 +--
 src/Abstracts/AbstractApi.php         |  14 ++--
 src/Abstracts/AbstractApiFormat.php   |   2 +-
 src/Abstracts/AbstractApiResponse.php |   2 +-
 src/Abstracts/AbstractEndpoint.php    |   9 +--
 src/Interfaces/ApiFormatInterface.php |   2 +-
 src/Response/ResponseBuilder.php      |  13 ++--
 tests/ApiClientTest.php               | 103 +++++++++++++++++---------
 tests/Support/MockApi.php             |  17 +++++
 tests/ValidationTest.php              |   3 +-
 11 files changed, 108 insertions(+), 69 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3175bd..d02a808 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,5 @@ script:
   - mkdir -p build/logs
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
-after_script:
-  - vendor/bin/coveralls -v
-
 matrix:
   fast_finish: true
diff --git a/composer.json b/composer.json
index 9e604a5..0c2b649 100644
--- a/composer.json
+++ b/composer.json
@@ -9,16 +9,15 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
-    "guzzlehttp/guzzle": ">= 4.1 < 6",
-    "symfony/serializer": "~2.1",
+    "php": ">=7.0",
+    "guzzlehttp/guzzle": "~6.3",
+    "symfony/serializer": "~3.3",
     "packaged/helpers": "~1.0",
     "packaged/docblock": "~0",
     "packaged/config": "~1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.5",
-    "satooshi/php-coveralls": "~1.0"
+    "phpunit/phpunit": "~6.3"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Abstracts/AbstractApi.php b/src/Abstracts/AbstractApi.php
index 0204604..ced9f10 100644
--- a/src/Abstracts/AbstractApi.php
+++ b/src/Abstracts/AbstractApi.php
@@ -3,18 +3,18 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Promise\PromiseInterface;
 use Packaged\Api\Format\JsonFormat;
+use Packaged\Api\HttpVerb;
 use Packaged\Api\Interfaces\ApiAwareInterface;
 use Packaged\Api\Interfaces\ApiInterface;
 use Packaged\Api\Interfaces\ApiRequestInterface;
 use Packaged\Api\Interfaces\EndpointInterface;
-use Packaged\Api\HttpVerb;
 use Packaged\Helpers\Path;
 
 abstract class AbstractApi extends AbstractDefinable implements ApiInterface
 {
   protected $_client;
-  protected $_guzzleConfig = [];
 
   /**
    * Bind this API to an instance
@@ -38,7 +38,7 @@ protected function _getClient()
   {
     if($this->_client === null)
     {
-      $this->_client = new Client($this->_guzzleConfig);
+      $this->_client = new Client();
     }
 
     return $this->_client;
@@ -68,7 +68,7 @@ public function processRequest(ApiRequestInterface $request)
     $time = microtime(true);
     try
     {
-      $response = $this->_getClient()->send($apiRequest);
+      $response = $apiRequest->wait();
     }
     catch(ClientException $e)
     {
@@ -98,11 +98,11 @@ protected function _processResponse($response)
   /**
    * @param ApiRequestInterface $request
    *
-   * @return \GuzzleHttp\Message\RequestInterface
+   * @return PromiseInterface
    */
   protected function _createRequest(ApiRequestInterface $request)
   {
-    return $this->_getClient()->createRequest(
+    return $this->_getClient()->requestAsync(
       $request->getVerb(),
       Path::buildUnix($this->getUrl(), $request->getPath())
       . $request->getQueryString(),
@@ -121,7 +121,7 @@ protected function _makeOptions(ApiRequestInterface $request)
 
     if($request->getVerb() == HttpVerb::POST)
     {
-      $options['body'] = $request->getPostData();
+      $options['form_params'] = $request->getPostData();
     }
 
     return $options;
diff --git a/src/Abstracts/AbstractApiFormat.php b/src/Abstracts/AbstractApiFormat.php
index e541f34..f732697 100644
--- a/src/Abstracts/AbstractApiFormat.php
+++ b/src/Abstracts/AbstractApiFormat.php
@@ -1,11 +1,11 @@
 <?php
 namespace Packaged\Api\Abstracts;
 
-use GuzzleHttp\Message\ResponseInterface;
 use Packaged\Api\Exceptions\InvalidApiResponseException;
 use Packaged\Api\Interfaces\ApiFormatInterface;
 use Packaged\Api\Response\ApiCallData;
 use Packaged\Api\Response\ResponseBuilder;
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 
diff --git a/src/Abstracts/AbstractApiResponse.php b/src/Abstracts/AbstractApiResponse.php
index 7692fcb..37e3b0e 100644
--- a/src/Abstracts/AbstractApiResponse.php
+++ b/src/Abstracts/AbstractApiResponse.php
@@ -100,7 +100,7 @@ public function hydrate($data)
    */
   public static function make($data)
   {
-    $response = new static;
+    $response = new static();
     $response->hydrate($data);
     return $response;
   }
diff --git a/src/Abstracts/AbstractEndpoint.php b/src/Abstracts/AbstractEndpoint.php
index 420b311..cb8d357 100644
--- a/src/Abstracts/AbstractEndpoint.php
+++ b/src/Abstracts/AbstractEndpoint.php
@@ -1,12 +1,12 @@
 <?php
 namespace Packaged\Api\Abstracts;
 
+use Packaged\Api\ApiRequest;
+use Packaged\Api\HttpVerb;
 use Packaged\Api\Interfaces\ApiAwareInterface;
 use Packaged\Api\Interfaces\ApiInterface;
 use Packaged\Api\Interfaces\ApiPayloadInterface;
-use Packaged\Api\ApiRequest;
 use Packaged\Api\Interfaces\EndpointInterface;
-use Packaged\Api\HttpVerb;
 use Packaged\Api\Traits\ApiAwareTrait;
 use Packaged\Helpers\Objects;
 use Packaged\Helpers\Path;
@@ -60,10 +60,7 @@ protected function _buildPath($path, ApiPayloadInterface $payload = null)
     if(stristr($path, ':') && $payload !== null)
     {
       $find = array_map(
-        function ($value)
-        {
-          return ':' . $value;
-        },
+        function ($value) { return ':' . $value; },
         array_keys($payload->toArray())
       );
       return str_replace($find, $payload->toArray(), $path);
diff --git a/src/Interfaces/ApiFormatInterface.php b/src/Interfaces/ApiFormatInterface.php
index 2bdff67..4217e9a 100644
--- a/src/Interfaces/ApiFormatInterface.php
+++ b/src/Interfaces/ApiFormatInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\Api\Interfaces;
 
-use GuzzleHttp\Message\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 
 interface ApiFormatInterface
 {
diff --git a/src/Response/ResponseBuilder.php b/src/Response/ResponseBuilder.php
index 91e5be3..a22c4d7 100644
--- a/src/Response/ResponseBuilder.php
+++ b/src/Response/ResponseBuilder.php
@@ -26,9 +26,9 @@ public static function create(ApiCallData $data)
     }
 
     $interfaces = class_implements($type);
-    if($type == '\Exception'
-      || $type === '\Packaged\Api\Exceptions\ApiException'
-      || in_array('\Packaged\Api\Exceptions\ApiException', $interfaces)
+    if($type == \Exception::class
+      || $type === ApiException::class
+      || in_array(ApiException::class, $interfaces)
       || array_key_exists('Exception', class_parents($type))
     )
     {
@@ -45,12 +45,9 @@ public static function create(ApiCallData $data)
       }
       throw $exception;
     }
-    else if(in_array(
-      'Packaged\Api\Interfaces\ApiResponseInterface',
-      $interfaces
-    ))
+    else if(in_array(ApiResponseInterface::class, $interfaces))
     {
-      $class = new $type;
+      $class = new $type();
       /**
        * @var $class \Packaged\Api\Interfaces\ApiResponseInterface
        */
diff --git a/tests/ApiClientTest.php b/tests/ApiClientTest.php
index e67925d..ca581e0 100644
--- a/tests/ApiClientTest.php
+++ b/tests/ApiClientTest.php
@@ -1,8 +1,8 @@
 <?php
 namespace Packaged\Api\Tests;
 
-use GuzzleHttp\Post\PostBody;
-use GuzzleHttp\Ring\Client\MockHandler;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\Psr7\Response;
 use Packaged\Api\ApiRequest;
 use Packaged\Api\Format\JsonFormat;
 use Packaged\Api\HttpVerb;
@@ -12,8 +12,11 @@
 use Packaged\Api\Tests\Support\MockHeaderResponse;
 use Packaged\Api\Tests\Support\MockPayload;
 use Packaged\Api\Tests\Support\MockResponse;
+use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\RequestInterface;
+use function GuzzleHttp\Psr7\parse_query;
 
-class ApiClientTest extends \PHPUnit_Framework_TestCase
+class ApiClientTest extends TestCase
 {
   protected function _encode(
     $result, $statusCode = 200, $statusMessage = '', $type = null
@@ -29,19 +32,51 @@ protected function _encode(
 
   protected function _getApi($handlerResult, array $headers = null)
   {
-    if(!is_callable($handlerResult))
+    if(is_callable($handlerResult))
     {
-      $handlerResult = [
-        'body'   => $this->_encode($handlerResult),
-        'status' => 200
-      ];
+      $handler = new MockHandler(
+        [
+          function ($request) use ($handlerResult, $headers)
+          {
+            /** @var RequestInterface $request */
+            if(is_array($headers))
+            {
+              foreach($headers as $k => $v)
+              {
+                $request = $request->withAddedHeader($k, $v);
+              }
+            }
+            $resp = $handlerResult($request);
+            return new Response(
+              $resp['status'],
+              $headers ?: [],
+              $resp['body']
+            );
+          },
+        ]
+      );
     }
-    $handler = new MockHandler($handlerResult);
-    $config = ['handler' => $handler];
-    if($headers)
+    else
     {
-      $config['defaults']['headers'] = $headers;
+      if(is_object($handlerResult))
+      {
+        $handlerResult = [
+          'body'   => $this->_encode($handlerResult),
+          'status' => 200,
+        ];
+      }
+      $handler = new MockHandler(
+        [
+          new Response(
+            $handlerResult['status'],
+            $headers ?: [],
+            $handlerResult['body']
+          ),
+        ]
+      );
     }
+
+    $config = ['handler' => $handler];
     return new MockApi('http://www.test.com', $config);
   }
 
@@ -59,10 +94,7 @@ public function testGet()
 
     $endpoint = $this->_getEndpoint($response);
     $apiResult = $endpoint->getRequest()->get();
-    $this->assertInstanceOf(
-      '\Packaged\Api\Tests\Support\MockResponse',
-      $apiResult
-    );
+    $this->assertInstanceOf(MockResponse::class, $apiResult);
     $this->assertEquals($response->toArray(), $apiResult->toArray());
   }
 
@@ -71,12 +103,14 @@ public function testPost()
     $endpoint = $this->_getEndpoint(
       function ($request)
       {
-        $body = $request['body'];
-        if($body instanceof PostBody)
+        /** @var RequestInterface $request */
+        $body = $request->getBody()->getContents();
+        $params = parse_query($body);
+        if(!empty($params))
         {
           return [
-            'body'   => $this->_encode(MockResponse::make($body->getFields())),
-            'status' => 200
+            'body'   => $this->_encode(MockResponse::make($params)),
+            'status' => 200,
           ];
         }
         return null;
@@ -87,10 +121,7 @@ function ($request)
     $payload->key1 = 'value';
     $payload->key2 = 'vals';
     $apiResult = $endpoint->getRequest($payload, '/', HttpVerb::POST)->get();
-    $this->assertInstanceOf(
-      '\Packaged\Api\Tests\Support\MockResponse',
-      $apiResult
-    );
+    $this->assertInstanceOf(MockResponse::class, $apiResult);
     $this->assertEquals($payload->toArray(), $apiResult->toArray());
   }
 
@@ -99,11 +130,12 @@ public function testGlobalHeaders()
     $endpoint = $this->_getEndpoint(
       function ($request)
       {
+        /** @var RequestInterface $request */
         return [
           'body'   => (new JsonFormat())->encode(
-            MockHeaderResponse::make($request['headers'])
+            MockHeaderResponse::make($request->getHeaders())
           ),
-          'status' => 200
+          'status' => 200,
         ];
       },
       ['header1' => 'val', 'head2' => 'val2']
@@ -113,7 +145,7 @@ function ($request)
      * @var MockHeaderResponse $apiResult
      */
     $this->assertInstanceOf(
-      '\Packaged\Api\Tests\Support\MockHeaderResponse',
+      MockHeaderResponse::class,
       $apiResult
     );
     $this->assertArrayHasKey('header1', $apiResult->toArray());
@@ -137,17 +169,16 @@ public function testException()
     $toThrow = new MockException('Oops', 1050);
     $toThrow->errorValue = 'test value';
     $endpoint = $this->_getEndpoint(
-      function () use ($toThrow)
-      {
-        return [
-          'body'   => $toThrow->getFormatted(new JsonFormat()),
-          'status' => 200
-        ];
-      }
+      [
+        'body'   => $toThrow->getFormatted(new JsonFormat()),
+        'status' => 200,
+      ]
     );
     $payload = new MockPayload();
-    $payload->key1 = 'value';
-    $payload->key2 = 'vals';
+    $payload->hydrate(['key1' => 'value']);
+    $key2 = new \stdClass();
+    $key2->key2 = 'vals';
+    $payload->hydrate($key2);
     $e = null;
     try
     {
diff --git a/tests/Support/MockApi.php b/tests/Support/MockApi.php
index c29ccbe..e1f3ab9 100644
--- a/tests/Support/MockApi.php
+++ b/tests/Support/MockApi.php
@@ -1,11 +1,13 @@
 <?php
 namespace Packaged\Api\Tests\Support;
 
+use GuzzleHttp\Client;
 use Packaged\Api\Abstracts\AbstractApi;
 
 class MockApi extends AbstractApi
 {
   protected $_url;
+  protected $_guzzleConfig = [];
 
   function __construct($url, array $guzzleConfig = [])
   {
@@ -13,6 +15,21 @@ function __construct($url, array $guzzleConfig = [])
     $this->_guzzleConfig = $guzzleConfig;
   }
 
+  /**
+   * Retrieve the Guzzle HTTP Client
+   *
+   * @return Client
+   */
+  protected function _getClient()
+  {
+    if($this->_client === null)
+    {
+      $this->_client = new Client($this->_guzzleConfig);
+    }
+
+    return $this->_client;
+  }
+
   /**
    * Retrieve the url for the API
    *
diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
index 1e1c097..eff7957 100644
--- a/tests/ValidationTest.php
+++ b/tests/ValidationTest.php
@@ -2,8 +2,9 @@
 namespace Packaged\Api\Tests;
 
 use Packaged\Api\Tests\Support\MockPayload;
+use PHPUnit\Framework\TestCase;
 
-class ValidationTest extends \PHPUnit_Framework_TestCase
+class ValidationTest extends TestCase
 {
   /**
    * @expectedException \Packaged\Api\Exceptions\PayloadValidationException