Better exception handling (#25)

* Handle exceptions better * cs
FriendsOfApi · Nov 23, 2018 · f193ccd · f193ccd
1 parent 5339e4f
commit f193ccd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 75 deletions.
diff --git a/src/Api/Cart.php b/src/Api/Cart.php
@@ -10,7 +10,6 @@
 namespace FAPI\Sylius\Api;
 
 use FAPI\Sylius\Exception;
-use FAPI\Sylius\Exception\Domain as DomainExceptions;
 use FAPI\Sylius\Exception\InvalidArgumentException;
 use FAPI\Sylius\Model\Cart\Cart as Model;
 use FAPI\Sylius\Model\Cart\CartItem;
@@ -75,15 +74,7 @@ public function create(string $customer, string $channel, string $localeCode, ar
 
         // Use any valid status code here
         if (201 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
 
         return $this->hydrator->hydrate($response, Model::class);
@@ -120,15 +111,7 @@ public function addItem(int $cartId, string $variant, int $quantity)
 
         // Use any valid status code here
         if (201 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
 
         return $this->hydrator->hydrate($response, CartItem::class);

diff --git a/src/Api/Checkout.php b/src/Api/Checkout.php
@@ -10,7 +10,6 @@
 namespace FAPI\Sylius\Api;
 
 use FAPI\Sylius\Exception;
-use FAPI\Sylius\Exception\Domain as DomainExceptions;
 use FAPI\Sylius\Exception\InvalidArgumentException;
 use FAPI\Sylius\Model\Checkout\PaymentCollection;
 use FAPI\Sylius\Model\Checkout\ShipmentCollection;
@@ -64,15 +63,7 @@ public function updateAddress(int $cartId, array $shippingAddress, bool $differe
 
         // Use any valid status code here
         if (204 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
     }
 
@@ -94,15 +85,7 @@ public function updatePaymentMethod(int $cartId, array $params = [])
 
         // Use any valid status code here
         if (204 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
     }
 
@@ -124,15 +107,7 @@ public function complete(int $cartId)
 
         // Use any valid status code here
         if (204 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
     }
 
@@ -154,15 +129,7 @@ public function getShippingMethods(int $cartId)
 
         // Use any valid status code here
         if (200 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
 
         return $this->hydrator->hydrate($response, ShipmentCollection::class);
@@ -186,15 +153,7 @@ public function getPaymentMethods(int $cartId)
 
         // Use any valid status code here
         if (200 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
 
         return $this->hydrator->hydrate($response, PaymentCollection::class);

diff --git a/src/Api/Customer.php b/src/Api/Customer.php
@@ -10,7 +10,6 @@
 namespace FAPI\Sylius\Api;
 
 use FAPI\Sylius\Exception;
-use FAPI\Sylius\Exception\Domain as DomainExceptions;
 use FAPI\Sylius\Exception\InvalidArgumentException;
 use FAPI\Sylius\Model\Customer\Customer as Model;
 use Psr\Http\Message\ResponseInterface;
@@ -57,15 +56,7 @@ public function create(string $email, string $firstName, string $lastName, strin
 
         // Use any valid status code here
         if (201 !== $response->getStatusCode()) {
-            switch ($response->getStatusCode()) {
-                case 400:
-                    throw new DomainExceptions\ValidationException();
-                    break;
-                default:
-                    $this->handleErrors($response);
-
-                    break;
-            }
+            $this->handleErrors($response);
         }
 
         return $this->hydrator->hydrate($response, Model::class);

diff --git a/src/Api/HttpApi.php b/src/Api/HttpApi.php
@@ -141,7 +141,10 @@ protected function httpDelete(string $path, array $params = [], array $requestHe
      */
     protected function handleErrors(ResponseInterface $response)
     {
+        $body = $response->getBody()->__toString();
         switch ($response->getStatusCode()) {
+            case 400:
+                throw new DomainExceptions\ValidationException($body);
             case 401:
                 throw new DomainExceptions\UnauthorizedException();
             case 404: