Simplify the wrapping of API exceptions

thanhct · Jan 12, 2018 · e5fa43a · e5fa43a
1 parent 6808ed9
commit e5fa43a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/src/Firebase/Exception/ApiException.php b/src/Firebase/Exception/ApiException.php
@@ -22,29 +22,16 @@ class ApiException extends \RuntimeException implements FirebaseException
 
     public static function wrapThrowable(\Throwable $e): self
     {
-        if ($e instanceof self) {
-            return $e;
-        }
-
         if (!($e instanceof RequestException)) {
             return new self($e->getMessage(), $e->getCode(), $e);
         }
 
         $request = $e->getRequest();
         $response = $e->getResponse();
-        $message = $e->getMessage();
+        $message = self::getPreciseMessage($response) ?: $e->getMessage();
         $code = $e->getCode();
 
-        if (\in_array($code, [StatusCode::STATUS_UNAUTHORIZED, StatusCode::STATUS_FORBIDDEN], true)) {
-            $class = PermissionDenied::class;
-        } else {
-            $class = static::class;
-        }
-
-        if ($response && JSON::isValid($responseBody = (string) $response->getBody())) {
-            $json = JSON::decode($responseBody, true);
-            $message = $json['error'] ?? $message;
-        }
+        $class = self::getTargetClassFromStatusCode($code);
 
         $instance = new $class($message, $code, $e);
         $instance->request = $request;
@@ -65,4 +52,21 @@ public function getResponse()
     {
         return $this->response;
     }
+
+    private static function getTargetClassFromStatusCode($code): string
+    {
+        if (\in_array($code, [StatusCode::STATUS_UNAUTHORIZED, StatusCode::STATUS_FORBIDDEN], true)) {
+            return PermissionDenied::class;
+        }
+
+        return static::class;
+    }
+
+    private static function getPreciseMessage(ResponseInterface $response = null)
+    {
+        if ($response && JSON::isValid($responseBody = (string) $response->getBody())) {
+            $json = JSON::decode($responseBody, true);
+            return $json['error'] ?? null;
+        }
+    }
 }
diff --git a/tests/Firebase/Unit/Exception/ApiExceptionTest.php b/tests/Firebase/Unit/Exception/ApiExceptionTest.php
@@ -12,14 +12,6 @@
 
 class ApiExceptionTest extends UnitTestCase
 {
-    public function testWrapApiException()
-    {
-        $source = new ApiException('Foo');
-        $result = ApiException::wrapThrowable($source);
-
-        $this->assertSame($source, $result);
-    }
-
     public function testWrapClientException()
     {
         $source = new ClientException(