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 | /** |
| 5 | 5 | * Demoing how to inject a custom logger for use by the library |
@@ -21,17 +21,17 @@ discard block |
||
| 21 | 21 | // logger API |
| 22 | 22 | public function debug($message, $context = array()) |
| 23 | 23 | { |
| 24 | - $this->debugBuffer .= $message . "\n"; |
|
| 24 | + $this->debugBuffer .= $message."\n"; |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function error($message, $context = array()) |
| 28 | 28 | { |
| 29 | - $this->errorBuffer .= $message . "\n"; |
|
| 29 | + $this->errorBuffer .= $message."\n"; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function warning($message, $context = array()) |
| 33 | 33 | { |
| 34 | - $this->warningBuffer .= $message . "\n"; |
|
| 34 | + $this->warningBuffer .= $message."\n"; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function getDebug() |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $input = array( |
| 64 | 64 | array('name' => 'Dave', 'age' => 24), |
| 65 | - array('name' => 'Edd', 'age' => 45), |
|
| 66 | - array('name' => 'Joe', 'age' => 37), |
|
| 65 | + array('name' => 'Edd', 'age' => 45), |
|
| 66 | + array('name' => 'Joe', 'age' => 37), |
|
| 67 | 67 | array('name' => 'Fred', 'age' => 27), |
| 68 | 68 | ); |
| 69 | 69 | |
@@ -85,6 +85,6 @@ discard block |
||
| 85 | 85 | $response = $client->send($request); |
| 86 | 86 | output("Response received.<br>"); |
| 87 | 87 | |
| 88 | -output("The client error info is:<pre>\n" . $logger->getError() . "\n</pre>"); |
|
| 89 | -output("The client warning info is:<pre>\n" . $logger->getWarning() . "\n</pre>"); |
|
| 90 | -output("The client debug info is:<pre>\n" . $logger->getDebug() . "\n</pre>"); |
|
| 88 | +output("The client error info is:<pre>\n".$logger->getError()."\n</pre>"); |
|
| 89 | +output("The client warning info is:<pre>\n".$logger->getWarning()."\n</pre>"); |
|
| 90 | +output("The client debug info is:<pre>\n".$logger->getDebug()."\n</pre>"); |
|
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | if ($response->faultCode()) { |
| 29 | 29 | throw new HttpException(502, $response->faultString()); |
| 30 | 30 | } else { |
| 31 | - return new Response("<html><body>State number $stateNo is: " . $response->value()->scalarVal() . '</body></html>'); |
|
| 31 | + return new Response("<html><body>State number $stateNo is: ".$response->value()->scalarVal().'</body></html>'); |
|
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -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 | /** |
| 5 | 5 | * Demoing the code-generation capabilities of the library: create all that is required to expose as xml-rpc methods |
@@ -38,33 +38,33 @@ discard block |
||
| 38 | 38 | // generate a file with a class definition |
| 39 | 39 | |
| 40 | 40 | // the generated code does not have an autoloader included - we need to add in one |
| 41 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 41 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 42 | 42 | |
| 43 | 43 | file_put_contents($targetClassFile, |
| 44 | - "<?php\n\n" . |
|
| 45 | - "require_once '$autoloader';\n\n" . |
|
| 44 | + "<?php\n\n". |
|
| 45 | + "require_once '$autoloader';\n\n". |
|
| 46 | 46 | "class MyServerClass\n{\n\n" |
| 47 | 47 | ) || die('uh oh'); |
| 48 | 48 | |
| 49 | 49 | // we mangle a bit the code we get from wrapPhpClass to turn it into a php class definition instead of a bunch of functions |
| 50 | 50 | |
| 51 | -foreach($code as $methodName => $methodDef) { |
|
| 52 | - file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh'); |
|
| 53 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
| 51 | +foreach ($code as $methodName => $methodDef) { |
|
| 52 | + file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh'); |
|
| 53 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
| 54 | 54 | unset($code[$methodName]['source']); |
| 55 | 55 | } |
| 56 | 56 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
| 57 | 57 | |
| 58 | 58 | // generate separate files with the xml-rpc server instantiation and its dispatch map |
| 59 | 59 | |
| 60 | -file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n"); |
|
| 60 | +file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n"); |
|
| 61 | 61 | |
| 62 | 62 | file_put_contents($targetControllerFile, |
| 63 | - "<?php\n\n" . |
|
| 63 | + "<?php\n\n". |
|
| 64 | 64 | |
| 65 | - "require_once '$autoloader';\n\n" . |
|
| 65 | + "require_once '$autoloader';\n\n". |
|
| 66 | 66 | |
| 67 | - "require_once '$targetClassFile';\n\n" . |
|
| 67 | + "require_once '$targetClassFile';\n\n". |
|
| 68 | 68 | |
| 69 | 69 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
| 70 | 70 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -74,12 +74,12 @@ discard block |
||
| 74 | 74 | // Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm); |
| 75 | 75 | // Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm); |
| 76 | 76 | |
| 77 | - "\$dm = require_once '$targetDispatchMapFile';\n" . |
|
| 78 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n\n" . |
|
| 79 | - '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" . |
|
| 80 | - '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" . |
|
| 81 | - '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n\n" . |
|
| 82 | - '$s->service();' . "\n" |
|
| 77 | + "\$dm = require_once '$targetDispatchMapFile';\n". |
|
| 78 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n\n". |
|
| 79 | + '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n". |
|
| 80 | + '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n". |
|
| 81 | + '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n\n". |
|
| 82 | + '$s->service();'."\n" |
|
| 83 | 83 | ) || die('uh oh'); |
| 84 | 84 | |
| 85 | 85 | // test that everything worked by running it in realtime (note that this script will return an xml-rpc error message if |
@@ -173,20 +173,20 @@ discard block |
||
| 173 | 173 | $callable = explode('::', $callable); |
| 174 | 174 | } |
| 175 | 175 | if (is_array($callable)) { |
| 176 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 176 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | if (is_string($callable[0])) { |
| 181 | 181 | $plainFuncName = implode('::', $callable); |
| 182 | 182 | } elseif (is_object($callable[0])) { |
| 183 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 183 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 184 | 184 | } |
| 185 | 185 | $exists = method_exists($callable[0], $callable[1]); |
| 186 | 186 | } else if ($callable instanceof \Closure) { |
| 187 | 187 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 188 | 188 | if (!$buildIt) { |
| 189 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 189 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 190 | 190 | return false; |
| 191 | 191 | } |
| 192 | 192 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | if (!$exists) { |
| 201 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 201 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 202 | 202 | return false; |
| 203 | 203 | } |
| 204 | 204 | |
@@ -242,23 +242,23 @@ discard block |
||
| 242 | 242 | if (is_array($callable)) { |
| 243 | 243 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 244 | 244 | if ($func->isPrivate()) { |
| 245 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 245 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 246 | 246 | return false; |
| 247 | 247 | } |
| 248 | 248 | if ($func->isProtected()) { |
| 249 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 249 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 250 | 250 | return false; |
| 251 | 251 | } |
| 252 | 252 | if ($func->isConstructor()) { |
| 253 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 253 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 254 | 254 | return false; |
| 255 | 255 | } |
| 256 | 256 | if ($func->isDestructor()) { |
| 257 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 257 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 258 | 258 | return false; |
| 259 | 259 | } |
| 260 | 260 | if ($func->isAbstract()) { |
| 261 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 261 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 262 | 262 | return false; |
| 263 | 263 | } |
| 264 | 264 | /// @todo add more checks for static vs. nonstatic? |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | if ($func->isInternal()) { |
| 269 | 269 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 270 | 270 | /// reflect internal php functions |
| 271 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | $i = 0; |
| 321 | 321 | foreach ($func->getParameters() as $paramObj) { |
| 322 | 322 | $params[$i] = array(); |
| 323 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 323 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 324 | 324 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 325 | 325 | $i++; |
| 326 | 326 | } |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | // build a signature |
| 385 | 385 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 386 | 386 | $pSig = array($funcDesc['returnsDocs']); |
| 387 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 387 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 388 | 388 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 389 | 389 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 390 | 390 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | } |
| 441 | 441 | } |
| 442 | 442 | $numPars = $req->getNumParams(); |
| 443 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 443 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 444 | 444 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 445 | 445 | } |
| 446 | 446 | |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | |
| 454 | 454 | $result = call_user_func_array($callable, $params); |
| 455 | 455 | |
| 456 | - if (! is_a($result, $responseClass)) { |
|
| 456 | + if (!is_a($result, $responseClass)) { |
|
| 457 | 457 | // q: why not do the same for int, float, bool, string? |
| 458 | 458 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 459 | 459 | $result = new $valueClass($result, $funcDesc['returns']); |
@@ -492,9 +492,9 @@ discard block |
||
| 492 | 492 | if ($newFuncName == '') { |
| 493 | 493 | if (is_array($callable)) { |
| 494 | 494 | if (is_string($callable[0])) { |
| 495 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 495 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 496 | 496 | } else { |
| 497 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 497 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 498 | 498 | } |
| 499 | 499 | } else { |
| 500 | 500 | if ($callable instanceof \Closure) { |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | */ |
| 527 | 527 | protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc) |
| 528 | 528 | { |
| 529 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 530 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 531 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 529 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 530 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 531 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 532 | 532 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 533 | 533 | |
| 534 | 534 | $i = 0; |
@@ -563,9 +563,9 @@ discard block |
||
| 563 | 563 | // build body of new function |
| 564 | 564 | |
| 565 | 565 | $innerCode = " \$paramCount = \$req->getNumParams();\n"; |
| 566 | - $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 566 | + $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 567 | 567 | |
| 568 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 568 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 569 | 569 | if ($decodePhpObjects) { |
| 570 | 570 | $innerCode .= " \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n"; |
| 571 | 571 | } else { |
@@ -578,23 +578,23 @@ discard block |
||
| 578 | 578 | static::holdObject($newFuncName, $callable[0]); |
| 579 | 579 | $class = get_class($callable[0]); |
| 580 | 580 | if ($class[0] !== '\\') { |
| 581 | - $class = '\\' . $class; |
|
| 581 | + $class = '\\'.$class; |
|
| 582 | 582 | } |
| 583 | 583 | $innerCode .= " /// @var $class \$obj\n"; |
| 584 | 584 | $innerCode .= " \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n"; |
| 585 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 585 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 586 | 586 | } else { |
| 587 | 587 | $realFuncName = $plainFuncName; |
| 588 | 588 | } |
| 589 | 589 | foreach ($parsVariations as $i => $pars) { |
| 590 | - $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 591 | - if ($i < (count($parsVariations) - 1)) |
|
| 590 | + $innerCode .= " if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 591 | + if ($i<(count($parsVariations)-1)) |
|
| 592 | 592 | $innerCode .= " else\n"; |
| 593 | 593 | } |
| 594 | - $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
|
| 594 | + $innerCode .= " if (is_a(\$retVal, '".static::$namespace."Response'))\n return \$retVal;\n else\n"; |
|
| 595 | 595 | /// q: why not do the same for int, float, bool, string? |
| 596 | 596 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 597 | - $innerCode .= " return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 597 | + $innerCode .= " return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 598 | 598 | } else { |
| 599 | 599 | $encodeOptions = array(); |
| 600 | 600 | if ($encodeNulls) { |
@@ -605,18 +605,18 @@ discard block |
||
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | if ($encodeOptions) { |
| 608 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" . |
|
| 609 | - implode("', '", $encodeOptions) . "')));"; |
|
| 608 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('". |
|
| 609 | + implode("', '", $encodeOptions)."')));"; |
|
| 610 | 610 | } else { |
| 611 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));"; |
|
| 611 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal));"; |
|
| 612 | 612 | } |
| 613 | 613 | } |
| 614 | 614 | // shall we exclude functions returning by ref? |
| 615 | 615 | // if ($func->returnsReference()) |
| 616 | 616 | // return false; |
| 617 | 617 | |
| 618 | - $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" . |
|
| 619 | - "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}"; |
|
| 618 | + $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n". |
|
| 619 | + "function $newFuncName(\$req)\n{\n".$innerCode."\n}"; |
|
| 620 | 620 | |
| 621 | 621 | return $code; |
| 622 | 622 | } |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 677 | 677 | { |
| 678 | 678 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 679 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 679 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 680 | 680 | } |
| 681 | 681 | |
| 682 | 682 | if (is_object($className)) { |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | } else { |
| 685 | 685 | $realClassName = $className; |
| 686 | 686 | } |
| 687 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 687 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | /** |
@@ -780,14 +780,14 @@ discard block |
||
| 780 | 780 | */ |
| 781 | 781 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 782 | 782 | { |
| 783 | - $reqClass = static::$namespace . 'Request'; |
|
| 784 | - $valClass = static::$namespace . 'Value'; |
|
| 785 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 783 | + $reqClass = static::$namespace.'Request'; |
|
| 784 | + $valClass = static::$namespace.'Value'; |
|
| 785 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 786 | 786 | |
| 787 | 787 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 788 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 788 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 789 | 789 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 790 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 790 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 791 | 791 | |
| 792 | 792 | $req = new $reqClass('system.methodSignature'); |
| 793 | 793 | $req->addParam(new $valClass($methodName)); |
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | $response = $client->send($req, $timeout, $protocol); |
| 798 | 798 | $client->setDebug($origDebug); |
| 799 | 799 | if ($response->faultCode()) { |
| 800 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 800 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 801 | 801 | return false; |
| 802 | 802 | } |
| 803 | 803 | |
@@ -808,8 +808,8 @@ discard block |
||
| 808 | 808 | $mSig = $decoder->decode($mSig); |
| 809 | 809 | } |
| 810 | 810 | |
| 811 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 812 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 811 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 812 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 813 | 813 | return false; |
| 814 | 814 | } |
| 815 | 815 | |
@@ -824,11 +824,11 @@ discard block |
||
| 824 | 824 | */ |
| 825 | 825 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 826 | 826 | { |
| 827 | - $reqClass = static::$namespace . 'Request'; |
|
| 828 | - $valClass = static::$namespace . 'Value'; |
|
| 827 | + $reqClass = static::$namespace.'Request'; |
|
| 828 | + $valClass = static::$namespace.'Value'; |
|
| 829 | 829 | |
| 830 | 830 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 831 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 831 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 832 | 832 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 833 | 833 | |
| 834 | 834 | $mDesc = ''; |
@@ -865,11 +865,11 @@ discard block |
||
| 865 | 865 | $clientClone = clone $client; |
| 866 | 866 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 867 | 867 | { |
| 868 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 868 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 869 | 869 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 870 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 871 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 872 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 870 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 871 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 872 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 873 | 873 | $throwFault = false; |
| 874 | 874 | $decodeFault = false; |
| 875 | 875 | $faultResponse = null; |
@@ -880,9 +880,9 @@ discard block |
||
| 880 | 880 | $faultResponse = $extraOptions['return_on_fault']; |
| 881 | 881 | } |
| 882 | 882 | |
| 883 | - $reqClass = static::$namespace . 'Request'; |
|
| 884 | - $encoderClass = static::$namespace . 'Encoder'; |
|
| 885 | - $valueClass = static::$namespace . 'Value'; |
|
| 883 | + $reqClass = static::$namespace.'Request'; |
|
| 884 | + $encoderClass = static::$namespace.'Encoder'; |
|
| 885 | + $valueClass = static::$namespace.'Value'; |
|
| 886 | 886 | |
| 887 | 887 | $encoder = new $encoderClass(); |
| 888 | 888 | $encodeOptions = array(); |
@@ -964,14 +964,14 @@ discard block |
||
| 964 | 964 | * @param string $mDesc |
| 965 | 965 | * @return string[] keys: source, docstring |
| 966 | 966 | */ |
| 967 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 967 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 968 | 968 | { |
| 969 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 969 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 970 | 970 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 971 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 972 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 973 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 974 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 971 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 972 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 973 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 974 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 975 | 975 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 976 | 976 | $throwFault = false; |
| 977 | 977 | $decodeFault = false; |
@@ -984,10 +984,10 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | $code = "function $newFuncName("; |
| 987 | - if ($clientCopyMode < 2) { |
|
| 987 | + if ($clientCopyMode<2) { |
|
| 988 | 988 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 989 | 989 | $verbatimClientCopy = !$clientCopyMode; |
| 990 | - $innerCode = ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 990 | + $innerCode = ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 991 | 991 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
| 992 | 992 | $this_ = ''; |
| 993 | 993 | } else { |
@@ -995,28 +995,28 @@ discard block |
||
| 995 | 995 | $innerCode = ''; |
| 996 | 996 | $this_ = 'this->'; |
| 997 | 997 | } |
| 998 | - $innerCode .= " \$req = new " . static::$namespace . "Request('$methodName');\n"; |
|
| 998 | + $innerCode .= " \$req = new ".static::$namespace."Request('$methodName');\n"; |
|
| 999 | 999 | |
| 1000 | 1000 | if ($mDesc != '') { |
| 1001 | 1001 | // take care that PHP comment is not terminated unwillingly by method description |
| 1002 | 1002 | /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags... |
| 1003 | - $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n"; |
|
| 1003 | + $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n"; |
|
| 1004 | 1004 | } else { |
| 1005 | 1005 | $mDesc = "/**\n * Function $newFuncName.\n"; |
| 1006 | 1006 | } |
| 1007 | 1007 | |
| 1008 | 1008 | // param parsing |
| 1009 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 1009 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 1010 | 1010 | $plist = array(); |
| 1011 | 1011 | $pCount = count($mSig); |
| 1012 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 1012 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 1013 | 1013 | $plist[] = "\$p$i"; |
| 1014 | 1014 | $pType = $mSig[$i]; |
| 1015 | 1015 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
| 1016 | 1016 | $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null' |
| 1017 | 1017 | ) { |
| 1018 | 1018 | // only build directly xml-rpc values when type is known and scalar |
| 1019 | - $innerCode .= " \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n"; |
|
| 1019 | + $innerCode .= " \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n"; |
|
| 1020 | 1020 | } else { |
| 1021 | 1021 | if ($encodePhpObjects || $encodeNulls) { |
| 1022 | 1022 | $encOpts = array(); |
@@ -1027,26 +1027,26 @@ discard block |
||
| 1027 | 1027 | $encOpts[] = 'null_extension'; |
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | - $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n"; |
|
| 1030 | + $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n"; |
|
| 1031 | 1031 | } else { |
| 1032 | 1032 | $innerCode .= " \$p$i = \$encoder->encode(\$p$i);\n"; |
| 1033 | 1033 | } |
| 1034 | 1034 | } |
| 1035 | 1035 | $innerCode .= " \$req->addParam(\$p$i);\n"; |
| 1036 | - $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 1036 | + $mDesc .= " * @param ".$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1037 | 1037 | } |
| 1038 | - if ($clientCopyMode < 2) { |
|
| 1038 | + if ($clientCopyMode<2) { |
|
| 1039 | 1039 | $plist[] = '$debug = 0'; |
| 1040 | 1040 | $mDesc .= " * @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1041 | 1041 | } |
| 1042 | 1042 | $plist = implode(', ', $plist); |
| 1043 | - $mDesc .= ' * @return ' . $this->xmlrpc2PhpType($mSig[0]); |
|
| 1043 | + $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]); |
|
| 1044 | 1044 | if ($throwFault) { |
| 1045 | - $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception'); |
|
| 1045 | + $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception'); |
|
| 1046 | 1046 | } else if ($decodeFault) { |
| 1047 | - $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)"; |
|
| 1047 | + $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)"; |
|
| 1048 | 1048 | } else { |
| 1049 | - $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)"; |
|
| 1049 | + $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)"; |
|
| 1050 | 1050 | } |
| 1051 | 1051 | $mDesc .= "\n */\n"; |
| 1052 | 1052 | |
@@ -1059,9 +1059,9 @@ discard block |
||
| 1059 | 1059 | $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())"; |
| 1060 | 1060 | } else if ($decodeFault) { |
| 1061 | 1061 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1062 | - $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1062 | + $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1063 | 1063 | } else { |
| 1064 | - $respCode = 'return ' . var_export($faultResponse, true); |
|
| 1064 | + $respCode = 'return '.var_export($faultResponse, true); |
|
| 1065 | 1065 | } |
| 1066 | 1066 | } else { |
| 1067 | 1067 | $respCode = 'return $res'; |
@@ -1072,7 +1072,7 @@ discard block |
||
| 1072 | 1072 | $innerCode .= " if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());"; |
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | - $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n"; |
|
| 1075 | + $code = $code.$plist.")\n{\n".$innerCode."\n}\n"; |
|
| 1076 | 1076 | |
| 1077 | 1077 | return array('source' => $code, 'docstring' => $mDesc); |
| 1078 | 1078 | } |
@@ -1102,26 +1102,26 @@ discard block |
||
| 1102 | 1102 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1103 | 1103 | { |
| 1104 | 1104 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1105 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1105 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1106 | 1106 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1107 | 1107 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1108 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 1109 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1110 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1108 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 1109 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1110 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1111 | 1111 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1112 | - $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false; |
|
| 1112 | + $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false; |
|
| 1113 | 1113 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1114 | 1114 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1115 | 1115 | |
| 1116 | - $reqClass = static::$namespace . 'Request'; |
|
| 1117 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 1116 | + $reqClass = static::$namespace.'Request'; |
|
| 1117 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 1118 | 1118 | |
| 1119 | 1119 | // retrieve the list of methods |
| 1120 | 1120 | $req = new $reqClass('system.listMethods'); |
| 1121 | 1121 | /// @todo move setting of timeout, protocol to outside the send() call |
| 1122 | 1122 | $response = $client->send($req, $timeout, $protocol); |
| 1123 | 1123 | if ($response->faultCode()) { |
| 1124 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1124 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1125 | 1125 | |
| 1126 | 1126 | return false; |
| 1127 | 1127 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | $mList = $decoder->decode($mList); |
| 1133 | 1133 | } |
| 1134 | 1134 | if (!is_array($mList) || !count($mList)) { |
| 1135 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1135 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1136 | 1136 | |
| 1137 | 1137 | return false; |
| 1138 | 1138 | } |
@@ -1142,8 +1142,8 @@ discard block |
||
| 1142 | 1142 | $xmlrpcClassName = $newClassName; |
| 1143 | 1143 | } else { |
| 1144 | 1144 | /// @todo direct access to $client->server is now deprecated |
| 1145 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''), |
|
| 1146 | - $client->server) . '_client'; |
|
| 1145 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''), |
|
| 1146 | + $client->server).'_client'; |
|
| 1147 | 1147 | } |
| 1148 | 1148 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1149 | 1149 | $xmlrpcClassName .= 'x'; |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | |
| 1152 | 1152 | $source = "class $xmlrpcClassName\n{\n public \$client;\n\n"; |
| 1153 | 1153 | $source .= " function __construct()\n {\n"; |
| 1154 | - $source .= ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1154 | + $source .= ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1155 | 1155 | $source .= "\$this->client = \$client;\n }\n\n"; |
| 1156 | 1156 | $opts = array( |
| 1157 | 1157 | 'return_source' => true, |
@@ -1174,28 +1174,28 @@ discard block |
||
| 1174 | 1174 | $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts); |
| 1175 | 1175 | if ($methodWrap) { |
| 1176 | 1176 | if ($buildIt) { |
| 1177 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1177 | + $source .= $methodWrap['source']."\n"; |
|
| 1178 | 1178 | |
| 1179 | 1179 | } else { |
| 1180 | - $source .= ' ' . str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1181 | - $source .= str_replace("\n", "\n ", $methodWrap['source']). "\n"; |
|
| 1180 | + $source .= ' '.str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1181 | + $source .= str_replace("\n", "\n ", $methodWrap['source'])."\n"; |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | } else { |
| 1185 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1185 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1186 | 1186 | } |
| 1187 | 1187 | } |
| 1188 | 1188 | } |
| 1189 | 1189 | $source .= "}\n"; |
| 1190 | 1190 | if ($buildIt) { |
| 1191 | 1191 | $allOK = 0; |
| 1192 | - eval($source . '$allOK=1;'); |
|
| 1192 | + eval($source.'$allOK=1;'); |
|
| 1193 | 1193 | if ($allOK) { |
| 1194 | 1194 | return $xmlrpcClassName; |
| 1195 | 1195 | } else { |
| 1196 | 1196 | /// @todo direct access to $client->server is now deprecated |
| 1197 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . |
|
| 1198 | - ' to wrap remote server ' . $client->server); |
|
| 1197 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName. |
|
| 1198 | + ' to wrap remote server '.$client->server); |
|
| 1199 | 1199 | return false; |
| 1200 | 1200 | } |
| 1201 | 1201 | } else { |
@@ -1214,7 +1214,7 @@ discard block |
||
| 1214 | 1214 | */ |
| 1215 | 1215 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1216 | 1216 | { |
| 1217 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()) . |
|
| 1217 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()). |
|
| 1218 | 1218 | "');\n"; |
| 1219 | 1219 | |
| 1220 | 1220 | // copy all client fields to the client that will be generated runtime |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $val = reset($ar); |
| 130 | 130 | $typ = key($ar); |
| 131 | 131 | |
| 132 | - return '<value>' . $this->serializeData($typ, $val) . "</value>\n"; |
|
| 132 | + return '<value>'.$this->serializeData($typ, $val)."</value>\n"; |
|
| 133 | 133 | //} |
| 134 | 134 | } |
| 135 | 135 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | // preserve back compatibility |
| 149 | 149 | |
| 150 | 150 | if (is_array($b)) { |
| 151 | - foreach($b as $id => $cont) { |
|
| 151 | + foreach ($b as $id => $cont) { |
|
| 152 | 152 | $b[$id] = $cont->scalarVal(); |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -156,10 +156,10 @@ discard block |
||
| 156 | 156 | // add support for structures directly encoding php objects |
| 157 | 157 | if (is_object($b)) { |
| 158 | 158 | $t = get_object_vars($b); |
| 159 | - foreach($t as $id => $cont) { |
|
| 159 | + foreach ($t as $id => $cont) { |
|
| 160 | 160 | $t[$id] = $cont->scalarVal(); |
| 161 | 161 | } |
| 162 | - foreach($t as $id => $cont) { |
|
| 162 | + foreach ($t as $id => $cont) { |
|
| 163 | 163 | @$b->$id = $cont; |
| 164 | 164 | } |
| 165 | 165 | } |
@@ -201,17 +201,17 @@ discard block |
||
| 201 | 201 | /* Expose as global functions the ones which are now class methods */ |
| 202 | 202 | |
| 203 | 203 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 204 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 204 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 205 | 205 | { |
| 206 | 206 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | -function iso8601_encode($timeT, $utc=0) |
|
| 209 | +function iso8601_encode($timeT, $utc = 0) |
|
| 210 | 210 | { |
| 211 | 211 | return Date::iso8601Encode($timeT, $utc); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function iso8601_decode($iDate, $utc=0) |
|
| 214 | +function iso8601_decode($iDate, $utc = 0) |
|
| 215 | 215 | { |
| 216 | 216 | return Date::iso8601Decode($iDate, $utc); |
| 217 | 217 | } |
@@ -221,25 +221,25 @@ discard block |
||
| 221 | 221 | return Http::decodeChunked($buffer); |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 224 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 225 | 225 | { |
| 226 | 226 | $encoder = new Encoder(); |
| 227 | 227 | return $encoder->decode($xmlrpcVal, $options); |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 230 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 231 | 231 | { |
| 232 | 232 | $encoder = new Encoder(); |
| 233 | 233 | return $encoder->encode($phpVal, $options); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 236 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 237 | 237 | { |
| 238 | 238 | $encoder = new Encoder(); |
| 239 | 239 | return $encoder->decodeXml($xmlVal, $options); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 242 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 243 | 243 | { |
| 244 | 244 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 245 | 245 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param array $extraOptions |
| 42 | 42 | * @return array|false |
| 43 | 43 | */ |
| 44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
| 44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
| 45 | 45 | { |
| 46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 47 | 47 | if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * @param array $extraOptions |
| 65 | 65 | * @return array|false |
| 66 | 66 | */ |
| 67 | -function wrap_php_class($className, $extraOptions=array()) |
|
| 67 | +function wrap_php_class($className, $extraOptions = array()) |
|
| 68 | 68 | { |
| 69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 70 | 70 | $fix = false; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $fix = true; |
| 75 | 75 | } |
| 76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
| 77 | - foreach($wrapped as $name => $value) { |
|
| 77 | + foreach ($wrapped as $name => $value) { |
|
| 78 | 78 | if ($fix) { |
| 79 | 79 | eval($value['source']); |
| 80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
| 94 | 94 | * @return array|callable|false |
| 95 | 95 | */ |
| 96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
| 96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
| 97 | 97 | { |
| 98 | 98 | if (!is_array($extraOptions)) |
| 99 | 99 | { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param array $extraOptions |
| 129 | 129 | * @return mixed |
| 130 | 130 | */ |
| 131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
| 131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
| 132 | 132 | { |
| 133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
| 149 | 149 | { |
| 150 | 150 | $code = "function $xmlrpcFuncName ("; |
| 151 | - if ($clientCopyMode < 2) { |
|
| 151 | + if ($clientCopyMode<2) { |
|
| 152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
| 153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
| 154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | if ($mDesc != '') { |
| 164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
| 165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 166 | 166 | } else { |
| 167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
| 168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 172 | 172 | $plist = array(); |
| 173 | 173 | $pCount = count($mSig); |
| 174 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 174 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 175 | 175 | $plist[] = "\$p$i"; |
| 176 | 176 | $pType = $mSig[$i]; |
| 177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
| 190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
| 191 | 191 | } |
| 192 | - if ($clientCopyMode < 2) { |
|
| 192 | + if ($clientCopyMode<2) { |
|
| 193 | 193 | $plist[] = '$debug=0'; |
| 194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 195 | 195 | } |
| 196 | 196 | $plist = implode(', ', $plist); |
| 197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 198 | 198 | |
| 199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 200 | 200 | if ($decodeFault) { |
| 201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 203 | 203 | } else { |
| 204 | 204 | $respCode = var_export($faultResponse, true); |
| 205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $innerCode .= "if (\$res->faultCode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 216 | 216 | |
| 217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
| 218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * @deprecated |
| 222 | 222 | */ |
| 223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
| 223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
| 224 | 224 | { |
| 225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
| 226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 227 | 227 | |
| 228 | 228 | // copy all client fields to the client that will be generated runtime |
| 229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -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 | use PhpXmlRpc\Encoder; |
| 5 | 5 | use PhpXmlRpc\Client; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $handles = array(); |
| 34 | 34 | $curl = curl_multi_init(); |
| 35 | 35 | |
| 36 | - foreach($requests as $k => $req) { |
|
| 36 | + foreach ($requests as $k => $req) { |
|
| 37 | 37 | $req->setDebug($this->debug); |
| 38 | 38 | $handle = $this->createCurlHandle($req, $method, $this->server, $this->port, $this->path, $opts); |
| 39 | 39 | curl_multi_add_handle($curl, $handle); |
@@ -43,20 +43,20 @@ discard block |
||
| 43 | 43 | $running = 0; |
| 44 | 44 | do { |
| 45 | 45 | curl_multi_exec($curl, $running); |
| 46 | - } while($running > 0); |
|
| 46 | + } while ($running>0); |
|
| 47 | 47 | |
| 48 | 48 | $responses = array(); |
| 49 | 49 | $errors = array(); |
| 50 | - foreach($handles as $k => $h) { |
|
| 50 | + foreach ($handles as $k => $h) { |
|
| 51 | 51 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
| 52 | 52 | |
| 53 | - if ($this->debug > 1) { |
|
| 53 | + if ($this->debug>1) { |
|
| 54 | 54 | $message = "---CURL INFO---\n"; |
| 55 | 55 | foreach (curl_getinfo($h) as $name => $val) { |
| 56 | 56 | if (is_array($val)) { |
| 57 | 57 | $val = implode("\n", $val); |
| 58 | 58 | } |
| 59 | - $message .= $name . ': ' . $val . "\n"; |
|
| 59 | + $message .= $name.': '.$val."\n"; |
|
| 60 | 60 | } |
| 61 | 61 | $message .= '---END---'; |
| 62 | 62 | $this->getLogger()->debugMessage($message); |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | curl_multi_close($curl); |
| 73 | 73 | |
| 74 | - foreach($responses as $k => $resp) { |
|
| 74 | + foreach ($responses as $k => $resp) { |
|
| 75 | 75 | if (!$resp) { |
| 76 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . $errors[$k]); |
|
| 76 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.$errors[$k]); |
|
| 77 | 77 | } else { |
| 78 | 78 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
| 79 | 79 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $value = $encoder->encode($data, array('auto_dates')); |
| 94 | 94 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 95 | 95 | $reqs = array(); |
| 96 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 96 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 97 | 97 | $reqs[] = $req; |
| 98 | 98 | } |
| 99 | 99 | |
@@ -102,40 +102,40 @@ discard block |
||
| 102 | 102 | // avoid storing http info in the responses, to make the checksums comparable |
| 103 | 103 | $client->setDebug(-1); |
| 104 | 104 | |
| 105 | -echo "Making $num_tests calls to method interopEchoTests.echoValue on server " . XMLRPCSERVER . " ...\n"; |
|
| 105 | +echo "Making $num_tests calls to method interopEchoTests.echoValue on server ".XMLRPCSERVER." ...\n"; |
|
| 106 | 106 | flush(); |
| 107 | 107 | |
| 108 | -$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 108 | +$client->setOption(Client::OPT_NO_MULTICALL, true); |
|
| 109 | 109 | $t = microtime(true); |
| 110 | 110 | $resp = $client->send($reqs); |
| 111 | -$t = microtime(true) - $t; |
|
| 112 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 113 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 111 | +$t = microtime(true)-$t; |
|
| 112 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 113 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 114 | 114 | flush(); |
| 115 | 115 | |
| 116 | 116 | if (strpos(XMLRPCSERVER, 'http://') === 0) { |
| 117 | - $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
| 117 | + $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS); |
|
| 118 | 118 | $t = microtime(true); |
| 119 | 119 | $resp = $client->send($reqs); |
| 120 | - $t = microtime(true) - $t; |
|
| 121 | - echo "Sequential send, curl (w. keepalive): " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 122 | - echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 120 | + $t = microtime(true)-$t; |
|
| 121 | + echo "Sequential send, curl (w. keepalive): ".sprintf('%.3f', $t)." secs.\n"; |
|
| 122 | + echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 123 | 123 | flush(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $t = microtime(true); |
| 127 | 127 | $resp = $client->sendParallel($reqs); |
| 128 | -$t = microtime(true) - $t; |
|
| 129 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 130 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 128 | +$t = microtime(true)-$t; |
|
| 129 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 130 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 131 | 131 | flush(); |
| 132 | 132 | |
| 133 | 133 | $client->setOption(Client::OPT_NO_MULTICALL, false); |
| 134 | 134 | // make sure we don't reuse the keepalive handle |
| 135 | -$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
| 135 | +$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER); |
|
| 136 | 136 | $t = microtime(true); |
| 137 | 137 | $resp = $client->send($reqs); |
| 138 | -$t = microtime(true) - $t; |
|
| 139 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 140 | -echo "Response checksum: " . md5(var_export($resp, true)) . "\n"; |
|
| 138 | +$t = microtime(true)-$t; |
|
| 139 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 140 | +echo "Response checksum: ".md5(var_export($resp, true))."\n"; |
|
| 141 | 141 | flush(); |
@@ -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>phpxmlrpc - Introspect demo</title></head> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | function display_error($r) |
| 18 | 18 | { |
| 19 | 19 | output("An error occurred: "); |
| 20 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
| 20 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | $client = new Client(XMLRPCSERVER); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP); |
| 26 | 26 | |
| 27 | 27 | // First off, let's retrieve the list of methods available on the remote server |
| 28 | -output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n"); |
|
| 28 | +output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n"); |
|
| 29 | 29 | $req = new Request('system.listMethods'); |
| 30 | 30 | $resp = $client->send($req); |
| 31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | // Then, retrieve the signature and help text of each available method |
| 49 | 49 | foreach ($v as $methodName) { |
| 50 | - output("<h4>" . htmlspecialchars($methodName) . "</h4>\n"); |
|
| 50 | + output("<h4>".htmlspecialchars($methodName)."</h4>\n"); |
|
| 51 | 51 | // build requests first, add params later |
| 52 | 52 | $r1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 53 | 53 | $r2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | continue; |
| 84 | 84 | } |
| 85 | 85 | $ret = $sig[0]; |
| 86 | - output("<code>" . htmlspecialchars($ret) . " " |
|
| 87 | - . htmlspecialchars($methodName) . "("); |
|
| 88 | - if (count($sig) > 1) { |
|
| 89 | - for ($k = 1; $k < count($sig); $k++) { |
|
| 86 | + output("<code>".htmlspecialchars($ret)." " |
|
| 87 | + . htmlspecialchars($methodName)."("); |
|
| 88 | + if (count($sig)>1) { |
|
| 89 | + for ($k = 1; $k<count($sig); $k++) { |
|
| 90 | 90 | output(htmlspecialchars($sig[$k])); |
| 91 | - if ($k < count($sig) - 1) { |
|
| 91 | + if ($k<count($sig)-1) { |
|
| 92 | 92 | output(", "); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $message); |
|
| 17 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$message); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] . |
|
| 38 | - ' is only supposed to be called by ' . $expectedCaller); |
|
| 37 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function']. |
|
| 38 | + ' is only supposed to be called by '.$expectedCaller); |
|
| 39 | 39 | } |
| 40 | 40 | } |
