X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FValue.php;h=ec43fc140e9f21d83adf00d590600ec8adb913c7;hb=603c8e6d360f38410287a9ac09a6599369f3e5e8;hp=248185367d1340a23e5794c87873a75bad3afd09;hpb=820f996d6c080d1692355c1bc9a0d637d3da06b3;p=plcapi.git diff --git a/src/Value.php b/src/Value.php index 2481853..ec43fc1 100644 --- a/src/Value.php +++ b/src/Value.php @@ -37,17 +37,52 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess "null" => 1, ); + protected static $logger; + protected static $charsetEncoder; + /// @todo: do these need to be public? + /** @var Value[]|mixed */ public $me = array(); + /** + * @var int $mytype + * @internal + */ public $mytype = 0; + /** @var string|null $_php_class */ public $_php_class = null; + public function getLogger() + { + if (self::$logger === null) { + self::$logger = Logger::instance(); + } + return self::$logger; + } + + public static function setLogger($logger) + { + self::$logger = $logger; + } + + public function getCharsetEncoder() + { + if (self::$charsetEncoder === null) { + self::$charsetEncoder = Charset::instance(); + } + return self::$charsetEncoder; + } + + public function setCharsetEncoder($charsetEncoder) + { + self::$charsetEncoder = $charsetEncoder; + } + /** * 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 if passing in an array, all array elements should be PhpXmlRpc\Value themselves + * @param Value[]|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. @@ -84,7 +119,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess $this->me['struct'] = $val; break; default: - Logger::instance()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); + $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); } } } @@ -109,7 +144,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } if ($typeOf !== 1) { - Logger::instance()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); + $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); return 0; } @@ -126,10 +161,10 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess switch ($this->mytype) { case 1: - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); + $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); return 0; case 3: - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); + $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); return 0; case 2: // we're adding a scalar value to an array here @@ -171,7 +206,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess return 1; } else { - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); + $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); return 0; } } @@ -202,7 +237,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess return 1; } else { - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); + $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); return 0; } } @@ -217,18 +252,21 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess switch ($this->mytype) { case 3: return 'struct'; - break; case 2: return 'array'; - break; case 1: return 'scalar'; - break; default: return 'undef'; } } + /** + * @param string typ + * @param Value[]|mixed $val + * @param string $charsetEncoding + * @return string + */ protected function serializedata($typ, $val, $charsetEncoding = '') { $rs = ''; @@ -248,7 +286,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess break; case static::$xmlrpcString: // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml - $rs .= "<${typ}>" . Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . ""; + $rs .= "<${typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . ""; break; case static::$xmlrpcInt: case static::$xmlrpcI4: @@ -261,7 +299,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. // The code below tries its best at keeping max precision while avoiding exp notation, // but there is of course no limit in the number of decimal places to be used... - $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, 128, '.', '')) . ""; + $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . ""; break; case static::$xmlrpcDateTime: if (is_string($val)) { @@ -295,7 +333,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } else { $rs .= "\n"; } - $charsetEncoder = Charset::instance(); + $charsetEncoder = $this->getCharsetEncoder(); /** @var Value $val2 */ foreach ($val as $key2 => $val2) { $rs .= '' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n"; @@ -387,6 +425,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess * Return next member element for xmlrpc values of type struct. * * @return Value + * @throws \Error starting with php 8.0, this function should not be used, as it will always throw * * @deprecated iterate directly over the object using foreach instead */ @@ -479,6 +518,7 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess * * @return integer */ + #[\ReturnTypeWillChange] public function count() { switch ($this->mytype) { @@ -497,8 +537,11 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess * Implements the IteratorAggregate interface * * @return \ArrayIterator + * @internal required to be public to implement an Interface */ - public function getIterator() { + #[\ReturnTypeWillChange] + public function getIterator() + { switch ($this->mytype) { case 3: return new \ArrayIterator($this->me['struct']); @@ -511,8 +554,15 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } } - public function offsetSet($offset, $value) { - + /** + * @internal required to be public to implement an Interface + * @param mixed $offset + * @param mixed $value + * @throws \Exception + */ + #[\ReturnTypeWillChange] + public function offsetSet($offset, $value) + { switch ($this->mytype) { case 3: if (!($value instanceof \PhpXmlRpc\Value)) { @@ -551,7 +601,14 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } } - public function offsetExists($offset) { + /** + * @internal required to be public to implement an Interface + * @param mixed $offset + * @return bool + */ + #[\ReturnTypeWillChange] + public function offsetExists($offset) + { switch ($this->mytype) { case 3: return isset($this->me['struct'][$offset]); @@ -565,7 +622,14 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } } - public function offsetUnset($offset) { + /** + * @internal required to be public to implement an Interface + * @param mixed $offset + * @throws \Exception + */ + #[\ReturnTypeWillChange] + public function offsetUnset($offset) + { switch ($this->mytype) { case 3: unset($this->me['struct'][$offset]); @@ -581,7 +645,15 @@ class Value implements \Countable, \IteratorAggregate, \ArrayAccess } } - public function offsetGet($offset) { + /** + * @internal required to be public to implement an Interface + * @param mixed $offset + * @return mixed|Value|null + * @throws \Exception + */ + #[\ReturnTypeWillChange] + public function offsetGet($offset) + { switch ($this->mytype) { case 3: return isset($this->me['struct'][$offset]) ? $this->me['struct'][$offset] : null;