Merge pull request #4 from megazoll/psr7

Update guzzle to 6 version

Author: stevenmaguire

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - hhvm

README.md

@@ -27,6 +27,8 @@ or update your `composer.json` file to include:
 ```
 Run `composer update`
 
+> Note that the required version of PHP is 5.5. If you want use library with PHP 5.4 you should use 1.2.0 version.
+
 ## Usage
 
 ### Create client

composer.json

@@ -19,8 +19,8 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "~5.2"
+        "php": ">=5.5.0",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",

src/Client.php

@@ -303,7 +303,7 @@ private function handleRequestException(HttpClientException $e)
     {
         if ($response = $e->getResponse()) {
             $exception = new Exception($response->getReasonPhrase(), $response->getStatusCode(), $e);
-            $exception->setBody($response->json());
+            $exception->setBody(json_decode($response->getBody()));
 
             throw $exception;
         }

tests/src/UberTest.php

@@ -3,8 +3,9 @@
 use Stevenmaguire\Uber\Client as Uber;
 use Mockery as m;
 use GuzzleHttp\Client as HttpClient;
-use GuzzleHttp\Subscriber\Mock;
-use GuzzleHttp\Message\MessageFactory;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Exception\ClientException as HttpClientException;
 
 class UberTest extends \PHPUnit_Framework_TestCase
@@ -423,18 +424,16 @@ public function test_Throws_Exception_On_Http_Errors()
         $params = [];
         $responseCode = 429;
         $responseHeaders = ['Content-Length' => 0];
+        $mock = new MockHandler([
+            new Response($responseCode, $responseHeaders)
+        ]);
+        $handler = HandlerStack::create($mock);
 
-        $factory = new MessageFactory;
-        $response = $factory->createResponse($responseCode, $responseHeaders);
-
-        $mock = new Mock([$response]);
-
-        $http_client = new HttpClient;
-        $http_client->getEmitter()->attach($mock);
+        $http_client = new HttpClient(['handler' => $handler]);
 
         $this->client->setHttpClient($http_client);
 
-        $products = $this->client->getProducts($params);
+        $this->client->getProducts($params);
     }
 
     public function test_Http_Exceptions_Include_Meta_From_Uber()
@@ -449,18 +448,17 @@ public function test_Http_Exceptions_Include_Meta_From_Uber()
             "Accept" => "application/json"
         ];
 
-        $factory = new MessageFactory;
-        $response = $factory->createResponse($responseCode, $responseHeaders, $responsePayload);
-
-        $mock = new Mock([$response]);
+        $mock = new MockHandler([
+            new Response($responseCode, $responseHeaders, $responsePayload)
+        ]);
+        $handler = HandlerStack::create($mock);
 
-        $http_client = new HttpClient;
-        $http_client->getEmitter()->attach($mock);
+        $http_client = new HttpClient(['handler' => $handler]);
 
         $this->client->setHttpClient($http_client);
 
         try {
-            $products = $this->client->getProducts($params);
+            $this->client->getProducts($params);
         } catch (\Stevenmaguire\Uber\Exception $e) {
             $this->assertContains($responseReason, $e->getMessage());
             $this->assertEquals($responseCode, $e->getCode());
@@ -473,7 +471,7 @@ public function test_Client_Exceptions_Throw_Uber_Exception()
         $params = [];
         $exception = new HttpClientException(
             uniqid(),
-            m::mock('GuzzleHttp\Message\RequestInterface')
+            m::mock('Psr\Http\Message\RequestInterface')
         );
         $http_client = m::mock('GuzzleHttp\Client');
         $http_client->shouldReceive('get')->times(1)->andThrow($exception);