tweet_live: comparison web/lib/Zend/XmlRpc/Value.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_XmlRpc
 * @subpackage Value
-* @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: Value.php 22024 2010-04-27 18:08:24Z matthew $
+* @version    $Id: Value.php 24593 2012-01-05 20:35:02Z matthew $
 */
 /**
 * Represent a native XML-RPC value entity, used as parameters for the methods
 * called by the Zend_XmlRpc_Client object and as the return value for those calls.
 *
 * Using this function, users/Zend_XmlRpc_Client object can create the Zend_XmlRpc_Value objects
 * from PHP variables, XML string or by specifing the exact XML-RPC natvie type
 *
 * @package    Zend_XmlRpc
-* @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
 */
 abstract class Zend_XmlRpc_Value
 {
 /**
 require_once 'Zend/XmlRpc/Value/Exception.php';
 throw new Zend_XmlRpc_Value_Exception('Given type is not a '. __CLASS__ .' constant');
 }
 }
+/**
+* Get XML-RPC type for a PHP native variable
+*
+* @static
+* @param mixed $value
+* @return string
+*/
+public static function getXmlRpcTypeByValue($value)
+{
+if (is_object($value)) {
+if ($value instanceof Zend_XmlRpc_Value) {
+return $value->getType();
+} elseif (($value instanceof Zend_Date) || ($value instanceof DateTime)) {
+return self::XMLRPC_TYPE_DATETIME;
+}
+return self::getXmlRpcTypeByValue(get_object_vars($value));
+} elseif (is_array($value)) {
+if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) {
+return self::XMLRPC_TYPE_STRUCT;
+}
+return self::XMLRPC_TYPE_ARRAY;
+} elseif (is_int($value)) {
+return ($value > PHP_INT_MAX) ? self::XMLRPC_TYPE_I8 : self::XMLRPC_TYPE_INTEGER;
+} elseif (is_double($value)) {
+return self::XMLRPC_TYPE_DOUBLE;
+} elseif (is_bool($value)) {
+return self::XMLRPC_TYPE_BOOLEAN;
+} elseif (is_null($value)) {
+return self::XMLRPC_TYPE_NIL;
+} elseif (is_string($value)) {
+return self::XMLRPC_TYPE_STRING;
+}
+throw new Zend_XmlRpc_Value_Exception(sprintf(
+'No matching XMLRPC type found for php type %s.',
+gettype($value)
+));
+}
 /**
 * Transform a PHP native variable into a XML-RPC native value
 *
 * @param mixed $value The PHP variable for convertion
 * @return Zend_XmlRpc_Value
 * @static
 */
 protected static function _phpVarToNativeXmlRpc($value)
 {
-switch (gettype($value)) {
+// @see http://framework.zend.com/issues/browse/ZF-8623
-case 'object':
+if (is_object($value)) {
-// Check to see if it's an XmlRpc value
+if ($value instanceof Zend_XmlRpc_Value) {
-if ($value instanceof Zend_XmlRpc_Value) {
+return $value;
-return $value;
+}
-}
+if ($value instanceof Zend_Crypt_Math_BigInteger) {
+require_once 'Zend/XmlRpc/Value/Exception.php';
-if ($value instanceof Zend_Crypt_Math_BigInteger) {
+throw new Zend_XmlRpc_Value_Exception(
-require_once 'Zend/XmlRpc/Value/BigInteger.php';
+'Using Zend_Crypt_Math_BigInteger to get an ' .
-return new Zend_XmlRpc_Value_BigInteger($value);
+'instance of Zend_XmlRpc_Value_BigInteger is not ' .
-}
+'available anymore.'
+);
-if ($value instanceof Zend_Date or $value instanceof DateTime) {
+}
-require_once 'Zend/XmlRpc/Value/DateTime.php';
+}
-return new Zend_XmlRpc_Value_DateTime($value);
-}
+switch (self::getXmlRpcTypeByValue($value))
+{
-// Otherwise, we convert the object into a struct
+case self::XMLRPC_TYPE_DATETIME:
-$value = get_object_vars($value);
+require_once 'Zend/XmlRpc/Value/DateTime.php';
-// Break intentionally omitted
+return new Zend_XmlRpc_Value_DateTime($value);
-case 'array':
-// Default native type for a PHP array (a simple numeric array) is 'array'
+case self::XMLRPC_TYPE_ARRAY:
 require_once 'Zend/XmlRpc/Value/Array.php';
-$obj = 'Zend_XmlRpc_Value_Array';
+return new Zend_XmlRpc_Value_Array($value);
-// Determine if this is an associative array
+case self::XMLRPC_TYPE_STRUCT:
-if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) {
+require_once 'Zend/XmlRpc/Value/Struct.php';
-require_once 'Zend/XmlRpc/Value/Struct.php';
+return new Zend_XmlRpc_Value_Struct($value);
-$obj = 'Zend_XmlRpc_Value_Struct';
-}
+case self::XMLRPC_TYPE_INTEGER:
-return new $obj($value);
-case 'integer':
 require_once 'Zend/XmlRpc/Value/Integer.php';
 return new Zend_XmlRpc_Value_Integer($value);
-case 'double':
+case self::XMLRPC_TYPE_DOUBLE:
 require_once 'Zend/XmlRpc/Value/Double.php';
 return new Zend_XmlRpc_Value_Double($value);
-case 'boolean':
+case self::XMLRPC_TYPE_BOOLEAN:
 require_once 'Zend/XmlRpc/Value/Boolean.php';
 return new Zend_XmlRpc_Value_Boolean($value);
-case 'NULL':
+case self::XMLRPC_TYPE_NIL:
-case 'null':
 require_once 'Zend/XmlRpc/Value/Nil.php';
-return new Zend_XmlRpc_Value_Nil();
+return new Zend_XmlRpc_Value_Nil;
-case 'string':
+case self::XMLRPC_TYPE_STRING:
 // Fall through to the next case
 default:
 // If type isn't identified (or identified as string), it treated as string
 require_once 'Zend/XmlRpc/Value/String.php';
 return new Zend_XmlRpc_Value_String($value);
 $type = self::XMLRPC_TYPE_STRING;
 }
 }
 /**
-* @param $xml
+* @param string $xml
 * @return void
 */
 protected function _setXML($xml)
 {
 $this->_xml = $this->getGenerator()->stripDeclaration($xml);

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