[Errors] Display api message on 404 errors

Author: ffouchier

src/Exceptions/ApiEntityNotFoundException.php

@@ -6,11 +6,11 @@
 
 class ApiEntityNotFoundException extends ApiException
 {
-    public function __construct($response, $httpCode = 0, Throwable $previous = null)
+    public function __construct($response, $message = null, $httpCode = 0, Throwable $previous = null)
     {
         parent::__construct(
             $response,
-            'Entity not found',
+            $message ?? 'Entity not found',
             $httpCode,
             $previous
         );

src/Exceptions/ApiException.php

@@ -16,7 +16,7 @@ class ApiException extends Exception
 
     public function __construct($response, $message = "", $httpCode = 0, Throwable $previous = null)
     {
-        parent::__construct("The request ended on a $httpCode code : $message", $httpCode, $previous);
+        parent::__construct($message, $httpCode, $previous);
         $this->response = $response;
     }
 

src/Exceptions/Handlers/NotFoundErrorHandler.php

@@ -18,6 +18,7 @@ public function handle(ApiException $exception, array $requestArguments)
     {
         throw new ApiEntityNotFoundException(
             $exception->getResponse(),
+            $exception->getMessage(),
             $exception->getCode(),
             $exception->getPrevious()
         );

src/Transports/Transport.php

@@ -109,7 +109,11 @@ public function request($endpoint, array $data = [], $method = 'get')
 
         $exception = new ApiException(
             $response,
-            $response['message'] ?? $rawResponse ?? 'Unknown error message',
+            sprintf(
+                'The request ended on a %s code : %s',
+                $httpStatusCode,
+                $this->arrayGet($response, $this->getErrorKey()) ?? $rawResponse ?? 'Unknown error message'
+            ),
             $httpStatusCode
         );
 
@@ -120,6 +124,11 @@ public function request($endpoint, array $data = [], $method = 'get')
         throw $exception;
     }
 
+    public function getErrorKey(): string
+    {
+        return 'message';
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -235,4 +244,15 @@ public function getResponseHeaders(): array
     {
         return iterator_to_array($this->getClient()->getResponseHeaders());
     }
+
+    protected function arrayGet(array $array, string $key)
+    {
+        $exploded = explode('.', $key, 2);
+
+        if (!isset($exploded[1])) {
+            return $array[$key];
+        }
+
+        return $this->arrayGet($array[$exploded[0]], $exploded[1]);
+    }
 }