feat: use remaining error types depending on status code

Author: Justintime50

Makefile

@@ -9,7 +9,7 @@ clean:
 ## coverage - Runs the test suite and generates a coverage report
 coverage:
 	composer coverage
-	bin/coverage-check build/logs/clover.xml 82 --only-percentage
+	bin/coverage-check build/logs/clover.xml 81 --only-percentage
 
 ## docs - Generate documentation for the library
 docs:

lib/EasyPost/Exception/Api/ApiException.php

@@ -6,21 +6,17 @@
 
 /**
  * @package EasyPost
- * @property string $message
  * @property string $code
- * @property string $statusCode
- * @property string $httpBody
  * @property FieldError[] $errors
  */
 class ApiException extends EasyPostException
 {
-    private $httpBody;
-    private $httpStatus;
-    private $jsonBody;
+    protected $httpBody;
+    protected $httpStatus;
+    protected $jsonBody;
+    protected $message;
     public $code;
-    public $ecode;
     public $errors;
-    public $message;
 
     /**
      * EasyPostException constructor.

lib/EasyPost/Http/Requestor.php

@@ -5,12 +5,20 @@
 use EasyPost\Constant\Constants;
 use EasyPost\EasyPostClient;
 use EasyPost\EasypostObject;
+use EasyPost\Exception\Api\GatewayTimeoutException;
 use EasyPost\Exception\Api\HttpException;
 use EasyPost\Exception\Api\InternalServerException;
 use EasyPost\Exception\Api\InvalidRequestException;
 use EasyPost\Exception\Api\JsonException;
+use EasyPost\Exception\Api\MethodNotAllowedException;
+use EasyPost\Exception\Api\NotFoundException;
+use EasyPost\Exception\Api\PaymentException;
+use EasyPost\Exception\Api\RateLimitException;
 use EasyPost\Exception\Api\RedirectException;
+use EasyPost\Exception\Api\ServiceUnavailableException;
 use EasyPost\Exception\Api\TimeoutException;
+use EasyPost\Exception\Api\UnauthorizedException;
+use EasyPost\Exception\Api\UnknownApiException;
 use GuzzleHttp\Client;
 
 class Requestor
@@ -231,12 +239,59 @@ public static function handleApiError($httpBody, $httpStatus, $response)
             $message = $response['error'];
         }
 
-        if ($httpStatus >= 300 || $httpStatus < 400) {
-            throw new RedirectException($message, $httpStatus, $httpBody);
-        } elseif ($httpStatus >= 400 || $httpStatus < 500) {
-            throw new InvalidRequestException($message, $httpStatus, $httpBody);
-        } elseif ($httpStatus >= 500) {
-            throw new InternalServerException($message, $httpStatus, $httpBody);
+        switch ($httpStatus) {
+            case 100:
+                $errorType = UnknownApiException::class;
+            case 101:
+                $errorType = UnknownApiException::class;
+            case 102:
+                $errorType = UnknownApiException::class;
+            case 103:
+                $errorType = UnknownApiException::class;
+            case 300:
+                $errorType = RedirectException::class;
+            case 301:
+                $errorType = RedirectException::class;
+            case 302:
+                $errorType = RedirectException::class;
+            case 303:
+                $errorType = RedirectException::class;
+            case 304:
+                $errorType = RedirectException::class;
+            case 305:
+                $errorType = RedirectException::class;
+            case 306:
+                $errorType = RedirectException::class;
+            case 307:
+                $errorType = RedirectException::class;
+            case 308:
+                $errorType = RedirectException::class;
+            case 401:
+                $errorType = UnauthorizedException::class;
+            case 402:
+                $errorType = PaymentException::class;
+            case 403:
+                $errorType = UnauthorizedException::class;
+            case 404:
+                $errorType = NotFoundException::class;
+            case 405:
+                $errorType = MethodNotAllowedException::class;
+            case 408:
+                $errorType = TimeoutException::class;
+            case 422:
+                $errorType = InvalidRequestException::class;
+            case 429:
+                $errorType = RateLimitException::class;
+            case 500:
+                $errorType = InternalServerException::class;
+            case 503:
+                $errorType = ServiceUnavailableException::class;
+            case 504:
+                $errorType = GatewayTimeoutException::class;
+            default:
+                $errorType = UnknownApiException::class;
         }
+
+        throw new $errorType($message, $httpStatus, $httpBody);
     }
 }

phpunit.xml.dist

@@ -10,9 +10,5 @@
         <include>
             <directory suffix=".php">./lib/EasyPost/</directory>
         </include>
-        <exclude>
-            <!-- We exclude the Billing module because it cannot be easily tested. -->
-            <directory>./lib/EasyPost/Billing.php</directory>
-        </exclude>
     </coverage>
 </phpunit>