gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Which toolkit demo</title></head> |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | $value = $encoder->decode($resp->value()); |
| 19 | 19 | output("Toolkit info:<br/>\n"); |
| 20 | 20 | output("<pre>"); |
| 21 | - output("name: " . htmlspecialchars($value["toolkitName"]) . "\n"); |
|
| 22 | - output("version: " . htmlspecialchars($value["toolkitVersion"]) . "\n"); |
|
| 23 | - output("docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n"); |
|
| 24 | - output("os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n"); |
|
| 21 | + output("name: ".htmlspecialchars($value["toolkitName"])."\n"); |
|
| 22 | + output("version: ".htmlspecialchars($value["toolkitVersion"])."\n"); |
|
| 23 | + output("docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n"); |
|
| 24 | + output("os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n"); |
|
| 25 | 25 | output("</pre>"); |
| 26 | 26 | } else { |
| 27 | 27 | output("An error occurred: "); |
| 28 | - output("Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n"); |
|
| 28 | + output("Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n"); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | output("</body></html>\n"); |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Introspect demo</title></head> |
@@ -13,13 +13,13 @@ discard block |
||
| 13 | 13 | function display_error($r) |
| 14 | 14 | { |
| 15 | 15 | output("An error occurred: "); |
| 16 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
| 16 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | $client = new PhpXmlRpc\Client(XMLRPCSERVER); |
| 20 | 20 | |
| 21 | 21 | // First off, let's retrieve the list of methods available on the remote server |
| 22 | -output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"); |
|
| 22 | +output("<h3>methods available at http://".$client->server.$client->path."</h3>\n"); |
|
| 23 | 23 | $req = new PhpXmlRpc\Request('system.listMethods'); |
| 24 | 24 | $resp = $client->send($req); |
| 25 | 25 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | // Then, retrieve the signature and help text of each available method |
| 32 | 32 | foreach ($v as $methodName) { |
| 33 | - output("<h4>" . htmlspecialchars($methodName->scalarval()) . "</h4>\n"); |
|
| 33 | + output("<h4>".htmlspecialchars($methodName->scalarval())."</h4>\n"); |
|
| 34 | 34 | // build messages first, add params later |
| 35 | 35 | $m1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 36 | 36 | $m2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -61,13 +61,13 @@ discard block |
||
| 61 | 61 | if ($val->kindOf() == "array") { |
| 62 | 62 | foreach ($val as $x) { |
| 63 | 63 | $ret = $x[0]; |
| 64 | - output("<code>" . htmlspecialchars($ret->scalarval()) . " " |
|
| 65 | - . htmlspecialchars($methodName->scalarval()) . "("); |
|
| 66 | - if ($x->count() > 1) { |
|
| 67 | - for ($k = 1; $k < $x->count(); $k++) { |
|
| 64 | + output("<code>".htmlspecialchars($ret->scalarval())." " |
|
| 65 | + . htmlspecialchars($methodName->scalarval())."("); |
|
| 66 | + if ($x->count()>1) { |
|
| 67 | + for ($k = 1; $k<$x->count(); $k++) { |
|
| 68 | 68 | $y = $x[$k]; |
| 69 | 69 | output(htmlspecialchars($y->scalarval())); |
| 70 | - if ($k < $x->count() - 1) { |
|
| 70 | + if ($k<$x->count()-1) { |
|
| 71 | 71 | output(", "); |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Proxy demo</title></head> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Mail demo</title></head> |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | output("<font color=\"red\">"); |
| 36 | 36 | output("Mail send failed<br/>\n"); |
| 37 | 37 | output("Fault: "); |
| 38 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 39 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"); |
|
| 38 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
| 39 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"); |
|
| 40 | 40 | output("</font><br/>"); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 18 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $targetFile = null; |
@@ -38,5 +38,5 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 41 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 41 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 42 | 42 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | public static function xmlrpc_debugmsg($msg) |
| 205 | 205 | { |
| 206 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 206 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | public static function error_occurred($msg) |
| 217 | 217 | { |
| 218 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 218 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 235 | 235 | $out = ''; |
| 236 | 236 | if ($this->debug_info != '') { |
| 237 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 237 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 238 | 238 | } |
| 239 | 239 | if (static::$_xmlrpc_debuginfo != '') { |
| 240 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 240 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 241 | 241 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 242 | 242 | // into return payload AFTER the beginning tag |
| 243 | 243 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -267,8 +267,8 @@ discard block |
||
| 267 | 267 | $this->debug_info = ''; |
| 268 | 268 | |
| 269 | 269 | // Save what we received, before parsing it |
| 270 | - if ($this->debug > 1) { |
|
| 271 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 270 | + if ($this->debug>1) { |
|
| 271 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -282,21 +282,21 @@ discard block |
||
| 282 | 282 | $r->raw_data = $rawData; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors) { |
|
| 286 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 287 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 285 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors) { |
|
| 286 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 287 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | $payload = $this->xml_header($respCharset); |
| 291 | - if ($this->debug > 0) { |
|
| 292 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
| 291 | + if ($this->debug>0) { |
|
| 292 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | // Do not create response serialization if it has already happened. Helps building json magic |
| 296 | 296 | if (empty($r->payload)) { |
| 297 | 297 | $r->serialize($respCharset); |
| 298 | 298 | } |
| 299 | - $payload = $payload . $r->payload; |
|
| 299 | + $payload = $payload.$r->payload; |
|
| 300 | 300 | |
| 301 | 301 | if ($returnPayload) { |
| 302 | 302 | return $payload; |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | // if we get a warning/error that has output some text before here, then we cannot |
| 306 | 306 | // add a new header. We cannot say we are sending xml, either... |
| 307 | 307 | if (!headers_sent()) { |
| 308 | - header('Content-Type: ' . $r->content_type); |
|
| 308 | + header('Content-Type: '.$r->content_type); |
|
| 309 | 309 | // we do not know if client actually told us an accepted charset, but if he did |
| 310 | 310 | // we have to tell him what we did |
| 311 | 311 | header("Vary: Accept-Charset"); |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 335 | 335 | // responses up to 8000 bytes |
| 336 | 336 | if ($phpNoSelfCompress) { |
| 337 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 337 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 338 | 338 | } |
| 339 | 339 | } else { |
| 340 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 340 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | print $payload; |
@@ -392,9 +392,9 @@ discard block |
||
| 392 | 392 | $numParams = count($in); |
| 393 | 393 | } |
| 394 | 394 | foreach ($sigs as $curSig) { |
| 395 | - if (count($curSig) == $numParams + 1) { |
|
| 395 | + if (count($curSig) == $numParams+1) { |
|
| 396 | 396 | $itsOK = 1; |
| 397 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 397 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 398 | 398 | if (is_object($in)) { |
| 399 | 399 | $p = $in->getParam($n); |
| 400 | 400 | if ($p->kindOf() == 'scalar') { |
@@ -407,10 +407,10 @@ discard block |
||
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | // param index is $n+1, as first member of sig is return type |
| 410 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 410 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 411 | 411 | $itsOK = 0; |
| 412 | - $pno = $n + 1; |
|
| 413 | - $wanted = $curSig[$n + 1]; |
|
| 412 | + $pno = $n+1; |
|
| 413 | + $wanted = $curSig[$n+1]; |
|
| 414 | 414 | $got = $pt; |
| 415 | 415 | break; |
| 416 | 416 | } |
@@ -437,10 +437,10 @@ discard block |
||
| 437 | 437 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 438 | 438 | // (this is true even when in CLI mode) |
| 439 | 439 | if (count($_SERVER) == 0) { |
| 440 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 440 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | - if ($this->debug > 1) { |
|
| 443 | + if ($this->debug>1) { |
|
| 444 | 444 | if (function_exists('getallheaders')) { |
| 445 | 445 | $this->debugmsg(''); // empty line |
| 446 | 446 | foreach (getallheaders() as $name => $val) { |
@@ -464,13 +464,13 @@ discard block |
||
| 464 | 464 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 465 | 465 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 466 | 466 | $data = $degzdata; |
| 467 | - if ($this->debug > 1) { |
|
| 468 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 467 | + if ($this->debug>1) { |
|
| 468 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 469 | 469 | } |
| 470 | 470 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 471 | 471 | $data = $degzdata; |
| 472 | - if ($this->debug > 1) { |
|
| 473 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 472 | + if ($this->debug>1) { |
|
| 473 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 474 | 474 | } |
| 475 | 475 | } else { |
| 476 | 476 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | if (extension_loaded('mbstring')) { |
| 565 | 565 | $data = mb_convert_encoding($data, 'UTF-8', $reqEncoding); |
| 566 | 566 | } else { |
| 567 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding); |
|
| 567 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding); |
|
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | } |
@@ -583,16 +583,16 @@ discard block |
||
| 583 | 583 | |
| 584 | 584 | $xmlRpcParser = $this->getParser(); |
| 585 | 585 | $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options); |
| 586 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
| 586 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
| 587 | 587 | // (BC) we return XML error as a faultCode |
| 588 | 588 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
| 589 | 589 | $r = new Response(0, |
| 590 | - PhpXmlRpc::$xmlrpcerrxml + $matches[1], |
|
| 590 | + PhpXmlRpc::$xmlrpcerrxml+$matches[1], |
|
| 591 | 591 | $xmlRpcParser->_xh['isf_reason']); |
| 592 | 592 | } elseif ($xmlRpcParser->_xh['isf']) { |
| 593 | 593 | $r = new Response(0, |
| 594 | 594 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 595 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
| 595 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
| 596 | 596 | } else { |
| 597 | 597 | // small layering violation in favor of speed and memory usage: |
| 598 | 598 | // we should allow the 'execute' method handle this, but in the |
@@ -603,20 +603,20 @@ discard block |
||
| 603 | 603 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 604 | 604 | ) |
| 605 | 605 | ) { |
| 606 | - if ($this->debug > 1) { |
|
| 607 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
| 606 | + if ($this->debug>1) { |
|
| 607 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
| 608 | 608 | } |
| 609 | 609 | $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
| 610 | 610 | } else { |
| 611 | 611 | // build a Request object with data parsed from xml |
| 612 | 612 | $req = new Request($xmlRpcParser->_xh['method']); |
| 613 | 613 | // now add parameters in |
| 614 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 614 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 615 | 615 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | - if ($this->debug > 1) { |
|
| 619 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 618 | + if ($this->debug>1) { |
|
| 619 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 620 | 620 | } |
| 621 | 621 | $r = $this->execute($req); |
| 622 | 622 | } |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | return new Response( |
| 670 | 670 | 0, |
| 671 | 671 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 672 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": ${errStr}" |
|
| 672 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": ${errStr}" |
|
| 673 | 673 | ); |
| 674 | 674 | } |
| 675 | 675 | } |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | if (is_array($func)) { |
| 684 | 684 | if (is_object($func[0])) { |
| 685 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 685 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 686 | 686 | } else { |
| 687 | 687 | $funcName = implode('::', $func); |
| 688 | 688 | } |
@@ -694,17 +694,17 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | // verify that function to be invoked is in fact callable |
| 696 | 696 | if (!is_callable($func)) { |
| 697 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 697 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 698 | 698 | return new Response( |
| 699 | 699 | 0, |
| 700 | 700 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 701 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 701 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 702 | 702 | ); |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | // If debug level is 3, we should catch all errors generated during |
| 706 | 706 | // processing of user function, and log them as part of response |
| 707 | - if ($this->debug > 2) { |
|
| 707 | + if ($this->debug>2) { |
|
| 708 | 708 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
| 709 | 709 | } |
| 710 | 710 | |
@@ -717,14 +717,14 @@ discard block |
||
| 717 | 717 | $r = call_user_func($func, $req); |
| 718 | 718 | } |
| 719 | 719 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 720 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 720 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 721 | 721 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 722 | 722 | $r = new Response($r); |
| 723 | 723 | } else { |
| 724 | 724 | $r = new Response( |
| 725 | 725 | 0, |
| 726 | 726 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 727 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 727 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 728 | 728 | ); |
| 729 | 729 | } |
| 730 | 730 | } |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | // mimic EPI behaviour: if we get an array that looks like an error, make it |
| 741 | 741 | // an error response |
| 742 | 742 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 743 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 743 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 744 | 744 | } else { |
| 745 | 745 | // functions using EPI api should NOT return resp objects, |
| 746 | 746 | // so make sure we encode the return type correctly |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | // in the called function, we wrap it in a proper error-response |
| 765 | 765 | switch ($this->exception_handling) { |
| 766 | 766 | case 2: |
| 767 | - if ($this->debug > 2) { |
|
| 767 | + if ($this->debug>2) { |
|
| 768 | 768 | if (self::$_xmlrpcs_prev_ehandler) { |
| 769 | 769 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 770 | 770 | } else { |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']); |
| 780 | 780 | } |
| 781 | 781 | } |
| 782 | - if ($this->debug > 2) { |
|
| 782 | + if ($this->debug>2) { |
|
| 783 | 783 | // note: restore the error handler we found before calling the |
| 784 | 784 | // user func, even if it has been changed inside the func itself |
| 785 | 785 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | */ |
| 800 | 800 | protected function debugmsg($string) |
| 801 | 801 | { |
| 802 | - $this->debug_info .= $string . "\n"; |
|
| 802 | + $this->debug_info .= $string."\n"; |
|
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | /** |
@@ -809,9 +809,9 @@ discard block |
||
| 809 | 809 | protected function xml_header($charsetEncoding = '') |
| 810 | 810 | { |
| 811 | 811 | if ($charsetEncoding != '') { |
| 812 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 812 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 813 | 813 | } else { |
| 814 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 814 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 815 | 815 | } |
| 816 | 816 | } |
| 817 | 817 | |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | $i++; // for error message, we count params from 1 |
| 1069 | 1069 | return static::_xmlrpcs_multicall_error(new Response(0, |
| 1070 | 1070 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1071 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1071 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | 1074 | |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | } |
| 1146 | 1146 | } else { |
| 1147 | 1147 | $numCalls = count($req); |
| 1148 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1148 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1149 | 1149 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1150 | 1150 | } |
| 1151 | 1151 | } |
@@ -151,35 +151,35 @@ discard block |
||
| 151 | 151 | public function serialize($charsetEncoding = '') |
| 152 | 152 | { |
| 153 | 153 | if ($charsetEncoding != '') { |
| 154 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 154 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 155 | 155 | } else { |
| 156 | 156 | $this->content_type = 'text/xml'; |
| 157 | 157 | } |
| 158 | 158 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 159 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 159 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 160 | 160 | } else { |
| 161 | 161 | $result = "<methodResponse>\n"; |
| 162 | 162 | } |
| 163 | 163 | if ($this->errno) { |
| 164 | 164 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 165 | - $result .= "<fault>\n" . |
|
| 166 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 167 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 168 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 165 | + $result .= "<fault>\n". |
|
| 166 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 167 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 168 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 169 | 169 | "</struct>\n</value>\n</fault>"; |
| 170 | 170 | } else { |
| 171 | 171 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 172 | 172 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 173 | - $result .= "<params>\n<param>\n" . |
|
| 174 | - $this->val . |
|
| 173 | + $result .= "<params>\n<param>\n". |
|
| 174 | + $this->val. |
|
| 175 | 175 | "</param>\n</params>"; |
| 176 | 176 | } else { |
| 177 | 177 | /// @todo try to build something serializable using the Encoder... |
| 178 | 178 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 179 | 179 | } |
| 180 | 180 | } else { |
| 181 | - $result .= "<params>\n<param>\n" . |
|
| 182 | - $this->val->serialize($charsetEncoding) . |
|
| 181 | + $result .= "<params>\n<param>\n". |
|
| 182 | + $this->val->serialize($charsetEncoding). |
|
| 183 | 183 | "</param>\n</params>"; |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | return $this->httpResponse['raw_data']; |
| 205 | 205 | default: |
| 206 | 206 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 207 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 207 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 208 | 208 | return null; |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | break; |
| 226 | 226 | default: |
| 227 | 227 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 228 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 228 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | break; |
| 258 | 258 | default: |
| 259 | 259 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 260 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 260 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -252,23 +252,23 @@ discard block |
||
| 252 | 252 | if (is_array($callable)) { |
| 253 | 253 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 254 | 254 | if ($func->isPrivate()) { |
| 255 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 255 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 256 | 256 | return false; |
| 257 | 257 | } |
| 258 | 258 | if ($func->isProtected()) { |
| 259 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 259 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 260 | 260 | return false; |
| 261 | 261 | } |
| 262 | 262 | if ($func->isConstructor()) { |
| 263 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 263 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 264 | 264 | return false; |
| 265 | 265 | } |
| 266 | 266 | if ($func->isDestructor()) { |
| 267 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 267 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | 270 | if ($func->isAbstract()) { |
| 271 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | /// @todo add more checks for static vs. nonstatic? |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | if ($func->isInternal()) { |
| 279 | 279 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 280 | 280 | // instead of getparameters to fully reflect internal php functions ? |
| 281 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 281 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 282 | 282 | return false; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $i = 0; |
| 331 | 331 | foreach ($func->getParameters() as $paramObj) { |
| 332 | 332 | $params[$i] = array(); |
| 333 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 333 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 334 | 334 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 335 | 335 | $i++; |
| 336 | 336 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // build a signature |
| 396 | 396 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 397 | 397 | $pSig = array($funcDesc['returnsDocs']); |
| 398 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 398 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 399 | 399 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 400 | 400 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 401 | 401 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -761,21 +761,21 @@ discard block |
||
| 761 | 761 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 762 | 762 | { |
| 763 | 763 | $namespace = '\\PhpXmlRpc\\'; |
| 764 | - $reqClass = $namespace . 'Request'; |
|
| 765 | - $valClass = $namespace . 'Value'; |
|
| 766 | - $decoderClass = $namespace . 'Encoder'; |
|
| 764 | + $reqClass = $namespace.'Request'; |
|
| 765 | + $valClass = $namespace.'Value'; |
|
| 766 | + $decoderClass = $namespace.'Encoder'; |
|
| 767 | 767 | |
| 768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 772 | 772 | |
| 773 | 773 | $req = new $reqClass('system.methodSignature'); |
| 774 | 774 | $req->addparam(new $valClass($methodName)); |
| 775 | 775 | $client->setDebug($debug); |
| 776 | 776 | $response = $client->send($req, $timeout, $protocol); |
| 777 | 777 | if ($response->faultCode()) { |
| 778 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 778 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 779 | 779 | return false; |
| 780 | 780 | } |
| 781 | 781 | |
@@ -785,8 +785,8 @@ discard block |
||
| 785 | 785 | $mSig = $decoder->decode($mSig); |
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 789 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 788 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 789 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 790 | 790 | return false; |
| 791 | 791 | } |
| 792 | 792 | |
@@ -802,11 +802,11 @@ discard block |
||
| 802 | 802 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 803 | 803 | { |
| 804 | 804 | $namespace = '\\PhpXmlRpc\\'; |
| 805 | - $reqClass = $namespace . 'Request'; |
|
| 806 | - $valClass = $namespace . 'Value'; |
|
| 805 | + $reqClass = $namespace.'Request'; |
|
| 806 | + $valClass = $namespace.'Value'; |
|
| 807 | 807 | |
| 808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 811 | 811 | |
| 812 | 812 | $mDesc = ''; |
@@ -840,10 +840,10 @@ discard block |
||
| 840 | 840 | $clientClone = clone $client; |
| 841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 842 | 842 | { |
| 843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 847 | 847 | if (isset($extraOptions['return_on_fault'])) { |
| 848 | 848 | $decodeFault = true; |
| 849 | 849 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -852,9 +852,9 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | $namespace = '\\PhpXmlRpc\\'; |
| 855 | - $reqClass = $namespace . 'Request'; |
|
| 856 | - $encoderClass = $namespace . 'Encoder'; |
|
| 857 | - $valueClass = $namespace . 'Value'; |
|
| 855 | + $reqClass = $namespace.'Request'; |
|
| 856 | + $encoderClass = $namespace.'Encoder'; |
|
| 857 | + $valueClass = $namespace.'Value'; |
|
| 858 | 858 | |
| 859 | 859 | $encoder = new $encoderClass(); |
| 860 | 860 | $encodeOptions = array(); |
@@ -925,13 +925,13 @@ discard block |
||
| 925 | 925 | * @param string $mDesc |
| 926 | 926 | * @return string[] keys: source, docstring |
| 927 | 927 | */ |
| 928 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 928 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 929 | 929 | { |
| 930 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 930 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 931 | 931 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 932 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 933 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 934 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 932 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 933 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 934 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 935 | 935 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 936 | 936 | if (isset($extraOptions['return_on_fault'])) { |
| 937 | 937 | $decodeFault = true; |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | $namespace = '\\PhpXmlRpc\\'; |
| 945 | 945 | |
| 946 | 946 | $code = "function $newFuncName ("; |
| 947 | - if ($clientCopyMode < 2) { |
|
| 947 | + if ($clientCopyMode<2) { |
|
| 948 | 948 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 949 | 949 | $verbatimClientCopy = !$clientCopyMode; |
| 950 | 950 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | |
| 960 | 960 | if ($mDesc != '') { |
| 961 | 961 | // take care that PHP comment is not terminated unwillingly by method description |
| 962 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 962 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 963 | 963 | } else { |
| 964 | 964 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 965 | 965 | } |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 969 | 969 | $plist = array(); |
| 970 | 970 | $pCount = count($mSig); |
| 971 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 971 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 972 | 972 | $plist[] = "\$p$i"; |
| 973 | 973 | $pType = $mSig[$i]; |
| 974 | 974 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -984,19 +984,19 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | } |
| 986 | 986 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 987 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 987 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 988 | 988 | } |
| 989 | - if ($clientCopyMode < 2) { |
|
| 989 | + if ($clientCopyMode<2) { |
|
| 990 | 990 | $plist[] = '$debug=0'; |
| 991 | 991 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 992 | 992 | } |
| 993 | 993 | $plist = implode(', ', $plist); |
| 994 | - $mDesc .= '* @return {$namespace}Response|' . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 994 | + $mDesc .= '* @return {$namespace}Response|'.$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 995 | 995 | |
| 996 | 996 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 997 | 997 | if ($decodeFault) { |
| 998 | 998 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 999 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 999 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1000 | 1000 | } else { |
| 1001 | 1001 | $respCode = var_export($faultResponse, true); |
| 1002 | 1002 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1012 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1013 | 1013 | |
| 1014 | 1014 | return array('source' => $code, 'docstring' => $mDesc); |
| 1015 | 1015 | } |
@@ -1035,23 +1035,23 @@ discard block |
||
| 1035 | 1035 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1036 | 1036 | { |
| 1037 | 1037 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1038 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1038 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1039 | 1039 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1040 | 1040 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1041 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1042 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1041 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1042 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1043 | 1043 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1044 | 1044 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1045 | 1045 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1046 | 1046 | $namespace = '\\PhpXmlRpc\\'; |
| 1047 | 1047 | |
| 1048 | - $reqClass = $namespace . 'Request'; |
|
| 1049 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1048 | + $reqClass = $namespace.'Request'; |
|
| 1049 | + $decoderClass = $namespace.'Encoder'; |
|
| 1050 | 1050 | |
| 1051 | 1051 | $req = new $reqClass('system.listMethods'); |
| 1052 | 1052 | $response = $client->send($req, $timeout, $protocol); |
| 1053 | 1053 | if ($response->faultCode()) { |
| 1054 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1054 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1055 | 1055 | |
| 1056 | 1056 | return false; |
| 1057 | 1057 | } else { |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | $mList = $decoder->decode($mList); |
| 1062 | 1062 | } |
| 1063 | 1063 | if (!is_array($mList) || !count($mList)) { |
| 1064 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1064 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1065 | 1065 | |
| 1066 | 1066 | return false; |
| 1067 | 1067 | } else { |
@@ -1069,8 +1069,8 @@ discard block |
||
| 1069 | 1069 | if ($newClassName != '') { |
| 1070 | 1070 | $xmlrpcClassName = $newClassName; |
| 1071 | 1071 | } else { |
| 1072 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | - array('_', ''), $client->server) . '_client'; |
|
| 1072 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | + array('_', ''), $client->server).'_client'; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1076 | 1076 | $xmlrpcClassName .= 'x'; |
@@ -1101,20 +1101,20 @@ discard block |
||
| 1101 | 1101 | if (!$buildIt) { |
| 1102 | 1102 | $source .= $methodWrap['docstring']; |
| 1103 | 1103 | } |
| 1104 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1104 | + $source .= $methodWrap['source']."\n"; |
|
| 1105 | 1105 | } else { |
| 1106 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1106 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | } |
| 1110 | 1110 | $source .= "}\n"; |
| 1111 | 1111 | if ($buildIt) { |
| 1112 | 1112 | $allOK = 0; |
| 1113 | - eval($source . '$allOK=1;'); |
|
| 1113 | + eval($source.'$allOK=1;'); |
|
| 1114 | 1114 | if ($allOK) { |
| 1115 | 1115 | return $xmlrpcClassName; |
| 1116 | 1116 | } else { |
| 1117 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1117 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1118 | 1118 | return false; |
| 1119 | 1119 | } |
| 1120 | 1120 | } else { |
@@ -1137,8 +1137,8 @@ discard block |
||
| 1137 | 1137 | */ |
| 1138 | 1138 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1139 | 1139 | { |
| 1140 | - $code = "\$client = new {$namespace}Client('" . str_replace("'", "\'", $client->path) . |
|
| 1141 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 1140 | + $code = "\$client = new {$namespace}Client('".str_replace("'", "\'", $client->path). |
|
| 1141 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 1142 | 1142 | |
| 1143 | 1143 | // copy all client fields to the client that will be generated runtime |
| 1144 | 1144 | // (this provides for future expansion or subclassing of client obj) |
@@ -76,13 +76,13 @@ discard block |
||
| 76 | 76 | 'scalar' => $val, |
| 77 | 77 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 78 | 78 | ); |
| 79 | - return (object)$xmlrpcVal; |
|
| 79 | + return (object) $xmlrpcVal; |
|
| 80 | 80 | case 'base64': |
| 81 | 81 | $xmlrpcVal = array( |
| 82 | 82 | 'xmlrpc_type' => 'base64', |
| 83 | 83 | 'scalar' => $val |
| 84 | 84 | ); |
| 85 | - return (object)$xmlrpcVal; |
|
| 85 | + return (object) $xmlrpcVal; |
|
| 86 | 86 | case 'string': |
| 87 | 87 | if (isset($options['extension_api_encoding'])) { |
| 88 | 88 | $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | case 'msg': |
| 146 | 146 | $paramCount = $xmlrpcVal->getNumParams(); |
| 147 | 147 | $arr = array(); |
| 148 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 148 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 149 | 149 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 150 | 150 | } |
| 151 | 151 | return $arr; |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | break; |
| 263 | 263 | case 'resource': |
| 264 | 264 | if (in_array('extension_api', $options)) { |
| 265 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 265 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 266 | 266 | } else { |
| 267 | 267 | $xmlrpcVal = new Value(); |
| 268 | 268 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | if (extension_loaded('mbstring')) { |
| 311 | 311 | $xmlVal = mb_convert_encoding($xmlVal, 'UTF-8', $valEncoding); |
| 312 | 312 | } else { |
| 313 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 313 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | $parserOptions |
| 333 | 333 | ); |
| 334 | 334 | |
| 335 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
| 335 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
| 336 | 336 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
| 337 | 337 | |
| 338 | 338 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | case 'methodcall': |
| 358 | 358 | $req = new Request($xmlRpcParser->_xh['method']); |
| 359 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 359 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 360 | 360 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 361 | 361 | } |
| 362 | 362 | return $req; |
