Merge branch 'main' into connector-configurator

docs/advanced/response-decoder.md

@@ -10,7 +10,7 @@ The decoder should be configured as per-request basis. By default `Jenky\Atlas\R
 
 ### Creating Custom Decoder
 
-To create a custom decoder, you need to implement [`DecoderInterface`](https://github.com/jenky/atlas/blob/main/src/Contracts/DecoderInterface.php) which defines the structure that a decoder must have. The contract contains two methods: `supports` and `decode` where you can implement your own logic to decode the response body. Then you can start using it in your request.
+To create a custom decoder, you need to implement [`DecoderInterface`](https://github.com/jenky/atlas/blob/main/src/Contracts/DecoderInterface.php) which defines the structure that a decoder must have. The contract contains only one method: `decode` where you can implement your own logic to decode the response body. Then you can start using it in your request.
 
 ```php
 use Jenky\Atlas\Contracts\DecoderInterface;

src/Contracts/DecoderInterface.php

@@ -8,13 +8,10 @@
 
 interface DecoderInterface
 {
-    /**
-     * Determine wether decoder is supported for given response.
-     */
-    public function supports(ResponseInterface $response): bool;
-
     /**
      * Decode response body to native array type.
+     *
+     * Throw \Jenky\Atlas\Exception\NotDecodableException if decoder is unable to decode the response.
      */
     public function decode(ResponseInterface $response): array;
 }

src/Decoder/ChainDecoder.php

@@ -23,24 +23,19 @@ public function __construct(iterable $decoders)
         $this->decoders = $decoders;
     }
 
-    public function supports(ResponseInterface $request): bool
-    {
-        return iterator_count($this->decoders) > 0;
-    }
-
     /**
-     * {@inheritdoc}
-     *
      * @throws \Jenky\Atlas\Exception\NotDecodableException
      */
     public function decode(ResponseInterface $response): array
     {
         foreach ($this->decoders as $decoder) {
-            if ($decoder->supports($response)) {
+            try {
                 return $decoder->decode($response);
+            } catch (NotDecodableException $e) {
+                continue;
             }
         }
 
-        throw new NotDecodableException('Unable to decode the response body.');
+        throw NotDecodableException::create();
     }
 }

src/Decoder/JsonDecoder.php

@@ -5,17 +5,25 @@
 namespace Jenky\Atlas\Decoder;
 
 use Jenky\Atlas\Contracts\DecoderInterface;
+use Jenky\Atlas\Exception\NotDecodableException;
 use Psr\Http\Message\ResponseInterface;
 
 final class JsonDecoder implements DecoderInterface
 {
-    public function supports(ResponseInterface $response): bool
+    /**
+     * @throws \Jenky\Atlas\Exception\NotDecodableException
+     */
+    public function decode(ResponseInterface $response): array
     {
-        return mb_strpos($response->getHeaderLine('Content-Type'), 'json') !== false;
+        if (! $this->supports($response)) {
+            throw NotDecodableException::create();
+        }
+
+        return json_decode((string) $response->getBody(), true) ?? [];
     }
 
-    public function decode(ResponseInterface $response): array
+    private function supports(ResponseInterface $response): bool
     {
-        return json_decode((string) $response->getBody(), true) ?? [];
+        return mb_strpos($response->getHeaderLine('Content-Type'), 'json') !== false;
     }
 }

src/Decoder/XmlDecoder.php

@@ -5,17 +5,20 @@
 namespace Jenky\Atlas\Decoder;
 
 use Jenky\Atlas\Contracts\DecoderInterface;
+use Jenky\Atlas\Exception\NotDecodableException;
 use Psr\Http\Message\ResponseInterface;
 
 final class XmlDecoder implements DecoderInterface
 {
-    public function supports(ResponseInterface $response): bool
-    {
-        return mb_strpos($response->getHeaderLine('Content-Type'), 'xml') !== false;
-    }
-
+    /**
+     * @throws \Jenky\Atlas\Exception\NotDecodableException
+     */
     public function decode(ResponseInterface $response): array
     {
+        if (! $this->supports($response)) {
+            throw NotDecodableException::create();
+        }
+
         $xml = simplexml_load_string((string) $response->getBody());
 
         if (! $xml) {
@@ -26,4 +29,9 @@ public function decode(ResponseInterface $response): array
             json_encode($xml) ?: '[]', true
         );
     }
+
+    private function supports(ResponseInterface $response): bool
+    {
+        return mb_strpos($response->getHeaderLine('Content-Type'), 'xml') !== false;
+    }
 }

src/Exception/NotDecodableException.php

@@ -6,4 +6,8 @@
 
 class NotDecodableException extends \LogicException
 {
+    public static function create(string $message = 'Unable to decode the response body.'): self
+    {
+        return new self($message);
+    }
 }

src/Response.php

@@ -63,17 +63,15 @@ public function data(): array
      * Decode the response body.
      *
      * @return array<array-key, mixed>
+     *
+     * @throws \Jenky\Atlas\Exception\NotDecodableException
      */
     private function decode(): array
     {
         if (! $this->decoder instanceof DecoderInterface) {
             return [];
         }
 
-        if (! $this->decoder->supports($this->response)) {
-            return [];
-        }
-
         return $this->decoder->decode($this->response);
     }