error handling update

Author: kierwils

src/Exceptions/ClientError.php

@@ -13,38 +13,49 @@ class ClientError extends ErrorException implements RequestExceptionInterface
 {
     protected RequestInterface $request;
 
-    protected ResponseInterface $response;
+    protected ?ResponseInterface $response = null;
 
-    public function __construct(RequestInterface $request, ResponseInterface $response)
+    public function __construct(RequestInterface $request, ?ResponseInterface $response = null)
     {
         $this->request = $request;
         $this->response = $response;
+        parent::__construct($this->createMessage(), $response instanceof ResponseInterface ? $response->getStatusCode() : 0);
+    }
+
+    protected function createMessage(): string
+    {
+        if (!$this->response instanceof ResponseInterface) {
+            return sprintf(
+                'Http request "%s %s" failed to get a response',
+                $this->request->getMethod(),
+                $this->request->getUri()
+            );
+        }
 
-        $code = $response->getStatusCode();
         $message = sprintf(
             'Http request "%s %s" returned %u response',
-            $request->getMethod(),
-            $request->getUri(),
-            $code
+            $this->request->getMethod(),
+            $this->request->getUri(),
+            $this->response->getStatusCode()
         );
 
         if (strpos($this->response->getHeaderLine('Content-Type'), '/json') !== false) {
-            $data = json_decode((string) $this->response->getBody(), true);
+            $data = json_decode((string) $this->response->getBody(), true, 512, JSON_THROW_ON_ERROR);
             if (is_array($data) && (isset($data['title']) || isset($data['detail']))) {
                 $separator = isset($data['title'], $data['detail']) ? "\n\n" : '';
                 $message = ($data['title'] ?? '').$separator.($data['detail'] ?? '');
             }
         }
 
-        parent::__construct($message, $code);
+        return $message;
     }
 
     public function getRequest(): RequestInterface
     {
         return $this->request;
     }
 
-    public function getResponse(): ResponseInterface
+    public function getResponse(): ?ResponseInterface
     {
         return $this->response;
     }

src/HttpClient.php

@@ -154,7 +154,7 @@ protected function buildResponse(StreamInterface $headers, StreamInterface $body
         return $this->parseHeaders($response, $headers);
     }
 
-    public function sendRequest(RequestInterface $request): ResponseInterface
+    protected function prepareSession(RequestInterface $request): array
     {
         curl_setopt_array($this->session, $this->buildOptions($request));
 
@@ -178,6 +178,13 @@ static function ($session, string $data) use ($body): int {
             }
         );
 
+        return [$headers, $body];
+    }
+
+    public function sendRequest(RequestInterface $request): ResponseInterface
+    {
+        [$headers, $body] = $this->prepareSession($request);
+
         $result = curl_exec($this->session);
         if ($this->debug) {
             $this->metrics = curl_getinfo($this->session);