use PhpXmlRpc\Helper\Charset;
+/**
+ * This class enables the creation of values for XML-RPC, by encapsulating plain php values.
+ */
class Value implements \Countable, \IteratorAggregate, \ArrayAccess
{
public static $xmlrpcI4 = "i4";
+ public static $xmlrpcI8 = "i8";
public static $xmlrpcInt = "int";
public static $xmlrpcBoolean = "boolean";
public static $xmlrpcDouble = "double";
public static $xmlrpcTypes = array(
"i4" => 1,
+ "i8" => 1,
"int" => 1,
"boolean" => 1,
"double" => 1,
/**
* Build an xmlrpc value.
- * When no value or type is passed in, the value is left uninitialized, and the value can be added later
*
- * @param mixed $val
- * @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed
+ * When no value or type is passed in, the value is left uninitialized, and the value can be added later.
+ *
+ * @param mixed $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves
+ * @param string $type any valid xmlrpc type name (lowercase): i4, int, boolean, string, double, dateTime.iso8601,
+ * base64, array, struct, null.
+ * If null, 'string' is assumed.
+ * You should refer to http://www.xmlrpc.com/spec for more information on what each of these mean.
*/
public function __construct($val = -1, $type = '')
{
$this->me['string'] = $val;
break;
case 'i4':
+ case 'i8':
case 'int':
case 'double':
case 'string':
}
/**
- * Add a single php value to an (uninitialized) xmlrpc value.
+ * Add a single php value to an xmlrpc value.
+ *
+ * If the xmlrpc value is an array, the php value is added as its last element.
+ * If the xmlrpc value is empty (uninitialized), this method makes it a scalar value, and sets that value.
+ * Fails if the xmlrpc value is not an array and already initialized.
*
* @param mixed $val
- * @param string $type
+ * @param string $type allowed values: i4, i8, int, boolean, string, double, dateTime.iso8601, base64, null.
*
* @return int 1 or 0 on failure
*/
}
// coerce booleans into correct values
- // NB: we should either do it for datetimes, integers and doubles, too,
+ // NB: we should either do it for datetimes, integers, i8 and doubles, too,
// or just plain remove this check, implemented on booleans only...
if ($type == static::$xmlrpcBoolean) {
if (strcasecmp($val, 'true') == 0 || $val == 1 || ($val == true && strcasecmp($val, 'false'))) {
}
/**
- * Add an array of xmlrpc values objects to an xmlrpc value.
+ * Add an array of xmlrpc value objects to an xmlrpc value.
+ *
+ * If the xmlrpc value is an array, the elements are appended to the existing ones.
+ * If the xmlrpc value is empty (uninitialized), this method makes it an array value, and sets that value.
+ * Fails otherwise.
*
* @param Value[] $values
*
}
/**
- * Add an array of named xmlrpc value objects to an xmlrpc value.
+ * Merges an array of named xmlrpc value objects into an xmlrpc value.
+ *
+ * If the xmlrpc value is a struct, the elements are merged with the existing ones (overwriting existing ones).
+ * If the xmlrpc value is empty (uninitialized), this method makes it a struct value, and sets that value.
+ * Fails otherwise.
*
* @param Value[] $values
*
}
/**
- * Returns a string containing "struct", "array", "scalar" or "undef" describing the base type of the value.
+ * Returns a string containing either "struct", "array", "scalar" or "undef", describing the base type of the value.
*
* @return string
*/
break;
case static::$xmlrpcInt:
case static::$xmlrpcI4:
+ case static::$xmlrpcI8:
$rs .= "<${typ}>" . (int)$val . "</${typ}>";
break;
case static::$xmlrpcDouble:
$rs .= "<struct>\n";
}
$charsetEncoder = Charset::instance();
+ /** @var Value $val2 */
foreach ($val as $key2 => $val2) {
$rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
//$rs.=$this->serializeval($val2);
case 2:
// array
$rs .= "<array>\n<data>\n";
+ /** @var Value $element */
foreach ($val as $element) {
//$rs.=$this->serializeval($val[$i]);
$rs .= $element->serialize($charsetEncoding);
}
/**
- * Returns xml representation of the value. XML prologue not included.
+ * Returns the xml representation of the value. XML prologue not included.
*
* @param string $charsetEncoding the charset to be used for serialization. if null, US-ASCII is assumed
*
*/
public function serialize($charsetEncoding = '')
{
- // add check? slower, but helps to avoid recursion in serializing broken xmlrpc values...
- //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
- //{
- reset($this->me);
- list($typ, $val) = each($this->me);
+ $val = reset($this->me);
+ $typ = key($this->me);
return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
- //}
}
/**
* Checks whether a struct member with a given name is present.
+ *
* Works only on xmlrpc values of type struct.
*
* @param string $key the name of the struct member to be looked up
*/
public function structmemexists($key)
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
return array_key_exists($key, $this->me['struct']);
}
*/
public function structmem($key)
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
return $this->me['struct'][$key];
}
*/
public function structreset()
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
reset($this->me['struct']);
}
*/
public function structeach()
{
- return each($this->me['struct']);
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
+ return @each($this->me['struct']);
}
/**
- * Returns the value of a scalar xmlrpc value.
+ * Returns the value of a scalar xmlrpc value (base 64 decoding is automatically handled here)
*
* @return mixed
*/
public function scalarval()
{
- reset($this->me);
- list(, $b) = each($this->me);
+ $b = reset($this->me);
return $b;
}
/**
* Returns the type of the xmlrpc value.
- * For integers, 'int' is always returned in place of 'i4'.
+ *
+ * For integers, 'int' is always returned in place of 'i4'. 'i8' is considered a separate type and returned as such
*
* @return string
*/
public function scalartyp()
{
reset($this->me);
- list($a,) = each($this->me);
+ $a = key($this->me);
if ($a == static::$xmlrpcI4) {
$a = static::$xmlrpcInt;
}
}
/**
- * Returns the m-th member of an xmlrpc value of struct type.
+ * Returns the m-th member of an xmlrpc value of array type.
*
* @param integer $key the index of the value to be retrieved (zero based)
*
*/
public function arraymem($key)
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
return $this->me['array'][$key];
}
*/
public function arraysize()
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
return count($this->me['array']);
}
*/
public function structsize()
{
+ //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
return count($this->me['struct']);
}
/**
* Returns the number of members in an xmlrpc value:
* - 0 for uninitialized values
- * - 1 for scalars
- * - the number of elements for structs and arrays
+ * - 1 for scalar values
+ * - the number of elements for struct and array values
*
* @return integer
*/
/**
* Implements the IteratorAggregate interface
*
- * @return ArrayIterator
+ * @return \ArrayIterator
*/
public function getIterator() {
switch ($this->mytype) {
default:
return new \ArrayIterator();
}
- return new \ArrayIterator();
}
-
public function offsetSet($offset, $value) {
switch ($this->mytype) {
case 1:
// todo: handle i4 vs int
reset($this->me);
- list($type,) = each($this->me);
+ $type = key($this->me);
if ($type != $offset) {
throw new \Exception('');
}
return isset($this->me['array'][$offset]) ? $this->me['array'][$offset] : null;
case 1:
// on bad type: null or exception?
- reset($this->me);
- list($type, $value) = each($this->me);
+ $value = reset($this->me);
+ $type = key($this->me);
return $type == $offset ? $value : null;
default:
// return null or exception?
throw new \Exception("XML-RPC Value is of type 'undef' and can not be accessed using array index");
}
}
-}
\ No newline at end of file
+}
git://git.onelab.eu / plcapi.git / blobdiff