-2009-04-06 - G. Giunta (giunta.gaetano@gmail.com)\r
+2009-05-07 - G. Giunta (giunta.gaetano@gmail.com)\r
+\r
+ * replace all usage of '= & new' with '= new', as this is deprecated in php 5\r
+ and has been shown to cause problems too\r
+\r
+2009-05-06 - G. Giunta (giunta.gaetano@gmail.com)\r
\r
* create php4 branch, rename trunk to 3.0.0beta - it will be the php5-only version\r
\r
if ($port != "")
{
- $client =& new $clientclass($path, $host, $port);
+ $client = new $clientclass($path, $host, $port);
$server = "$host:$port$path";
} else {
- $client =& new $clientclass($path, $host);
+ $client = new $clientclass($path, $host);
$server = "$host$path";
}
if ($protocol == 2)
// fall thru intentionally
case 'describe':
case 'wrap':
- $msg[0] =& new $msgclass('system.methodHelp', null, $id);
+ $msg[0] = new $msgclass('system.methodHelp', null, $id);
$msg[0]->addparam(new xmlrpcval($method));
- $msg[1] =& new $msgclass('system.methodSignature', null, $id+1);
+ $msg[1] = new $msgclass('system.methodSignature', null, $id+1);
$msg[1]->addparam(new xmlrpcval($method));
$actionname = 'Description of method "'.$method.'"';
break;
case 'list':
- $msg[0] =& new $msgclass('system.listMethods', null, $id);
+ $msg[0] = new $msgclass('system.listMethods', null, $id);
$actionname = 'List of available methods';
break;
case 'execute':
if (!payload_is_safe($payload))
die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
- $msg[0] =& new $msgclass($method, null, $id);
+ $msg[0] = new $msgclass($method, null, $id);
// hack! build xml payload by hand
if ($wstype == 1)
{
if ($rebuild_xmlrpcvals)\r
{\r
// build the xmlrpc val out of the data received, and substitute it\r
- $temp =& new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);\r
+ $temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);\r
// in case we got info about underlying php class, save it\r
// in the object we're rebuilding\r
if (isset($GLOBALS['_xh']['php_class']))\r
}\r
elseif(is_string($msg))\r
{\r
- $n =& new xmlrpcmsg('');\r
+ $n = new xmlrpcmsg('');\r
$n->payload = $msg;\r
$msg = $n;\r
}\r
else\r
{\r
$this->errstr='Connect error: '.$this->errstr;\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');\r
return $r;\r
}\r
\r
{\r
fclose($fp);\r
$this->errstr='Write error';\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);\r
return $r;\r
}\r
else\r
if(!function_exists('curl_init'))\r
{\r
$this->errstr='CURL unavailable on this install';\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);\r
return $r;\r
}\r
if($method == 'https')\r
((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))\r
{\r
$this->errstr='SSL unavailable on this install';\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);\r
return $r;\r
}\r
}\r
if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?\r
{\r
$this->errstr='no response';\r
- $resp=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));\r
+ $resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));\r
curl_close($curl);\r
if($keepalive)\r
{\r
}\r
else\r
{\r
- $result =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);\r
+ $result = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);\r
}\r
}\r
}\r
$calls = array();\r
foreach($msgs as $msg)\r
{\r
- $call['methodName'] =& new xmlrpcval($msg->method(),'string');\r
+ $call['methodName'] = new xmlrpcval($msg->method(),'string');\r
$numParams = $msg->getNumParams();\r
$params = array();\r
for($i = 0; $i < $numParams; $i++)\r
{\r
$params[$i] = $msg->getParam($i);\r
}\r
- $call['params'] =& new xmlrpcval($params, 'array');\r
- $calls[] =& new xmlrpcval($call, 'struct');\r
+ $call['params'] = new xmlrpcval($params, 'array');\r
+ $calls[] = new xmlrpcval($call, 'struct');\r
}\r
- $multicall =& new xmlrpcmsg('system.multicall');\r
+ $multicall = new xmlrpcmsg('system.multicall');\r
$multicall->addParam(new xmlrpcval($calls, 'array'));\r
\r
// Attempt RPC call\r
return false; // Bad value\r
}\r
// Normal return value\r
- $response[$i] =& new xmlrpcresp($val[0], 0, '', 'phpvals');\r
+ $response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals');\r
break;\r
case 2:\r
/// @todo remove usage of @: it is apparently quite slow\r
{\r
return false;\r
}\r
- $response[$i] =& new xmlrpcresp(0, $code, $str);\r
+ $response[$i] = new xmlrpcresp(0, $code, $str);\r
break;\r
default:\r
return false;\r
return false; // Bad value\r
}\r
// Normal return value\r
- $response[$i] =& new xmlrpcresp($val->arraymem(0));\r
+ $response[$i] = new xmlrpcresp($val->arraymem(0));\r
break;\r
case 'struct':\r
$code = $val->structmem('faultCode');\r
{\r
return false;\r
}\r
- $response[$i] =& new xmlrpcresp(0, $code->scalarval(), $str->scalarval());\r
+ $response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());\r
break;\r
default:\r
return false;\r
else\r
{\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTPS via proxy error, tunnel connection possibly failed');\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');\r
return $r;\r
}\r
}\r
{\r
$errstr= substr($data, 0, strpos($data, "\n")-1);\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTP error, got response: ' .$errstr);\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')');\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')');\r
return $r;\r
}\r
\r
if(!$data = decode_chunked($data))\r
{\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to rebuild the chunked data received from server');\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);\r
return $r;\r
}\r
}\r
else\r
{\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to decode the deflated data received from server');\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']);\r
return $r;\r
}\r
}\r
else\r
{\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']);\r
return $r;\r
}\r
}\r
if($data == '')\r
{\r
error_log('XML-RPC: xmlrpcmsg::parseResponse: no response received from server.');\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']);\r
return $r;\r
}\r
\r
// if user wants back raw xml, give it to him\r
if ($return_type == 'xml')\r
{\r
- $r =& new xmlrpcresp($data, 0, '', 'xml');\r
+ $r = new xmlrpcresp($data, 0, '', 'xml');\r
$r->hdrs = $GLOBALS['_xh']['headers'];\r
$r->_cookies = $GLOBALS['_xh']['cookies'];\r
$r->raw_data = $raw_data;\r
xml_get_current_line_number($parser), xml_get_current_column_number($parser));\r
}\r
error_log($errstr);\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');\r
xml_parser_free($parser);\r
if($this->debug)\r
{\r
/// @todo echo something for user?\r
}\r
\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],\r
$GLOBALS['xmlrpcstr']['invalid_return'] . ' ' . $GLOBALS['_xh']['isf_reason']);\r
}\r
// third error check: parsing of the response has somehow gone boink.\r
// something odd has happened\r
// and it's time to generate a client side error\r
// indicating something odd went on\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],\r
$GLOBALS['xmlrpcstr']['invalid_return']);\r
}\r
else\r
$errno = -1;\r
}\r
\r
- $r =& new xmlrpcresp(0, $errno, $errstr);\r
+ $r = new xmlrpcresp(0, $errno, $errstr);\r
}\r
else\r
{\r
- $r=&new xmlrpcresp($v, 0, '', $return_type);\r
+ $r=new xmlrpcresp($v, 0, '', $return_type);\r
}\r
}\r
\r
case 2:\r
// we're adding a scalar value to an array here\r
//$ar=$this->me['array'];\r
- //$ar[]=&new xmlrpcval($val, $type);\r
+ //$ar[]=new xmlrpcval($val, $type);\r
//$this->me['array']=$ar;\r
// Faster (?) avoid all the costly array-copy-by-val done here...\r
- $this->me['array'][]=&new xmlrpcval($val, $type);\r
+ $this->me['array'][]=new xmlrpcval($val, $type);\r
return 1;\r
default:\r
// a scalar, so set the value and remember we're scalar\r
{\r
case 'string':\r
if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))\r
- $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);\r
+ $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);\r
else\r
- $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);\r
+ $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);\r
break;\r
case 'integer':\r
- $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);\r
+ $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);\r
break;\r
case 'double':\r
- $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']);\r
+ $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']);\r
break;\r
// <G_Giunta_2001-02-29>\r
// Add support for encoding/decoding of booleans, since they are supported in PHP\r
case 'boolean':\r
- $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']);\r
+ $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']);\r
break;\r
// </G_Giunta_2001-02-29>\r
case 'array':\r
}\r
if($ko)\r
{\r
- $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);\r
+ $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);\r
}\r
else\r
{\r
- $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);\r
+ $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);\r
}\r
break;\r
case 'object':\r
{\r
$arr[$k] = php_xmlrpc_encode($v, $options);\r
}\r
- $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);\r
+ $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);\r
if (in_array('encode_php_objs', $options))\r
{\r
// let's save original class name into xmlrpcval:\r
case 'NULL':\r
if (in_array('extension_api', $options))\r
{\r
- $xmlrpc_val =& new xmlrpcval('', $GLOBALS['xmlrpcString']);\r
+ $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);\r
}\r
if (in_array('null_extension', $options))\r
{\r
- $xmlrpc_val =& new xmlrpcval('', $GLOBALS['xmlrpcNull']);\r
+ $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);\r
}\r
else\r
{\r
- $xmlrpc_val =& new xmlrpcval();\r
+ $xmlrpc_val = new xmlrpcval();\r
}\r
break;\r
case 'resource':\r
if (in_array('extension_api', $options))\r
{\r
- $xmlrpc_val =& new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);\r
+ $xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);\r
}\r
else\r
{\r
- $xmlrpc_val =& new xmlrpcval();\r
+ $xmlrpc_val = new xmlrpcval();\r
}\r
// catch "user function", "unknown type"\r
default:\r
// giancarlo pinerolo <ping@alt.it>\r
// it has to return\r
// an empty object in case, not a boolean.\r
- $xmlrpc_val =& new xmlrpcval();\r
+ $xmlrpc_val = new xmlrpcval();\r
break;\r
}\r
return $xmlrpc_val;\r
{\r
$vc = $v->structmem('faultCode');\r
$vs = $v->structmem('faultString');\r
- $r =& new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());\r
+ $r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());\r
}\r
else\r
{\r
- $r =& new xmlrpcresp($v);\r
+ $r = new xmlrpcresp($v);\r
}\r
return $r;\r
case 'methodcall':\r
- $m =& new xmlrpcmsg($GLOBALS['_xh']['method']);\r
+ $m = new xmlrpcmsg($GLOBALS['_xh']['method']);\r
for($i=0; $i < count($GLOBALS['_xh']['params']); $i++)\r
{\r
$m->addParam($GLOBALS['_xh']['params'][$i]);\r
// start to introspect PHP code\r
if(is_array($funcname))\r
{\r
- $func =& new ReflectionMethod($funcname[0], $funcname[1]);\r
+ $func = new ReflectionMethod($funcname[0], $funcname[1]);\r
if($func->isPrivate())\r
{\r
error_log('XML-RPC: method to be wrapped is private: '.$plainfuncname);\r
}\r
else\r
{\r
- $func =& new ReflectionFunction($funcname);\r
+ $func = new ReflectionFunction($funcname);\r
}\r
if($func->isInternal())\r
{\r
if ($methodfilter == '' || preg_match($methodfilter, $mname))\r
{\r
// echo $mlist."\n";\r
- $func =& new ReflectionMethod($classname, $mname);\r
+ $func = new ReflectionMethod($classname, $mname);\r
if(!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract())\r
{\r
if(($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($classname)))) ||\r
$valclass = $prefix.'val';\r
$decodefunc = 'php_'.$prefix.'_decode';\r
\r
- $msg =& new $msgclass('system.methodSignature');\r
+ $msg = new $msgclass('system.methodSignature');\r
$msg->addparam(new $valclass($methodname));\r
$client->setDebug($debug);\r
$response =& $client->send($msg, $timeout, $protocol);\r
// in online mode, favour speed of operation\r
if(!$buildit)\r
{\r
- $msg =& new $msgclass('system.methodHelp');\r
+ $msg = new $msgclass('system.methodHelp');\r
$msg->addparam(new $valclass($methodname));\r
$response =& $client->send($msg, $timeout, $protocol);\r
if (!$response->faultCode())\r
//$valclass = $prefix.'val';\r
$decodefunc = 'php_'.$prefix.'_decode';\r
\r
- $msg =& new $msgclass('system.listMethods');\r
+ $msg = new $msgclass('system.listMethods');\r
$response =& $client->send($msg, $timeout, $protocol);\r
if($response->faultCode())\r
{\r
$innercode = '';\r
$this_ = 'this->';\r
}\r
- $innercode .= "\$msg =& new {$prefix}msg('$methodname');\n";\r
+ $innercode .= "\$msg = new {$prefix}msg('$methodname');\n";\r
\r
if ($mdesc != '')\r
{\r
$ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null')\r
{\r
// only build directly xmlrpcvals when type is known and scalar\r
- $innercode .= "\$p$i =& new {$prefix}val(\$p$i, '$ptype');\n";\r
+ $innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";\r
}\r
else\r
{\r
*/\r
function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')\r
{\r
- $code = "\$client =& new {$prefix}_client('".str_replace("'", "\'", $client->path).\r
+ $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).\r
"', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";\r
\r
// copy all client fields to the client that will be generated runtime\r
$outAr=array();\r
foreach($server->dmap as $key => $val)\r
{\r
- $outAr[]=&new xmlrpcval($key, 'string');\r
+ $outAr[]=new xmlrpcval($key, 'string');\r
}\r
if($server->allow_system_funcs)\r
{\r
foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val)\r
{\r
- $outAr[]=&new xmlrpcval($key, 'string');\r
+ $outAr[]=new xmlrpcval($key, 'string');\r
}\r
}\r
return new xmlrpcresp(new xmlrpcval($outAr, 'array'));\r
$cursig=array();\r
foreach($inSig as $sig)\r
{\r
- $cursig[]=&new xmlrpcval($sig, 'string');\r
+ $cursig[]=new xmlrpcval($sig, 'string');\r
}\r
- $sigs[]=&new xmlrpcval($cursig, 'array');\r
+ $sigs[]=new xmlrpcval($cursig, 'array');\r
}\r
- $r=&new xmlrpcresp(new xmlrpcval($sigs, 'array'));\r
+ $r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));\r
}\r
else\r
{\r
// NB: according to the official docs, we should be returning a\r
// "none-array" here, which means not-an-array\r
- $r=&new xmlrpcresp(new xmlrpcval('undef', 'string'));\r
+ $r=new xmlrpcresp(new xmlrpcval('undef', 'string'));\r
}\r
}\r
else\r
{\r
- $r=&new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
+ $r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
}\r
return $r;\r
}\r
{\r
if(isset($dmap[$methName]['docstring']))\r
{\r
- $r=&new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');\r
+ $r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');\r
}\r
else\r
{\r
- $r=&new xmlrpcresp(new xmlrpcval('', 'string'));\r
+ $r=new xmlrpcresp(new xmlrpcval('', 'string'));\r
}\r
}\r
else\r
{\r
- $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
+ $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
}\r
return $r;\r
}\r
$str = $err->faultString();\r
}\r
$struct = array();\r
- $struct['faultCode'] =& new xmlrpcval($code, 'int');\r
- $struct['faultString'] =& new xmlrpcval($str, 'string');\r
+ $struct['faultCode'] = new xmlrpcval($code, 'int');\r
+ $struct['faultString'] = new xmlrpcval($str, 'string');\r
return new xmlrpcval($struct, 'struct');\r
}\r
\r
}\r
$numParams = $params->arraysize();\r
\r
- $msg =& new xmlrpcmsg($methName->scalarval());\r
+ $msg = new xmlrpcmsg($methName->scalarval());\r
for($i = 0; $i < $numParams; $i++)\r
{\r
if(!$msg->addParam($params->arraymem($i)))\r
}\r
else\r
{\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);\r
return $r;\r
}\r
}\r
else\r
{\r
//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');\r
- $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);\r
+ $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);\r
return $r;\r
}\r
}\r
if(!xml_parse($parser, $data, 1))\r
{\r
// return XML error as a faultCode\r
- $r=&new xmlrpcresp(0,\r
+ $r=new xmlrpcresp(0,\r
$GLOBALS['xmlrpcerrxml']+xml_get_error_code($parser),\r
sprintf('XML error: %s at line %d, column %d',\r
xml_error_string(xml_get_error_code($parser)),\r
elseif ($GLOBALS['_xh']['isf'])\r
{\r
xml_parser_free($parser);\r
- $r=&new xmlrpcresp(0,\r
+ $r=new xmlrpcresp(0,\r
$GLOBALS['xmlrpcerr']['invalid_request'],\r
$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);\r
}\r
else\r
{\r
// build an xmlrpcmsg object with data parsed from xml\r
- $m=&new xmlrpcmsg($GLOBALS['_xh']['method']);\r
+ $m=new xmlrpcmsg($GLOBALS['_xh']['method']);\r
// now add parameters in\r
for($i=0; $i<count($GLOBALS['_xh']['params']); $i++)\r
{\r
error_log("XML-RPC: xmlrpc_server::execute: function $func registered as method handler does not return an xmlrpcresp object");\r
if (is_a($r, 'xmlrpcval'))\r
{\r
- $r =& new xmlrpcresp($r);\r
+ $r = new xmlrpcresp($r);\r
}\r
else\r
{\r
- $r =& new xmlrpcresp(\r
+ $r = new xmlrpcresp(\r
0,\r
$GLOBALS['xmlrpcerr']['server_error'],\r
$GLOBALS['xmlrpcstr']['server_error'] . ": function does not return xmlrpcresp object"\r
// an eror response\r
if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))\r
{\r
- $r =& new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);\r
+ $r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);\r
}\r
else\r
{\r
// functions using EPI api should NOT return resp objects,\r
// so make sure we encode the return type correctly\r
- $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));\r
+ $r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));\r
}\r
}\r
else\r
{\r
// what should we assume here about automatic encoding of datetimes\r
// and php classes instances???\r
- $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates')));\r
+ $r = new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates')));\r
}\r
}\r
if($this->debug > 2)\r
*/\r
function echoInput()\r
{\r
- $r=&new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));\r
+ $r=new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));\r
print $r->serialize();\r
}\r
}\r
foreach ($data[$j] as $key => $val)
{
$values = array();
- $values[] =& new xmlrpcval($val[0], 'int');
- $values[] =& new xmlrpcval($val[1], 'double');
- $values[] =& new xmlrpcval($val[2], 'string');
- $values[] =& new xmlrpcval($val[3], 'boolean');
- $values[] =& new xmlrpcval($val[4], 'dateTime.iso8601');
- $values[] =& new xmlrpcval($val[5], 'i4');
- $values[] =& new xmlrpcval($val[6], 'double');
- $values[] =& new xmlrpcval($val[7], 'string');
- $values[] =& new xmlrpcval($val[8], 'boolean');
- $values[] =& new xmlrpcval($val[9], 'dateTime.iso8601');
- $valarray[$key] =& new xmlrpcval($values, 'array');
+ $values[] = new xmlrpcval($val[0], 'int');
+ $values[] = new xmlrpcval($val[1], 'double');
+ $values[] = new xmlrpcval($val[2], 'string');
+ $values[] = new xmlrpcval($val[3], 'boolean');
+ $values[] = new xmlrpcval($val[4], 'dateTime.iso8601');
+ $values[] = new xmlrpcval($val[5], 'i4');
+ $values[] = new xmlrpcval($val[6], 'double');
+ $values[] = new xmlrpcval($val[7], 'string');
+ $values[] = new xmlrpcval($val[8], 'boolean');
+ $values[] = new xmlrpcval($val[9], 'dateTime.iso8601');
+ $valarray[$key] = new xmlrpcval($values, 'array');
}
- $vals[] =& new xmlrpcval($valarray, 'struct');
+ $vals[] = new xmlrpcval($valarray, 'struct');
}
- $value =& new xmlrpcval($vals, 'array');
+ $value = new xmlrpcval($vals, 'array');
$out = $value->serialize();
}
end_test('Data encoding (large array)', 'manual encoding', $out);
/// test multicall vs. many calls vs. keep-alives
$value = php_xmlrpc_encode($data1);
- $msg =& new xmlrpcmsg('interopEchoTests.echoValue', array($value));
+ $msg = new xmlrpcmsg('interopEchoTests.echoValue', array($value));
$msgs=array();
for ($i = 0; $i < 25; $i++)
$msgs[] = $msg;
$server = split(':', $LOCALSERVER);
if(count($server) > 1)
{
- $c =& new xmlrpc_client($URI, $server[0], $server[1]);
+ $c = new xmlrpc_client($URI, $server[0], $server[1]);
}
else
{
- $c =& new xmlrpc_client($URI, $LOCALSERVER);
+ $c = new xmlrpc_client($URI, $LOCALSERVER);
}
// do not interfere with http compression
$c->accepted_compression = array();
$server = split(':', $LOCALSERVER);
if(count($server) > 1)
{
- $this->client=&new xmlrpc_client($URI, $server[0], $server[1]);
+ $this->client=new xmlrpc_client($URI, $server[0], $server[1]);
}
else
{
- $this->client=&new xmlrpc_client($URI, $LOCALSERVER);
+ $this->client=new xmlrpc_client($URI, $LOCALSERVER);
}
if($DEBUG)
{
$v1 = php_xmlrpc_encode($data, array('auto_dates'));
$v2 = php_xmlrpc_decode_xml($v1->serialize());
$this->assertEquals($v1, $v2);
- $r1 =& new xmlrpcresp($v1);
+ $r1 = new xmlrpcresp($v1);
$r2 = php_xmlrpc_decode_xml($r1->serialize());
$r2->serialize(); // needed to set internal member payload
$this->assertEquals($r1, $r2);
- $m1 =& new xmlrpcmsg('hello dolly', array($v1));
+ $m1 = new xmlrpcmsg('hello dolly', array($v1));
$m2 = php_xmlrpc_decode_xml($m1->serialize());
$m2->serialize(); // needed to set internal member payload
$this->assertEquals($m1, $m2);
git://git.onelab.eu / plcapi.git / commitdiff