Merge pull request #16 from Palbahngmiyine/master

Release PHP SDK 5.0.2

Author: Palbahngmiyine

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solapi/sdk",
   "description": "SOLAPI SDK for PHP",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "type": "library",
   "license": "MIT",
   "autoload": {

src/Exceptions/UnknownException.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Nurigo\Solapi\Exceptions;
+
+use Exception;
+
+class UnknownException extends Exception
+{
+
+    /**
+     * @var mixed
+     */
+    public $response;
+
+    public function __construct($message = "", $errorResponse = null)
+    {
+        parent::__construct($message);
+        $this->response = $errorResponse;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+}

src/Libraries/Fetcher.php

@@ -3,7 +3,10 @@
 namespace Nurigo\Solapi\Libraries;
 
 use Exception;
+use Nurigo\Solapi\Exceptions\BaseException;
 use Nurigo\Solapi\Exceptions\CurlException;
+use Nurigo\Solapi\Exceptions\UnknownException;
+use Nurigo\Solapi\Models\Response\ErrorResponse;
 
 /**
  * @template T, R
@@ -51,7 +54,7 @@ public function __destruct()
      * @param string $method
      * @param string $uri
      * @param mixed $data
-     * @throws Exception|CurlException CURL 관련된 Exception
+     * @throws Exception|CurlException|BaseException|UnknownException CURL 관련된 Exception
      */
     public function request(string $method, string $uri, $data = false)
     {
@@ -76,13 +79,22 @@ public function request(string $method, string $uri, $data = false)
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_SSLVERSION, 3);
-        if (curl_error($curl)) {
+        $result = curl_exec($curl);
+        $jsonResult = json_decode($result);
+
+        if (curl_errno($curl)) {
             throw new CurlException(curl_error($curl));
         }
-        $result = curl_exec($curl);
+
+        $httpStatusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        if ($httpStatusCode >= 400 && $httpStatusCode <= 500) {
+            $errorResponse = new ErrorResponse($jsonResult);
+            throw new BaseException($errorResponse->errorMessage, $errorResponse->errorCode);
+        } else if ($httpStatusCode != 200) {
+            throw new UnknownException("Unknown Http Error Occurred", $result);
+        }
         curl_close($curl);
 
-        return json_decode($result);
+        return $jsonResult;
     }
 }

src/Models/Request/DefaultAgent.php

@@ -16,7 +16,7 @@ class DefaultAgent
 
     public function __construct()
     {
-        $this->sdkVersion = 'php/5.0.0';
+        $this->sdkVersion = 'php/5.0.2';
         $this->osPlatform = PHP_OS . " | " . phpversion();
     }
 }

src/Models/Response/ErrorResponse.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Nurigo\Solapi\Models\Response;
+
+use JsonSerializable;
+
+class ErrorResponse implements JsonSerializable
+{
+    /**
+     * @var string
+     */
+    public $errorCode;
+
+    /**
+     * @var string
+     */
+    public $errorMessage;
+
+    /**
+     * @param $value mixed
+     */
+    public function __construct($value)
+    {
+        $this->errorCode = $value->errorCode;
+        $this->errorMessage = $value->errorMessage;
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            "errorCode" => $this->errorCode,
+            "errorMessage" => $this->errorMessage
+        ];
+    }
+}

src/Services/SolapiMessageService.php

@@ -7,6 +7,7 @@
 use Nurigo\Solapi\Exceptions\BaseException;
 use Nurigo\Solapi\Exceptions\CurlException;
 use Nurigo\Solapi\Exceptions\MessageNotReceivedException;
+use Nurigo\Solapi\Exceptions\UnknownException;
 use Nurigo\Solapi\Libraries\Fetcher;
 use Nurigo\Solapi\Models\Message;
 use Nurigo\Solapi\Models\Request\GetGroupMessagesRequest;
@@ -41,7 +42,7 @@ public function __construct(string $apiKey, string $apiSecretKey)
      * @param Message|Message[] $messages
      * @param DateTime|null $scheduledDateTime
      * @return SendResponse
-     * @throws Exception|CurlException|MessageNotReceivedException
+     * @throws Exception|CurlException|MessageNotReceivedException|BaseException|UnknownException
      */
     public function send($messages, DateTime $scheduledDateTime = null): SendResponse
     {