Moved json_parse to a separate file

composer.json

@@ -42,6 +42,9 @@
   "autoload": {
     "psr-4": {
       "RingCentral\\": "lib/"
-    }
+    },
+    "files": [
+      "src/core/functions.php"
+    ]
   }
 }

src/autoload.php

@@ -23,4 +23,6 @@ function RingCentralAutoLoader($class)
 
 }
 
+require_once('core/functions.php');
+
 spl_autoload_register('RingCentralAutoLoader', true);

src/core/functions.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace RingCentral\core;
+
+use InvalidArgumentException;
+
+function json_parse($json, $assoc = false, $depth = 512)
+{
+
+    $parsed = \json_decode($json, $assoc, $depth);
+
+    $error = json_last_error();
+
+    switch ($error) {
+        case JSON_ERROR_NONE:
+            break;
+        case JSON_ERROR_DEPTH:
+            throw new InvalidArgumentException('JSON Error: Maximum stack depth exceeded');
+            break;
+        case JSON_ERROR_CTRL_CHAR:
+            throw new InvalidArgumentException('JSON Error: Unexpected control character found');
+            break;
+        case JSON_ERROR_SYNTAX:
+            throw new InvalidArgumentException('JSON Error: Syntax error, malformed JSON');
+            break;
+        default:
+            throw new InvalidArgumentException('JSON Error: Unknown error');
+            break;
+    }
+
+    // This is a courtesy by PHP JSON parser to parse "null" into null, but this is an error situation
+    if (empty($parsed)) {
+        throw new InvalidArgumentException('JSON Error: Result is empty after parsing');
+    }
+
+    return $parsed;
+
+}

src/http/Transaction.php

@@ -86,38 +86,14 @@ public function getJson($asObject = true)
 
         if (($asObject && empty($this->jsonAsObject)) || (!$asObject && empty($this->jsonAsArray))) {
 
-            $json = json_decode((string)$this->response->getBody(), !$asObject);
+            $json = \RingCentral\core\json_parse((string)$this->response->getBody(), !$asObject);
 
             if ($asObject) {
                 $this->jsonAsObject = $json;
             } else {
                 $this->jsonAsArray = $json;
             }
 
-            $error = json_last_error();
-
-            switch ($error) {
-                case JSON_ERROR_NONE:
-                    break;
-                case JSON_ERROR_DEPTH:
-                    throw new Exception('JSON Error: Maximum stack depth exceeded');
-                    break;
-                case JSON_ERROR_CTRL_CHAR:
-                    throw new Exception('JSON Error: Unexpected control character found');
-                    break;
-                case JSON_ERROR_SYNTAX:
-                    throw new Exception('JSON Error: Syntax error, malformed JSON');
-                    break;
-                default:
-                    throw new Exception('JSON Error: Unknown error');
-                    break;
-            }
-
-            // This is a courtesy by PHP JSON parser to parse "null" into null, but this is an error situation
-            if (empty($json)) {
-                throw new Exception('JSON Error: Result is empty after parsing');
-            }
-
         }
 
         return $asObject ? $this->jsonAsObject : $this->jsonAsArray;

src/mocks/SubscriptionMock.php

@@ -22,7 +22,7 @@ public function __construct($expiresIn = 54000)
     public function getResponse(RequestInterface $request)
     {
 
-        $body = json_decode((string)$request->getBody(), true);
+        $body = \RingCentral\core\json_parse((string)$request->getBody(), true);
 
         return self::createBody(array(
             'eventFilters'   => $body['eventFilters'],

src/subscription/Subscription.php

@@ -269,7 +269,7 @@ public function notify($pubnubMessage)
                 base64_decode($message),
                 MCRYPT_MODE_ECB);
 
-            $message = json_decode($aes->unPadPKCS7($message, 128), true); // PUBNUB itself always decode as array
+            $message = \RingCentral\core\json_parse($aes->unPadPKCS7($message, 128), true); // PUBNUB itself always decode as array
 
         }