fix: throws actual exceptions instead of their wrappers (#53)

apimatic · Apr 1, 2024 · bb916c4 · bb916c4
1 parent ec9cc44
commit bb916c4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/src/Response/Types/DeserializableType.php b/src/Response/Types/DeserializableType.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Core\Response\Context;
-use Throwable;
 
 class DeserializableType
 {
@@ -29,10 +28,6 @@ public function getFrom(Context $context)
         if (is_null($this->deserializerMethod)) {
             return null;
         }
-        try {
-            return Closure::fromCallable($this->deserializerMethod)($context->getResponse()->getBody());
-        } catch (Throwable $t) {
-            throw $context->toApiException($t->getMessage());
-        }
+        return Closure::fromCallable($this->deserializerMethod)($context->getResponse()->getBody());
     }
 }
diff --git a/src/Response/Types/ResponseType.php b/src/Response/Types/ResponseType.php
@@ -6,7 +6,6 @@
 
 use Closure;
 use Core\Response\Context;
-use Exception;
 
 class ResponseType
 {
@@ -57,20 +56,16 @@ public function getFrom(Context $context)
         if (is_null($this->responseClass)) {
             return null;
         }
-        try {
-            if (isset($this->xmlDeserializer)) {
-                return Closure::fromCallable($this->xmlDeserializer)(
-                    $context->getResponse()->getRawBody(),
-                    $this->responseClass
-                );
-            }
-            return $context->getJsonHelper()->mapClass(
-                $context->getResponse()->getBody(),
-                $this->responseClass,
-                $this->dimensions
+        if (isset($this->xmlDeserializer)) {
+            return Closure::fromCallable($this->xmlDeserializer)(
+                $context->getResponse()->getRawBody(),
+                $this->responseClass
             );
-        } catch (Exception $e) {
-            throw $context->toApiException($e->getMessage());
         }
+        return $context->getJsonHelper()->mapClass(
+            $context->getResponse()->getBody(),
+            $this->responseClass,
+            $this->dimensions
+        );
     }
 }
diff --git a/tests/ApiCallTest.php b/tests/ApiCallTest.php
@@ -3,6 +3,7 @@
 namespace Core\Tests;
 
 use apimatic\jsonmapper\AnyOfValidationException;
+use apimatic\jsonmapper\JsonMapperException;
 use apimatic\jsonmapper\OneOfValidationException;
 use Core\Request\Parameters\AdditionalFormParams;
 use Core\Request\Parameters\AdditionalQueryParams;
@@ -29,6 +30,7 @@
 use CoreInterfaces\Http\RetryOption;
 use CURLFile;
 use Exception;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 class ApiCallTest extends TestCase
@@ -766,7 +768,7 @@ public function testSendMultipleXMLBodyParams()
 
     public function testReceiveByWrongType()
     {
-        $this->expectException(MockException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('JsonMapper::mapClass() requires second argument to be a class name, ' .
             'InvalidClass given.');
         MockHelper::newApiCall()
@@ -786,7 +788,7 @@ public function fakeSerializeBy($argument)
 
     public function testReceiveByWrongDeserializerMethod()
     {
-        $this->expectException(MockException::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('Invalid argument found');
         MockHelper::newApiCall()
             ->requestBuilder((new RequestBuilder(RequestMethod::POST, '/simple/{tyu}')))
@@ -1326,7 +1328,7 @@ public function testTypeXml()
 
     public function testTypeXmlFailure()
     {
-        $this->expectException(MockException::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage(
             'Required value not found at XML path "/mockClass/new1[1]" during deserialization.'
         );
@@ -1349,7 +1351,7 @@ public function testTypeXmlFailure()
 
     public function testTypeInvalidJsonFailure()
     {
-        $this->expectException(MockException::class);
+        $this->expectException(JsonMapperException::class);
         $this->expectExceptionMessage(
             'Could not find required constructor arguments for Core\Tests\Mocking\Other\MockClass: body'
         );