Merge pull request php-curl-class#128 from zachborboa/master

Fix php-curl-class#126: Add configurable json decoder

Author: zachborboa

src/Curl/Curl.php

@@ -17,6 +17,7 @@ class Curl
     private $error_function = null;
     private $complete_function = null;
 
+    private $json_decoder = null;
     private $json_pattern = '~^application/(?:json|vnd\.api\+json)~i';
     private $xml_pattern = '~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
 
@@ -50,6 +51,7 @@ public function __construct()
 
         $this->curl = curl_init();
         $this->setDefaultUserAgent();
+        $this->setDefaultJsonDecoder();
         $this->setOpt(CURLINFO_HEADER_OUT, true);
         $this->setOpt(CURLOPT_RETURNTRANSFER, true);
         $this->headers = new CaseInsensitiveArray();
@@ -241,6 +243,20 @@ public function setDefaultUserAgent()
         $this->setUserAgent($user_agent);
     }
 
+    public function setDefaultJsonDecoder() {
+        $this->json_decoder = function($response) {
+            $json_obj = json_decode($response, false);
+            if (!($json_obj === null)) {
+                $response = $json_obj;
+            }
+            return $response;
+        };
+    }
+
+    public function setJsonDecoder($func) {
+        $this->json_decoder = $func;
+    }
+
     public function setUserAgent($user_agent)
     {
         $this->setOpt(CURLOPT_USERAGENT, $user_agent);
@@ -370,14 +386,11 @@ private function parseRequestHeaders($raw_headers)
 
     private function parseResponse($response_headers, $raw_response)
     {
-
         $response = $raw_response;
         if (isset($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;
-                }
+                $json_decoder = $this->json_decoder;
+                $response = $json_decoder($response);
             } elseif (preg_match($this->xml_pattern, $response_headers['Content-Type'])) {
                 $xml_obj = @simplexml_load_string($response);
                 if (!($xml_obj === false)) {

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -735,6 +735,27 @@ public function testJSONResponse()
         }
     }
 
+    public function testJSONDecoder()
+    {
+        $data = array(
+            'key' => 'Content-Type',
+            'value' => 'application/json',
+        );
+
+        $test = new Test();
+        $test->server('json_response', 'POST', $data);
+        $this->assertTrue(is_object($test->curl->response));
+        $this->assertFalse(is_array($test->curl->response));
+
+        $test = new Test();
+        $test->curl->setJsonDecoder(function($response) {
+            return json_decode($response, true);
+        });
+        $test->server('json_response', 'POST', $data);
+        $this->assertFalse(is_object($test->curl->response));
+        $this->assertTrue(is_array($test->curl->response));
+    }
+
     public function testXMLResponse()
     {
         foreach (array(