diff options
Diffstat (limited to 'vendor/ruflin/elastica/lib/Elastica/JSON.php')
-rw-r--r-- | vendor/ruflin/elastica/lib/Elastica/JSON.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vendor/ruflin/elastica/lib/Elastica/JSON.php b/vendor/ruflin/elastica/lib/Elastica/JSON.php index 07869821..921bc484 100644 --- a/vendor/ruflin/elastica/lib/Elastica/JSON.php +++ b/vendor/ruflin/elastica/lib/Elastica/JSON.php @@ -1,23 +1,22 @@ <?php - namespace Elastica; use Elastica\Exception\JSONParseException; /** - * Elastica JSON tools - * - * @package Elastica + * Elastica JSON tools. */ class JSON { /** - * Parse JSON string to an array + * Parse JSON string to an array. * - * @param string $json JSON string to parse - * @return array PHP array representation of JSON string * @link http://php.net/manual/en/function.json-decode.php - * @link http://www.php.net/manual/en/function.json-last-error.php + * @link http://php.net/manual/en/function.json-last-error.php + * + * @param string $json JSON string to parse + * + * @return array PHP array representation of JSON string */ public static function parse(/* inherit from json_decode */) { @@ -43,11 +42,13 @@ class JSON } /** - * Convert input to JSON string with standard options + * Convert input to JSON string with standard options. + * + * @link http://php.net/manual/en/function.json-encode.php * * @param mixed check args for PHP function json_encode + * * @return string Valid JSON representation of $input - * @link http://php.net/manual/en/function.json-encode.php */ public static function stringify(/* inherit from json_encode */) { @@ -57,8 +58,7 @@ class JSON // allow special options value for Elasticsearch compatibility if (sizeof($args) > 1 && $args[1] === 'JSON_ELASTICSEARCH') { // Use built in JSON constants if available (php >= 5.4) - $args[1] = (defined('JSON_UNESCAPED_SLASHES') ? JSON_UNESCAPED_SLASHES : 64) - | (defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 256); + $args[1] = defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 256; } // run encode and output |