feat: adds exceptions to discriminate client, server and network errors

src/ClientAdapter/ClientAdapterInterface.php

@@ -3,6 +3,8 @@
 namespace ImmobiliareLabs\BrazeSDK\ClientAdapter;
 
 use ImmobiliareLabs\BrazeSDK\ClientResolvedResponse;
+use ImmobiliareLabs\BrazeSDK\Exception\ClientException;
+use ImmobiliareLabs\BrazeSDK\Exception\ServerException;
 use ImmobiliareLabs\BrazeSDK\Exception\TransportException;
 use ImmobiliareLabs\BrazeSDK\Request\BaseRequest;
 
@@ -18,13 +20,17 @@ public function setHeaders(array $headers): void;
      * @return mixed the real response or a reference to it that will allow you to solve it later, for example a promise
      *
      * @throws TransportException
+     * @throws ServerException
+     * @throws ClientException
      */
     public function makeRequest(string $method, string $path, ?string $body = null);
 
     /**
      * @param mixed $httpResponse the real response or a reference to it. It's the value returned by the makeRequest method
      *
      * @throws TransportException
+     * @throws ServerException
+     * @throws ClientException
      */
     public function resolveResponse($httpResponse): ClientResolvedResponse;
 }

src/ClientAdapter/Psr18Adapter.php

@@ -3,10 +3,12 @@
 namespace ImmobiliareLabs\BrazeSDK\ClientAdapter;
 
 use ImmobiliareLabs\BrazeSDK\ClientResolvedResponse;
+use ImmobiliareLabs\BrazeSDK\Exception\ClientException;
 use ImmobiliareLabs\BrazeSDK\Exception\NotValidBaseURIException;
 use ImmobiliareLabs\BrazeSDK\Exception\TransportException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Client\NetworkExceptionInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamFactoryInterface;
@@ -82,9 +84,10 @@ public function makeRequest(string $method, string $path, ?string $body = null):
 
         try {
             return $this->client->sendRequest($request);
-        } catch (ClientExceptionInterface $e) {
-            // is this correct?
-            throw new TransportException($e->getMessage(), 0, $e);
+        } catch (NetworkExceptionInterface $networkException) {
+            throw new TransportException($networkException->getMessage(), 0, $networkException);
+        } catch (ClientExceptionInterface $clientException) {
+            throw new ClientException($clientException->getMessage(), 0, $clientException);
         }
     }
 

src/ClientAdapter/SymfonyAdapter.php

@@ -3,6 +3,8 @@
 namespace ImmobiliareLabs\BrazeSDK\ClientAdapter;
 
 use ImmobiliareLabs\BrazeSDK\ClientResolvedResponse;
+use ImmobiliareLabs\BrazeSDK\Exception\ClientException;
+use ImmobiliareLabs\BrazeSDK\Exception\ServerException;
 use ImmobiliareLabs\BrazeSDK\Exception\TransportException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -37,9 +39,6 @@ public function setHeaders(array $headers): void
         $this->headers = $headers;
     }
 
-    /**
-     * @throws TransportException
-     */
     public function makeRequest(string $method, string $path, ?string $body = null): ResponseInterface
     {
         $options = [
@@ -57,15 +56,17 @@ public function makeRequest(string $method, string $path, ?string $body = null):
 
     /**
      * @param ResponseInterface $httpResponse
-     * @throws TransportException
      */
     public function resolveResponse($httpResponse): ClientResolvedResponse
     {
         try {
-            return new ClientResolvedResponse($httpResponse->getStatusCode(), $httpResponse->getContent(false));
-        } catch (TransportExceptionInterface|ClientExceptionInterface|ServerExceptionInterface|RedirectionExceptionInterface $e) {
-            // ClientExceptionInterface, ServerExceptionInterface and RedirectionExceptionInterface never occurs because throw parameter is set to false
+            return new ClientResolvedResponse($httpResponse->getStatusCode(), $httpResponse->getContent());
+        } catch (TransportExceptionInterface $e) {
             throw new TransportException($e->getMessage(), 0, $e);
+        } catch (ServerExceptionInterface $serverException) {
+            throw new ServerException($serverException->getMessage(), 0, $serverException);
+        } catch (ClientExceptionInterface|RedirectionExceptionInterface $clientException) {
+            throw new ClientException($clientException->getMessage(), 0, $clientException);
         }
     }
 }

src/Exception/ClientException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ImmobiliareLabs\BrazeSDK\Exception;
+
+class ClientException extends \RuntimeException
+{
+
+}

src/Exception/ServerException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ImmobiliareLabs\BrazeSDK\Exception;
+
+class ServerException extends \RuntimeException
+{
+
+}

tests/ClientAdapter/Psr18AdapterTest.php

@@ -3,6 +3,7 @@
 namespace ImmobiliareLabs\BrazeSDK\Test\ClientAdapter;
 
 use ImmobiliareLabs\BrazeSDK\ClientAdapter\Psr18Adapter;
+use ImmobiliareLabs\BrazeSDK\Exception\ClientException;
 use ImmobiliareLabs\BrazeSDK\Exception\NotValidBaseURIException;
 use ImmobiliareLabs\BrazeSDK\Exception\TransportException;
 use ImmobiliareLabs\BrazeSDK\Region;
@@ -105,7 +106,7 @@ public function testMakeRequest(): void
 
     public function testMakeRequestWithClientException(): void
     {
-        $this->expectException(TransportException::class);
+        $this->expectException(ClientException::class);
 
         $exception = $this->createMock(ClientExceptionInterface::class);