Add json encoding when request header Content-Type is set to application/json

Author: zachborboa

src/Curl/Curl.php

@@ -17,6 +17,9 @@ class Curl
     private $error_function = null;
     private $complete_function = null;
 
+    private $json_pattern = '~^application/(?:json|vnd\.api\+json)~i';
+    private $xml_pattern = '~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
+
     public $curl;
     public $curls;
 
@@ -369,12 +372,12 @@ private function parseResponse($response_headers, $raw_response)
 
         $response = $raw_response;
         if (isset($response_headers['Content-Type'])) {
-            if (preg_match('~^application/(?:json|vnd\.api\+json)~i', $response_headers['Content-Type'])) {
+            if (preg_match($this->json_pattern, $response_headers['Content-Type'])) {
                 $json_obj = json_decode($response, false);
                 if ($json_obj !== null) {
                     $response = $json_obj;
                 }
-            } elseif (preg_match('~^(?:text/|application/(?:atom\+|rss\+)?)xml~i', $response_headers['Content-Type'])) {
+            } elseif (preg_match($this->xml_pattern, $response_headers['Content-Type'])) {
                 $xml_obj = @simplexml_load_string($response);
                 if (!($xml_obj === false)) {
                     $response = $xml_obj;
@@ -432,7 +435,15 @@ private function postfields($data)
                 }
 
                 if (!$binary_data) {
-                    $data = http_build_query($data);
+                    if (isset($this->headers['Content-Type']) &&
+                        preg_match($this->json_pattern, $this->headers['Content-Type'])) {
+                        $json_str = json_encode($data);
+                        if (!($json_str === false)) {
+                            $data = $json_str;
+                        }
+                    } else {
+                        $data = http_build_query($data);
+                    }
                 }
             }
         }

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -649,6 +649,37 @@ public function testPostCurlFileFormDataContentType()
         $this->assertFalse(file_exists($file_path));
     }
 
+    public function testJSONRequest()
+    {
+        $data = array('key' => 'value');
+        $expected_response = '{"key":"value"}';
+
+        $test = new Test();
+        $this->assertEquals($expected_response, $test->server('post_json', 'POST', json_encode($data)));
+
+        foreach (array(
+            'Content-Type',
+            'content-type',
+            'CONTENT-TYPE') as $key) {
+            foreach (array(
+                'APPLICATION/JSON',
+                'APPLICATION/JSON; CHARSET=UTF-8',
+                'APPLICATION/JSON;CHARSET=UTF-8',
+                'application/json',
+                'application/json; charset=utf-8',
+                'application/json;charset=UTF-8',
+                ) as $value) {
+                $test = new Test();
+                $test->curl->setHeader($key, $value);
+                $this->assertEquals($expected_response, $test->server('post_json', 'POST', json_encode($data)));
+
+                $test = new Test();
+                $test->curl->setHeader($key, $value);
+                $this->assertEquals($expected_response, $test->server('post_json', 'POST', $data));
+            }
+        }
+    }
+
     public function testJSONResponse()
     {
         function assertion($key, $value)

tests/PHPCurlClass/server.php

@@ -50,6 +50,9 @@
 } elseif ($test === 'post') {
     echo http_build_query($_POST);
     exit;
+} elseif ($test === 'post_json') {
+    echo $http_raw_post_data;
+    exit;
 } elseif ($test === 'put') {
     echo $http_raw_post_data;
     exit;