enmi-conf.org: comparison wp/wp-includes/class-json.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 <?php
+_deprecated_file( basename( __FILE__ ), '5.3.0', null, 'The PHP native JSON extension is now a requirement.' );
 if ( ! class_exists( 'Services_JSON' ) ) :
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
 * Converts to and from JSON format.
 *
 *
 * <code>
 * // create a new instance of Services_JSON
 * $json = new Services_JSON();
 *
-* // convert a complexe value to JSON notation, and send it to the browser
+* // convert a complex value to JSON notation, and send it to the browser
 * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
 * $output = $json->encode($value);
 *
 * print($output);
 * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
 */
 class Services_JSON
 {
 /**
 * constructs a new JSON instance
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    int     $use    object behavior flags; combine with boolean-OR
 *
 *                           possible values:
 *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
 *                                   strings or numbers, if you return an object, make sure it does
 *                                   not have a toJSON method, otherwise an error will occur.
 */
 function __construct( $use = 0 )
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 $this->use = $use;
 $this->_mb_strlen            = function_exists('mb_strlen');
 $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
 $this->_mb_substr            = function_exists('mb_substr');
 }
 	/**
 	 * PHP4 constructor.
+*
+* @deprecated 5.3.0 Use __construct() instead.
+*
+* @see Services_JSON::__construct()
 	 */
 	public function Services_JSON( $use = 0 ) {
+		_deprecated_constructor( 'Services_JSON', '5.3.0', get_class( $this ) );
 		self::__construct( $use );
 	}
 // private - cache the mbstring lookup results..
 var $_mb_strlen = false;
 var $_mb_substr = false;
 *
 * Normally should be handled by mb_convert_encoding, but
 * provides a slower PHP-only method for installations
 * that lack the multibye string extension.
 *
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
+*
 * @param    string  $utf16  UTF-16 character
 * @return   string  UTF-8 character
 * @access   private
 */
 function utf162utf8($utf16)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 // oh please oh please oh please oh please oh please
 if($this->_mb_convert_encoding) {
 return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
 }
