Merge pull request #17 from Palbahngmiyine/master

Release PHP SDK 5.0.3

Author: Palbahngmiyine

composer.json

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

src/Libraries/Fetcher.php

@@ -67,10 +67,13 @@ public function request(string $method, string $uri, $data = false)
             case "POST":
             case "PUT":
             case "DELETE":
-                if ($data) curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
+                if ($data) {
+                    $data = NullEliminator::array_null_eliminate((array)$data);
+                    $data = json_encode($data);
+                    curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+                }
                 break;
             case "GET":
-            default:
                 if ($data) $url = sprintf("%s?%s", $url, http_build_query($data));
                 break;
         }

src/Libraries/NullEliminator.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Nurigo\Solapi\Libraries;
+
+class NullEliminator
+{
+    static function array_null_eliminate(array $data): array
+    {
+        $result = array();
+        foreach ($data as $key => $value) {
+            $tempValue = null;
+            if (is_array($value) || is_object($value)) {
+                $tempValue = self::array_null_eliminate((array)$value);
+            } else if (!is_null($value)) {
+                $tempValue = $value;
+            }
+            if (!is_null($tempValue)) {
+                $result[$key] = $tempValue;
+            }
+        }
+        return $result;
+    }
+}

src/Models/Kakao/KakaoOption.php

@@ -148,6 +148,5 @@ public function setButtons(array $buttons): KakaoOption
     public function __construct()
     {
         $this->variables = new stdClass();
-        unset($this->buttons);
     }
 }

src/Models/Message.php

@@ -258,16 +258,4 @@ public function setKakaoOptions(KakaoOption $kakaoOptions): Message
         $this->kakaoOptions = $kakaoOptions;
         return $this;
     }
-
-    public function __construct()
-    {
-        unset($this->text);
-        unset($this->kakaoOptions);
-        unset($this->subject);
-        unset($this->imageId);
-        unset($this->autoTypeDetect);
-        unset($this->groupId);
-        unset($this->messageId);
-        unset($this->type);
-    }
 }

src/Models/Request/DefaultAgent.php

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