X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FValue.php;h=8747e69f2e8a9a9a98ce9e371f0c2127c47bd29e;hb=ac735cf96eb914759f7e7595630857254b599783;hp=97852b05ea1c56d4488fd369b24f999c9e6af8ac;hpb=509dee39962ec712884f1c6658f383c4db793785;p=plcapi.git diff --git a/src/Value.php b/src/Value.php index 97852b0..8747e69 100644 --- a/src/Value.php +++ b/src/Value.php @@ -329,8 +329,8 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess */ public function serialize($charsetEncoding = '') { - reset($this->me); - list($typ, $val) = each($this->me); + $val = reset($this->me); + $typ = key($this->me); return '' . $this->serializedata($typ, $val, $charsetEncoding) . "\n"; } @@ -394,8 +394,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess */ public function scalarval() { - reset($this->me); - list(, $b) = each($this->me); + $b = reset($this->me); return $b; } @@ -410,7 +409,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess public function scalartyp() { reset($this->me); - list($a,) = each($this->me); + $a = key($this->me); if ($a == static::$xmlrpcI4) { $a = static::$xmlrpcInt; } @@ -525,7 +524,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess 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(''); } @@ -575,8 +574,8 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess 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?