-$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 switch(true) {
 case ((0x7F & $bytes) == $bytes):
 // this case should never be reached, because we are in ASCII range
 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 /**
 * convert a string from one UTF-8 char to one UTF-16 char
 *
 * Normally should be handled by mb_convert_encoding, but
 * provides a slower PHP-only method for installations
-* that lack the multibye string extension.
+* that lack the multibyte string extension.
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    string  $utf8   UTF-8 character
 * @return   string  UTF-16 character
 * @access   private
 */
 function utf82utf16($utf8)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 // oh please oh please oh please oh please oh please
 if($this->_mb_convert_encoding) {
 return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
 }
 return $utf8;
 case 2:
 // return a UTF-16 character from a 2-byte UTF-8 char
 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-return chr(0x07 & (ord($utf8{0}) >> 2))
+return chr(0x07 & (ord($utf8[0]) >> 2))
-. chr((0xC0 & (ord($utf8{0}) << 6))
+. chr((0xC0 & (ord($utf8[0]) << 6))
-| (0x3F & ord($utf8{1})));
+| (0x3F & ord($utf8[1])));
 case 3:
 // return a UTF-16 character from a 3-byte UTF-8 char
 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-return chr((0xF0 & (ord($utf8{0}) << 4))
+return chr((0xF0 & (ord($utf8[0]) << 4))
-| (0x0F & (ord($utf8{1}) >> 2)))
+| (0x0F & (ord($utf8[1]) >> 2)))
-. chr((0xC0 & (ord($utf8{1}) << 6))
+. chr((0xC0 & (ord($utf8[1]) << 6))
-| (0x7F & ord($utf8{2})));
+| (0x7F & ord($utf8[2])));
 }
 // ignoring UTF-32 for now, sorry
 return '';
 }
 /**
 * encodes an arbitrary variable into JSON format (and sends JSON Header)
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
 *                           if var is a string, note that encode() always expects it
 *                           to be in ASCII or UTF-8 format!
 * @return   mixed   JSON string representation of input var or an error if a problem occurs
 * @access   public
 */
 function encode($var)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 header('Content-type: application/json');
 return $this->encodeUnsafe($var);
 }
 /**
 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
 *                           if var is a string, note that encode() always expects it
 *                           to be in ASCII or UTF-8 format!
 * @return   mixed   JSON string representation of input var or an error if a problem occurs
 * @access   public
 */
 function encodeUnsafe($var)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 // see bug #16908 - regarding numeric locale printing
 $lc = setlocale(LC_NUMERIC, 0);
 setlocale(LC_NUMERIC, 'C');
 $ret = $this->_encode($var);
 setlocale(LC_NUMERIC, $lc);
 }
 /**
 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
 *
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
+*
 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
 *                           if var is a string, note that encode() always expects it
 *                           to be in ASCII or UTF-8 format!
 *
 * @return   mixed   JSON string representation of input var or an error if a problem occurs
 * @access   public
 */
 function _encode($var)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 switch (gettype($var)) {
 case 'boolean':
 return $var ? 'true' : 'false';
 case 'NULL':
 * Iterate over every character in the string,
 * escaping with a slash or encoding to UTF-8 where necessary
 */
 for ($c = 0; $c < $strlen_var; ++$c) {
-$ord_var_c = ord($var{$c});
+$ord_var_c = ord($var[$c]);
 switch (true) {
 case $ord_var_c == 0x08:
 $ascii .= '\b';
 break;
 case $ord_var_c == 0x22:
 case $ord_var_c == 0x2F:
 case $ord_var_c == 0x5C:
 // double quote, slash, slosh
-$ascii .= '\\'.$var{$c};
+$ascii .= '\\'.$var[$c];
 break;
 case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
 // characters U-00000000 - U-0000007F (same as ASCII)
-$ascii .= $var{$c};
+$ascii .= $var[$c];
 break;
 case (($ord_var_c & 0xE0) == 0xC0):
 // characters U-00000080 - U-000007FF, mask 110XXXXX
 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 $c += 1;
 $ascii .= '?';
 break;
 }
-$char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+$char = pack('C*', $ord_var_c, ord($var[$c + 1]));
 $c += 1;
 $utf16 = $this->utf82utf16($char);
 $ascii .= sprintf('\u%04s', bin2hex($utf16));
 break;
 break;
 }
 // characters U-00000800 - U-0000FFFF, mask 1110XXXX
 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 $char = pack('C*', $ord_var_c,
-@ord($var{$c + 1}),
+@ord($var[$c + 1]),
-@ord($var{$c + 2}));
+@ord($var[$c + 2]));
 $c += 2;
 $utf16 = $this->utf82utf16($char);
 $ascii .= sprintf('\u%04s', bin2hex($utf16));
 break;
 break;
 }
 // characters U-00010000 - U-001FFFFF, mask 11110XXX
 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 $char = pack('C*', $ord_var_c,
-ord($var{$c + 1}),
+ord($var[$c + 1]),
-ord($var{$c + 2}),
+ord($var[$c + 2]),
-ord($var{$c + 3}));
+ord($var[$c + 3]));
 $c += 3;
 $utf16 = $this->utf82utf16($char);
 $ascii .= sprintf('\u%04s', bin2hex($utf16));
 break;
 $c += 4;
 $ascii .= '?';
 break;
 }
 $char = pack('C*', $ord_var_c,
-ord($var{$c + 1}),
+ord($var[$c + 1]),
-ord($var{$c + 2}),
+ord($var[$c + 2]),
-ord($var{$c + 3}),
+ord($var[$c + 3]),
-ord($var{$c + 4}));
+ord($var[$c + 4]));
 $c += 4;
 $utf16 = $this->utf82utf16($char);
 $ascii .= sprintf('\u%04s', bin2hex($utf16));
 break;
 break;
 }
 // characters U-04000000 - U-7FFFFFFF, mask 1111110X
 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 $char = pack('C*', $ord_var_c,
-ord($var{$c + 1}),
+ord($var[$c + 1]),
-ord($var{$c + 2}),
+ord($var[$c + 2]),
-ord($var{$c + 3}),
+ord($var[$c + 3]),
-ord($var{$c + 4}),
+ord($var[$c + 4]),
-ord($var{$c + 5}));
+ord($var[$c + 5]));
 $c += 5;
 $utf16 = $this->utf82utf16($char);
 $ascii .= sprintf('\u%04s', bin2hex($utf16));
 break;
 }
 }
 /**
 * array-walking function for use in generating JSON-formatted name-value pairs
 *
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
+*
 * @param    string  $name   name of key to use
 * @param    mixed   $value  reference to an array element to be encoded
 *
 * @return   string  JSON-formatted name-value pair, like '"name":value'
 * @access   private
 */
 function name_value($name, $value)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 $encoded_value = $this->_encode($value);
 if(Services_JSON::isError($encoded_value)) {
 return $encoded_value;
 }
 return $this->_encode(strval($name)) . ':' . $encoded_value;
 }
 /**
 * reduce a string by removing leading and trailing comments and whitespace
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    $str    string      string value to strip of comments and whitespace
 *
 * @return   string  string value stripped of comments and whitespace
 * @access   private
 */
 function reduce_string($str)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 $str = preg_replace(array(
 // eliminate single line comments in '// ...' form
 '#^\s*//(.+)$#m',
 return trim($str);
 }
 /**
 * decodes a JSON string into appropriate variable
+*
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
 *
 * @param    string  $str    JSON-formatted string
 *
 * @return   mixed   number, boolean, string, array, or object
 *                   corresponding to given JSON input string.
 *                   in ASCII or UTF-8 format!
 * @access   public
 */
 function decode($str)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 $str = $this->reduce_string($str);
 switch (strtolower($str)) {
 case 'true':
 return true;
 $strlen_chrs = $this->strlen8($chrs);
 for ($c = 0; $c < $strlen_chrs; ++$c) {
 $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-$ord_chrs_c = ord($chrs{$c});
+$ord_chrs_c = ord($chrs[$c]);
 switch (true) {
 case $substr_chrs_c_2 == '\b':
 $utf8 .= chr(0x08);
 ++$c;
 case $substr_chrs_c_2 == '\\\'':
 case $substr_chrs_c_2 == '\\\\':
 case $substr_chrs_c_2 == '\\/':
 if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
 ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-$utf8 .= $chrs{++$c};
+$utf8 .= $chrs[++$c];
 }
 break;
 case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
 // single, escaped unicode character
 $utf8 .= $this->utf162utf8($utf16);
 $c += 5;
 break;
 case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-$utf8 .= $chrs{$c};
+$utf8 .= $chrs[$c];
 break;
 case ($ord_chrs_c & 0xE0) == 0xC0:
 // characters U-00000080 - U-000007FF, mask 110XXXXX
 //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 return $utf8;
 } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
 // array, or object notation
-if ($str{0} == '[') {
+if ($str[0] == '[') {
 $stk = array(SERVICES_JSON_IN_ARR);
 $arr = array();
 } else {
 if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
 $stk = array(SERVICES_JSON_IN_OBJ);
 for ($c = 0; $c <= $strlen_chrs; ++$c) {
 $top = end($stk);
 $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
 // found a comma that is not inside a string, array, etc.,
 // OR we've reached the end of the character list
 $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
 array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
 //print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 // element in an associative array,
 // for now
 $parts = array();
 if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
-	                              // "name":value pair
+// "name":value pair
 $key = $this->decode($parts[1]);
 $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
 if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
 $obj[$key] = $val;
 } else {
 }
 }
 }
-} elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+} elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
 // found a quote, and we are not inside a string
-array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
 //print("Found start of string at {$c}\n");
-} elseif (($chrs{$c} == $top['delim']) &&
+} elseif (($chrs[$c] == $top['delim']) &&
 ($top['what'] == SERVICES_JSON_IN_STR) &&
 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
 // found a quote, we're in a string, and it's not escaped
 // we know that it's not escaped because there is _not_ an
 // odd number of backslashes at the end of the string so far
 array_pop($stk);
 //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-} elseif (($chrs{$c} == '[') &&
+} elseif (($chrs[$c] == '[') &&
 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
 // found a left-bracket, and we are in an array, object, or slice
 array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
 //print("Found start of array at {$c}\n");
-} elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+} elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
 // found a right-bracket, and we're in an array
 array_pop($stk);
 //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-} elseif (($chrs{$c} == '{') &&
+} elseif (($chrs[$c] == '{') &&
 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
 // found a left-brace, and we are in an array, object, or slice
 array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
 //print("Found start of object at {$c}\n");
-} elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+} elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
 // found a right-brace, and we're in an object
 array_pop($stk);
 //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 } elseif (($substr_chrs_c_2 == '/*') &&
 }
 }
 }
 /**
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
+*
 * @todo Ultimately, this should just call PEAR::isError()
 */
 function isError($data, $code = null)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 if (class_exists('pear')) {
 return PEAR::isError($data, $code);
 } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
 is_subclass_of($data, 'services_json_error'))) {
 return true;
 return false;
 }
 /**
 * Calculates length of string in bytes
-* @param string
+*
-* @return integer length
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
-*/
+*
+* @param string
+* @return integer length
+*/
 function strlen8( $str )
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 if ( $this->_mb_strlen ) {
 return mb_strlen( $str, "8bit" );
 }
 return strlen( $str );
 }
 /**
 * Returns part of a string, interpreting $start and $length as number of bytes.
-* @param string
+*
-* @param integer start
+* @deprecated 5.3.0 Use the PHP native JSON extension instead.
-* @param integer length
+*
-* @return integer length
+* @param string
-*/
+* @param integer start
+* @param integer length
+* @return integer length
+*/
 function substr8( $string, $start, $length=false )
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 if ( $length === false ) {
 $length = $this->strlen8( $string ) - $start;
 }
 if ( $this->_mb_substr ) {
 return mb_substr( $string, $start, $length, "8bit" );
 if (class_exists('PEAR_Error')) {
 class Services_JSON_Error extends PEAR_Error
 {
+	    /**
+	     * PHP5 constructor.
+	     *
+	     * @deprecated 5.3.0 Use the PHP native JSON extension instead.
+	     */
 function __construct($message = 'unknown error', $code = null,
 $mode = null, $options = null, $userinfo = null)
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
 }
-	public function Services_JSON_Error($message = 'unknown error', $code = null,
+	    /**
+	     * PHP4 constructor.
+	     *
+	     * @deprecated 5.3.0 Use __construct() instead.
+	     *
+	     * @see Services_JSON_Error::__construct()
+	     */
+		public function Services_JSON_Error($message = 'unknown error', $code = null,
 $mode = null, $options = null, $userinfo = null) {
-		self::__construct($message = 'unknown error', $code = null,
+			_deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
-$mode = null, $options = null, $userinfo = null);
+			self::__construct($message, $code, $mode, $options, $userinfo);
-	}
+		}
 }
 } else {
 /**
 */
 class Services_JSON_Error
 {
 	    /**
 	     * PHP5 constructor.
+	     *
+	     * @deprecated 5.3.0 Use the PHP native JSON extension instead.
 	     */
 function __construct( $message = 'unknown error', $code = null,
 $mode = null, $options = null, $userinfo = null )
 {
+_deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 }
 	    /**
 	     * PHP4 constructor.
+	     *
+	     * @deprecated 5.3.0 Use __construct() instead.
+	     *
+	     * @see Services_JSON_Error::__construct()
 	     */
 		public function Services_JSON_Error( $message = 'unknown error', $code = null,
 	                                     $mode = null, $options = null, $userinfo = null ) {
+			_deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
 			self::__construct( $message, $code, $mode, $options, $userinfo );
 		}
 }
 }
 endif;

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a