cbenard
diff --git a/‎CHANGELOG
Lines changed: 1 addition & 0 deletions b/‎CHANGELOG
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/codebird.php
Lines changed: 21 additions & 3 deletions b/‎src/codebird.php
Lines changed: 21 additions & 3 deletions
diff --git a/‎test/requestparse_tests.php
Lines changed: 19 additions & 0 deletions b/‎test/requestparse_tests.php
Lines changed: 19 additions & 0 deletions
@@ -6,6 +6,7 @@ codebird-php - changelog
 + #152 Throw Exception on failed remote media download
 + Add REST API POST statuses/unretweet/:id
 + Add Ads API GET insights/keywords/search
++ #151 Avoid JSON_BIGINT_AS_STRING errors
 
 3.0.0 (2016-01-01)
 + Add unit testing suite
 
@@ -996,6 +996,24 @@ protected function _mapFnInlineParams($method, &$apiparams)
     return [$method, $method_template];
   }
 
+  /**
+   * Avoids any JSON_BIGINT_AS_STRING errors
+   *
+   * @param string       $data       JSON data to decode
+   * @param int optional $need_array Decode as array, otherwise as object
+   *
+   * @return array|object The decoded object
+   */
+  protected function _json_decode($data, $need_array = false)
+  {
+    if (!(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
+      return json_decode($data, $need_array, 512, JSON_BIGINT_AS_STRING);
+    }
+    $max_int_length = strlen((string) PHP_INT_MAX) - 1;
+    $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $data);
+    $obj = json_decode($json_without_bigints, $need_array);
+    return $obj;
+  }
 
   /**
    * Uncommon API methods
@@ -1336,7 +1354,7 @@ protected function _parseBearerReply($result, $httpstatus)
         break;
       case CODEBIRD_RETURNFORMAT_JSON:
         if ($httpstatus === 200) {
-          $parsed = json_decode($reply, false, 512, JSON_BIGINT_AS_STRING);
+          $parsed = $this->_json_decode($reply);
           self::setBearerToken($parsed->access_token);
         }
         break;
@@ -2232,7 +2250,7 @@ protected function _appendHttpStatusAndRate($reply, $httpstatus, $rate)
         $reply->rate       = $rate;
         break;
       case CODEBIRD_RETURNFORMAT_JSON:
-        $reply             = json_decode($reply);
+        $reply             = $this->_json_decode($reply);
         $reply->httpstatus = $httpstatus;
         $reply->rate       = $rate;
         $reply             = json_encode($reply);
@@ -2566,7 +2584,7 @@ protected function _parseApiReply($reply)
           return new \stdClass;
       }
     }
-    if (! $parsed = json_decode($reply, $need_array, 512, JSON_BIGINT_AS_STRING)) {
+    if (! $parsed = $this->_json_decode($reply, $need_array)) {
       if ($reply) {
         // assume query format
         $reply = explode('&', $reply);
 
@@ -190,4 +190,23 @@ public function testMapFnInlineParams()
     $this->assertArrayNotHasKey('resumeId', $apiparams);
     $this->assertEquals(['test' => 1], $apiparams);
   }
+
+  /**
+   * Tests _json_decode
+   */
+  public function testJsonDecode()
+  {
+    $json  = '{"id": 123456789123456789, "id_str": "123456789123456789"}';
+    $array = [
+      'id' => 123456789123456789,
+      'id_str' => '123456789123456789'
+    ];
+    $object = (object) $array;
+
+    $cb = $this->getCB();
+    $result = $cb->call('_json_decode', [$json]);
+    $this->assertEquals($object, $result);
+    $result = $cb->call('_json_decode', [$json, true]);
+    $this->assertEquals($array, $result);
+  }
 }