Fix #26: V2 validation message

Trunkrs · Feb 5, 2021 · 3831f2a · 3831f2a
1 parent 717d944
commit 3831f2a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.1
+2.0.1
diff --git a/lib/Exception/ServerValidationException.php b/lib/Exception/ServerValidationException.php
@@ -2,7 +2,7 @@
 
 namespace Trunkrs\SDK\Exception;
 
-use Throwable;
+use Trunkrs\SDK\Settings;
 
 class ServerValidationException extends \Exception {
     private $_message;
@@ -13,9 +13,18 @@ public function __construct(array $response)
             ? json_decode($response["body"])
             : null;
 
-        $this->_message = $json
-            ? $json->message
-            : "No validation message specified.";
+        switch (Settings::$apiVersion) {
+            case 1:
+                $this->_message = $json
+                    ? $json->message
+                    : "No validation message specified.";
+                break;
+            case 2:
+                $this->_message = $json
+                    ? $json->reason
+                    : "No validation message specified.";
+                break;
+        }
 
         parent::__construct(
             sprintf("Your payload did not match the expectation of the Trunkrs API\n\nValidation: %s", $this->_message)

diff --git a/lib/Settings.php b/lib/Settings.php
@@ -38,7 +38,7 @@ class Settings {
     /**
      * @var string The current version of the SDK.
      */
-    public static $sdkVersion = '2.0.0';
+    public static $sdkVersion = '2.0.1';
 
     /**
      * Sets the client credentials that will be used in subsequent requests.

diff --git a/tests/SDK/RequestHandler/GeneralTest.php b/tests/SDK/RequestHandler/GeneralTest.php
@@ -62,7 +62,8 @@ public function testAppliesSDKUserAgent() {
         RequestHandler::get("shipments");
     }
 
-    public function testApiValidationMessageInException() {
+    public function testApiValidationMessageV1InException() {
+        Settings::setApiVersion(1);
         $message = uniqid();
         $this->mockResponse(422, [
             'message' => $message,
@@ -74,4 +75,18 @@ public function testApiValidationMessageInException() {
             $this->assertEquals($message, $exception->getValidationMessage());
         }
     }
+
+    public function testApiValidationMessageV2InException() {
+        $message = uniqid();
+        Settings::setApiVersion(2);
+        $this->mockResponse(422, [
+            'reason' => $message,
+        ]);
+
+        try {
+            RequestHandler::post("shipments", []);
+        } catch (ServerValidationException $exception) {
+            $this->assertEquals($message, $exception->getValidationMessage());
+        }
+    }
 }