@@ -141,9 +141,9 @@ |
||
| 141 | 141 | * @deprecated |
| 142 | 142 | */ |
| 143 | 143 | function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName, |
| 144 | - $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
| 145 | - $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
| 146 | - $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
| 144 | + $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
| 145 | + $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
| 146 | + $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
| 147 | 147 | { |
| 148 | 148 | $code = "function $xmlrpcFuncName ("; |
| 149 | 149 | if ($clientCopyMode < 2) { |
@@ -24,14 +24,16 @@ |
||
| 24 | 24 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80); |
| 25 | 25 | $this->client->setDebug($this->args['DEBUG']); |
| 26 | 26 | |
| 27 | - if ($this->args['DEBUG'] == 1) |
|
| 28 | - ob_start(); |
|
| 27 | + if ($this->args['DEBUG'] == 1) { |
|
| 28 | + ob_start(); |
|
| 29 | + } |
|
| 29 | 30 | } |
| 30 | 31 | |
| 31 | 32 | protected function tear_down() |
| 32 | 33 | { |
| 33 | - if ($this->args['DEBUG'] != 1) |
|
| 34 | - return; |
|
| 34 | + if ($this->args['DEBUG'] != 1) { |
|
| 35 | + return; |
|
| 36 | + } |
|
| 35 | 37 | $out = ob_get_clean(); |
| 36 | 38 | $status = $this->getStatus(); |
| 37 | 39 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -201,8 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
| 203 | 203 | return; |
| 204 | - } |
|
| 205 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 204 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 206 | 205 | { |
| 207 | 206 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
| 208 | 207 | return; |
@@ -226,8 +225,7 @@ discard block |
||
| 226 | 225 | { |
| 227 | 226 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
| 228 | 227 | return; |
| 229 | - } |
|
| 230 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 228 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 231 | 229 | { |
| 232 | 230 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
| 233 | 231 | return; |
@@ -278,13 +276,11 @@ discard block |
||
| 278 | 276 | { |
| 279 | 277 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
| 280 | 278 | return; |
| 281 | - } |
|
| 282 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 279 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 283 | 280 | { |
| 284 | 281 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
| 285 | 282 | return; |
| 286 | - } |
|
| 287 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 283 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 288 | 284 | { |
| 289 | 285 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
| 290 | 286 | return; |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -12,7 +12,12 @@ |
||
| 12 | 12 | <html lang="en"> |
| 13 | 13 | <head> |
| 14 | 14 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 15 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 15 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 16 | + echo 'JSONRPC'; |
|
| 17 | +} else { |
|
| 18 | + echo 'XMLRPC'; |
|
| 19 | +} |
|
| 20 | +?> Debugger</title> |
|
| 16 | 21 | </head> |
| 17 | 22 | <frameset rows="360,*"> |
| 18 | 23 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |
@@ -176,8 +176,7 @@ |
||
| 176 | 176 | } else { |
| 177 | 177 | $escapedData .= $ch; |
| 178 | 178 | } |
| 179 | - } |
|
| 180 | - else if ($ii < 128) { |
|
| 179 | + } else if ($ii < 128) { |
|
| 181 | 180 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 182 | 181 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 183 | 182 | switch ($ii) { |
@@ -591,8 +591,9 @@ |
||
| 591 | 591 | } |
| 592 | 592 | foreach ($parsVariations as $i => $pars) { |
| 593 | 593 | $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 594 | - if ($i < (count($parsVariations) - 1)) |
|
| 595 | - $innerCode .= "else\n"; |
|
| 594 | + if ($i < (count($parsVariations) - 1)) { |
|
| 595 | + $innerCode .= "else\n"; |
|
| 596 | + } |
|
| 596 | 597 | } |
| 597 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
| 598 | 599 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |