tweet_live: comparison web/lib/Zend/Json/Encoder.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Json
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Encoder.php 22452 2010-06-18 18:13:23Z ralph $
+* @version    $Id: Encoder.php 25059 2012-11-02 21:01:06Z rob $
 */
 /**
 * Encode PHP constructs to JSON
 *
 * @category   Zend
 * @package    Zend_Json
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Json_Encoder
 {
 /**
 * @return string  The encoded value
 */
 public static function encode($value, $cycleCheck = false, $options = array())
 {
 $encoder = new self(($cycleCheck) ? true : false, $options);
 return $encoder->_encodeValue($value);
 }
 /**
 * Recursive driver which determines the type of value to be encoded
 * and then dispatches to the appropriate method. $values are either
 *    - objects (returns from {@link _encodeObject()})
 *    - arrays (returns from {@link _encodeArray()})
 *    - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
 *
-* @param $value mixed The value to be encoded
+* @param mixed $value The value to be encoded
 * @return string Encoded value
 */
 protected function _encodeValue(&$value)
 {
 if (is_object($value)) {
 *
 * A special property is added to the JSON object called '__className'
 * that contains the name of the class of $value. This is used to decode
 * the object on the client into a specific class.
 *
-* @param $value object
+* @param object $value
 * @return string
 * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
 */
 protected function _encodeObject(&$value)
 {
 $this->_visited[] = $value;
 }
 $props = '';
+if (method_exists($value, 'toJson')) {
-if ($value instanceof Iterator) {
+$props =',' . preg_replace("/^\{(.*)\}$/","\\1",$value->toJson());
-$propCollection = $value;
 } else {
-$propCollection = get_object_vars($value);
+if ($value instanceof IteratorAggregate) {
-}
+$propCollection = $value->getIterator();
+} elseif ($value instanceof Iterator) {
-foreach ($propCollection as $name => $propValue) {
+$propCollection = $value;
-if (isset($propValue)) {
+} else {
-$props .= ','
+$propCollection = get_object_vars($value);
-. $this->_encodeString($name)
+}
-. ':'
-. $this->_encodeValue($propValue);
+foreach ($propCollection as $name => $propValue) {
-}
+if (isset($propValue)) {
-}
+$props .= ','
+. $this->_encodeString($name)
-return '{"__className":"' . get_class($value) . '"'
+. ':'
+. $this->_encodeValue($propValue);
+}
+}
+}
+$className = get_class($value);
+return '{"__className":' . $this->_encodeString($className)
 . $props . '}';
 }
 /**
 *
 * Arrays are defined as integer-indexed arrays starting at index 0, where
 * the last index is (count($array) -1); any deviation from that is
 * considered an associative array, and will be encoded as such.
 *
-* @param $array array
+* @param array& $array
 * @return string
 */
 protected function _encodeArray(&$array)
 {
 $tmpArray = array();
 * JSON encode a basic data type (string, number, boolean, null)
 *
 * If value type is not a string, number, boolean, or null, the string
 * 'null' is returned.
 *
-* @param $value mixed
+* @param mixed& $value
 * @return string
 */
 protected function _encodeDatum(&$value)
 {
 $result = 'null';
 /**
 * JSON encode a string value by escaping characters as necessary
 *
-* @param $value string
+* @param string& $value
 * @return string
 */
 protected function _encodeString(&$string)
 {
 // Escape these characters with a backslash:
 /**
 * Encode the constants associated with the ReflectionClass
 * parameter. The encoding format is based on the class2 format
 *
-* @param $cls ReflectionClass
+* @param ReflectionClass $cls
 * @return string Encoded constant block in class2 format
 */
 private static function _encodeConstants(ReflectionClass $cls)
 {
 $result    = "constants : {";
 /**
 * Encode the public methods of the ReflectionClass in the
 * class2 format
 *
-* @param $cls ReflectionClass
+* @param ReflectionClass $cls
 * @return string Encoded method fragment
 *
 */
 private static function _encodeMethods(ReflectionClass $cls)
 {
 /**
 * Encode the public properties of the ReflectionClass in the class2
 * format.
 *
-* @param $cls ReflectionClass
+* @param ReflectionClass $cls
 * @return string Encode properties list
 *
 */
 private static function _encodeVariables(ReflectionClass $cls)
 {
 * Encodes the given $className into the class2 model of encoding PHP
 * classes into JavaScript class2 classes.
 * NOTE: Currently only public methods and variables are proxied onto
 * the client machine
 *
-* @param $className string The name of the class, the class must be
+* @param string $className The name of the class, the class must be
-* instantiable using a null constructor
+*  instantiable using a null constructor
-* @param $package string Optional package name appended to JavaScript
+* @param string $package Optional package name appended to JavaScript
-* proxy class name
+*  proxy class name
 * @return string The class2 (JavaScript) encoding of the class
 * @throws Zend_Json_Exception
 */
 public static function encodeClass($className, $package = '')
 {

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c