Merge pull request #41 from contentful/fix/github-40-guzzle-exception

Fix/GitHub 40 guzzle exception

Author: pgrigoruta

src/Api/Requester.php

@@ -14,6 +14,7 @@
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Exception\ClientException;
 use function GuzzleHttp\json_decode as guzzle_json_decode;
+use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 
 class Requester
@@ -82,8 +83,12 @@ private function createCustomException(ClientException $exception): Exception
         $errorId = '';
         $response = $exception->getResponse();
         if ($response) {
-            $data = guzzle_json_decode((string) $response->getBody(), true);
-            $errorId = (string) $data['sys']['id'] ?? '';
+            try {
+                $data = guzzle_json_decode((string) $response->getBody(), true);
+                $errorId = (string) $data['sys']['id'] ?? '';
+            } catch (InvalidArgumentException $invalidArgumentException) {
+                $errorId = 'InvalidResponseBody';
+            }
         }
 
         $exceptionClass = $this->getExceptionClass($errorId);

src/Exception/InvalidResponseBodyException.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the contentful/contentful-core package.
+ *
+ * @copyright 2015-2020 Contentful GmbH
+ * @license   MIT
+ */
+
+declare(strict_types=1);
+
+namespace Contentful\Core\Exception;
+
+use Contentful\Core\Api\Exception;
+
+/**
+ * A InvalidResponseBodyException indicates that there was problem with response body.
+ */
+class InvalidResponseBodyException extends Exception
+{
+}

tests/Unit/Exception/InvalidResponseBodyExceptionTest.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * This file is part of the contentful/contentful-core package.
+ *
+ * @copyright 2015-2020 Contentful GmbH
+ * @license   MIT
+ */
+
+declare(strict_types=1);
+
+namespace Contentful\Tests\Core\Unit\Exception;
+
+use Contentful\Core\Api\Requester;
+use Contentful\Core\Exception\InvalidResponseBodyException;
+use Contentful\Tests\TestCase;
+use GuzzleHttp\Client as HttpClient;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Handler\CurlHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\RequestInterface;
+
+class InvalidResponseBodyExceptionTest extends TestCase
+{
+    public function testInvalidResponseException()
+    {
+        $response = new Response(200, [], '{}');
+        $handler = function (RequestInterface $request, array $options) use ($response) {
+            return $response;
+        };
+        $httpClient = $this->createHttpClient($handler);
+        $requester = new Requester($httpClient, 'DELIVERY');
+
+        $request = new Request('GET', 'https://www.example.com/some-page');
+        $message = $requester->sendRequest($request);
+        $this->assertInstanceOf(InvalidResponseBodyException::class, $message->getException());
+    }
+
+    public function createHttpClient(callable $handlerOverride = \null)
+    {
+        $stack = new HandlerStack();
+        $stack->setHandler(new CurlHandler());
+        $stack->push(function (callable $handler) use ($handlerOverride) {
+            return function (RequestInterface $request, array $options) use ($handler, $handlerOverride) {
+                throw new ClientException('Foo', $request, new Response(500, [], 'FOO'));
+            };
+        });
+
+        return new HttpClient(['handler' => $stack]);
+    }
+}