Merge pull request #941 from oldskool/issue-717

Add JSON_BIGINT_AS_STRING solution for #717

Author: ruflin

CHANGELOG.md

@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file based on the
 ### Bugfixes
 
 ### Added
+- Connection option to convert JSON bigint results to strings can now be set [#717](https://github.com/ruflin/Elastica/issues/717)
 
 ### Improvements
 

lib/Elastica/Client.php

@@ -19,6 +19,7 @@ class Client
      *
      * log: Set to true, to enable logging, set a string to log to a specific file
      * retryOnConflict: Use in \Elastica\Client::updateDocument
+     * bigintConversion: Set to true to enable the JSON bigint to string conversion option (see issue #717)
      *
      * @var array
      */
@@ -35,6 +36,7 @@ class Client
         'roundRobin' => false,
         'log' => false,
         'retryOnConflict' => 0,
+        'bigintConversion' => false,
     );
 
     /**

lib/Elastica/Response.php

@@ -55,6 +55,13 @@ class Response
      */
     protected $_status = null;
 
+    /**
+     * Whether or not to convert bigint results to string (see issue #717)
+     *
+     * @var bool
+     */
+    protected $_jsonBigintConversion = false;
+
     /**
      * Construct.
      *
@@ -183,7 +190,11 @@ public function getData()
                 $this->_error = true;
             } else {
                 try {
-                    $response = JSON::parse($response);
+                    if ($this->getJsonBigintConversion()) {
+                        $response = JSON::parse($response, false, 512, JSON_BIGINT_AS_STRING);
+                    } else {
+                        $response = JSON::parse($response);
+                    }
                 } catch (JSONParseException $e) {
                     // leave response as is if parse fails
                 }
@@ -305,4 +316,24 @@ public function getScrollId()
 
         return $data['_scroll_id'];
     }
+
+    /**
+     * Sets whether or not to apply bigint conversion on the JSON result.
+     *
+     * @param bool $jsonBigintConversion
+     */
+    public function setJsonBigintConversion($jsonBigintConversion)
+    {
+        $this->_jsonBigintConversion = $jsonBigintConversion;
+    }
+
+    /**
+     * Gets whether or not to apply bigint conversion on the JSON result.
+     *
+     * @return boolean
+     */
+    public function getJsonBigintConversion()
+    {
+        return $this->_jsonBigintConversion;
+    }
 }

lib/Elastica/Transport/Guzzle.php

@@ -103,6 +103,9 @@ public function exec(Request $request, array $params)
 
         $response = new Response((string) $res->getBody(), $res->getStatusCode());
         $response->setQueryTime($end - $start);
+        if ($connection->hasConfig('bigintConversion')) {
+            $response->setJsonBigintConversion($connection->getConfig('bigintConversion'));
+        }
 
         $response->setTransferInfo(
             array(

lib/Elastica/Transport/Http.php

@@ -154,6 +154,9 @@ public function exec(Request $request, array $params)
         $response = new Response($responseString, curl_getinfo($conn, CURLINFO_HTTP_CODE));
         $response->setQueryTime($end - $start);
         $response->setTransferInfo(curl_getinfo($conn));
+        if ($connection->hasConfig('bigintConversion')) {
+            $response->setJsonBigintConversion($connection->getConfig('bigintConversion'));
+        }
 
         if ($response->hasError()) {
             throw new ResponseException($request, $response);