Error handling (#23)

* fixup

* wip

* fixu

* fixup

* fixup

* fixup

* fixup-specs

Author: j-r-j

src/ShipEngine.php

@@ -110,7 +110,7 @@ public function createLabelFromRate($rateId, $params, $config = null): array
         $config = $this->config->merge($config);
         $client = new ShipEngineClient();
         $apiResponse = $client->post(
-            "v1/labels/rates/{$rateId}",
+            "v1/labels/rates/$rateId",
             $config,
             $params
         );
@@ -154,7 +154,7 @@ public function voidLabelWithLabelId($labelId, $config = null): array
         $config = $this->config->merge($config);
         $client = new ShipEngineClient();
         $apiResponse = $client->put(
-            "v1/labels/${labelId}/void",
+            "v1/labels/$labelId/void",
             $config
         );
 
@@ -196,8 +196,8 @@ public function trackUsingLabelId($labelId, $config = null): array
     {
         $config = $this->config->merge($config);
         $client = new ShipEngineClient();
-        $apiResponse = $client->post(
-            "v1/labels/${labelId}/track",
+        $apiResponse = $client->get(
+            "v1/labels/$labelId/track",
             $config
         );
 
@@ -218,10 +218,9 @@ public function trackUsingCarrierCodeAndTrackingNumber($carrierCode, $trackingNu
     {
         $config = $this->config->merge($config);
         $client = new ShipEngineClient();
-        $apiResponse = $client->post(
-            "v1/tracking",
-            $config,
-            array('carrier_code' => $carrierCode, 'tracking_number' => $trackingNumber)
+        $apiResponse = $client->get(
+            "v1/tracking?carrier_code=$carrierCode&tracking_number=$trackingNumber",
+            $config
         );
 
         return $apiResponse;

src/ShipEngineClient.php

@@ -92,12 +92,14 @@ private function sendRequestWithRetries(
         string $method,
         string $path,
         ?array $params,
-        ShipEngineConfig $config): array
+        ShipEngineConfig $config
+    ): array
     {
         $apiResponse = null;
         for ($retry = 0; $retry <= $config->retries; $retry++) {
             try {
                 $apiResponse = $this->sendRequest($method, $path, $params, $retry, $config);
+                break;
             } catch (\RuntimeException $err) {
                 if (($retry < $config->retries) &&
                     $err instanceof RateLimitExceededException &&
@@ -143,6 +145,7 @@ private function sendRequest(
         $client = new Client(
             [
                 'base_uri' => $config->baseUrl,
+                'timeout' => $config->timeout,
                 'max_retry_attempts' => $config->retries
             ]
         );
@@ -175,7 +178,7 @@ private function sendRequest(
         // $assert->isResponse404($statusCode, $parsedResponse);
         // $assert->isResponse429($statusCode, $parsedResponse, $config);
         // $assert->isResponse500($statusCode, $parsedResponse);
-        var_dump($parsedResponse);
+
         return $this->handleResponse($parsedResponse);
     }
 
@@ -188,61 +191,19 @@ private function sendRequest(
      */
     private function handleResponse(array $response): array
     {
-        return $response;
-
+        if (!isset($response['errors']) || (count($response['errors']) == 0)) {
+            return $response;
+        }
 
-        // $error = $response['error'];
+        $error = $response['errors'][0];
 
-        // switch ($error['data']['type']) {
-        //     case ErrorType::ACCOUNT_STATUS:
-        //         throw new AccountStatusException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        //     case ErrorType::SECURITY:
-        //         throw new SecurityException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        //     case ErrorType::VALIDATION:
-        //         throw new ValidationException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        //     case ErrorType::BUSINESS_RULES:
-        //         throw new BusinessRuleException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        //     case ErrorType::SYSTEM:
-        //         throw new SystemException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        //     default:
-        //         throw new ShipEngineException(
-        //             $error['message'],
-        //             $response['id'],
-        //             $error['data']['source'],
-        //             $error['data']['type'],
-        //             $error['data']['code']
-        //         );
-        // }
+        throw new ShipEngineException(
+            $error['message'],
+            $response['request_id'],
+            $error['error_source'],
+            $error['error_type'],
+            $error['error_code']
+        );
     }
 
     /**

src/ShipEngineConfig.php

@@ -33,7 +33,7 @@ final class ShipEngineConfig implements \JsonSerializable
     /**
      * Default timeout for the ShipEngineClient in seconds as a **DateInterval**.
      */
-    public const DEFAULT_TIMEOUT = 'PT5S';
+    public const DEFAULT_TIMEOUT = 'PT10S';
 
 
     /**