Merge branch 'master' of https://github.com/o2system/curl

o2system · Apr 29, 2019 · f7e7b4c · f7e7b4c
2 parents 6bf75b5 + 9aec3db
commit f7e7b4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Request.php b/src/Request.php
@@ -623,10 +623,15 @@ public function getResponse()
      *
      * @return bool|\O2System\Curl\Response
      */
-    public function post(array $fields = [])
+    public function post(array $fields = [], $format = 'QUERY')
     {
         $this->curlOptions[ CURLOPT_POST ] = true;
-        $this->curlOptions[ CURLOPT_POSTFIELDS ] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);
+
+        if ($format === 'QUERY') {
+            $this->curlOptions[ CURLOPT_POSTFIELDS ] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);
+        } elseif ($format === 'JSON') {
+            $this->curlOptions[ CURLOPT_POSTFIELDS ] = json_encode($fields);
+        }
 
         return $this->getResponse();
     }

diff --git a/src/Response/SimpleJSONElement.php b/src/Response/SimpleJSONElement.php
@@ -31,13 +31,6 @@ class SimpleJSONElement extends SplArrayObject
      */
     public function __construct(array $elements = [])
     {
-        foreach ($elements as $key => $value) {
-            if (strpos($key, '_') !== false) {
-                $elements[ camelcase($key) ] = $value;
-                unset($elements[ $key ]);
-            }
-        }
-
         parent::__construct($elements);
     }
 }