diff --git a/composer.json b/composer.json index f07d906..5914db5 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "require": { "php": ">=5.4.0", - "guzzlehttp/guzzle": "~4.1" + "guzzlehttp/guzzle": "~6.1" }, "require-dev": { "mockery/mockery": "0.9.*", diff --git a/src/Mcprohosting/CloudFlare/Request/HttpRequest.php b/src/Mcprohosting/CloudFlare/Request/HttpRequest.php index ba76693..be1b5d5 100644 --- a/src/Mcprohosting/CloudFlare/Request/HttpRequest.php +++ b/src/Mcprohosting/CloudFlare/Request/HttpRequest.php @@ -120,14 +120,14 @@ protected function request($method, $route, $options) { $url = rtrim($this->baseUrl, '/') . '/' . ltrim($route, '/'); - $request = $this->client->createRequest($method, $url, $options + [ + $r = $this->client->request($method, $url, $options + [ 'headers' => [ 'X-Auth-Key' => $this->authKey, 'X-Auth-Email' => $this->authEmail ] ]); - return new GuzzleResponse($this->client->send($request)); + return new GuzzleResponse($r); } public function __call($method, $arguments) diff --git a/src/Mcprohosting/CloudFlare/Response/GuzzleResponse.php b/src/Mcprohosting/CloudFlare/Response/GuzzleResponse.php index 6762aff..1cd502a 100644 --- a/src/Mcprohosting/CloudFlare/Response/GuzzleResponse.php +++ b/src/Mcprohosting/CloudFlare/Response/GuzzleResponse.php @@ -2,7 +2,7 @@ namespace Mcprohosting\CloudFlare\Response; -use GuzzleHttp\Message\ResponseInterface as GuzzleResponseInterface; +use GuzzleHttp\Psr7\Response as Resp; class GuzzleResponse implements ResponseInterface { @@ -13,9 +13,9 @@ class GuzzleResponse implements ResponseInterface */ protected $data; - function __construct(GuzzleResponseInterface $response) + function __construct(Resp $response) { - $this->data = $response->json(); + $this->data = json_decode($response->getBody(), true); } public function __get($property) @@ -37,4 +37,4 @@ public function didSucceed() { return $this->data['success']; } -} \ No newline at end of file +} diff --git a/tests/RequestTest.php b/tests/RequestTest.php index bbb58fc..8878489 100644 --- a/tests/RequestTest.php +++ b/tests/RequestTest.php @@ -6,23 +6,22 @@ class RequestTest extends PHPUnit_Framework_TestCase { public function testFactory() { - $response = Mockery::mock('GuzzleHttp\Message\ResponseInterface'); - $response->shouldReceive('json')->andReturn(json_decode('{ + $response = Mockery::mock('GuzzleHttp\Psr7\Response'); + $response->shouldReceive('getBody')->andReturn('{ "result": {"a": "b"}, "success": false, "errors": [{"code":1003,"message":"Invalid or missing zone id."}], "messages": [] - }', true)); + }'); - $request = Mockery::mock('GuzzleHttp\Message\RequestInterface'); + $req = Mockery::mock('Psr\Http\Message\RequestInterface'); $client = Mockery::mock('GuzzleHttp\ClientInterface'); - $client->shouldReceive('createRequest')->with('post', 'SomeUrl/aRoute', [ + $client->shouldReceive('request')->with('post', 'SomeUrl/aRoute', [ 'headers' => [ 'X-Auth-Key' => 'FooKey', 'X-Auth-Email' => 'FooEmail' ], 'json' => 'bar' - ])->andReturn($request); - $client->shouldReceive('send')->with($request)->andReturn($response); + ])->andReturn($response); $resolver = Mockery::mock('Mcprohosting\CloudFlare\Resolver'); $resolver->shouldReceive('resolve')->with('someMethod', [])->andReturn([