gggeek /
phpxmlrpc
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | - return exampleMethods::$stateNames[$stateNo - 1]; |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo-1])) { |
|
| 30 | + return exampleMethods::$stateNames[$stateNo-1]; |
|
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
| 33 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 33 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($req->getNumParams()) { |
| 70 | 70 | $p1 = $req->getParam(0); |
| 71 | 71 | if ($p1->kindOf() === 'scalar') { |
| 72 | - $errNum = (int)$p1->scalarVal(); |
|
| 72 | + $errNum = (int) $p1->scalarVal(); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | throw new Exception("it's just a test", $errNum); |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $findstate10_sig = array( |
| 143 | 143 | /// @todo add a demo and test with closure usage |
| 144 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
| 144 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
| 145 | 145 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 146 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 146 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 147 | 147 | 'index of that state name in an alphabetic order.', |
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 150 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 151 | 151 | |
| 152 | 152 | /// @todo do we really need a new instance ? |
| 153 | 153 | $c = new handlersContainer(); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
| 158 | 158 | |
| 159 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 159 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 160 | 160 | |
| 161 | 161 | return array_merge( |
| 162 | 162 | array( |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | use PhpXmlRpc\Encoder; |
| 20 | 20 | |
| 21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
| 22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 23 | 23 | |
| 24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 24 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 25 | 25 | $args = argParser::getArgs(); |
| 26 | 26 | |
| 27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
| 42 | 42 | trigger_error('ending test that was not started'); |
| 43 | 43 | } |
| 44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 46 | 46 | echo '.'; |
| 47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($is_web) { |
| 78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 79 | 79 | if ($xd) { |
| 80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 81 | 81 | } |
| 82 | 82 | flush(); |
| 83 | 83 | ob_flush(); |
| 84 | 84 | } else { |
| 85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 86 | 86 | if ($xd) { |
| 87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 94 | 94 | $vals = array(); |
| 95 | - for ($j = 0; $j < 10; $j++) { |
|
| 95 | + for ($j = 0; $j<10; $j++) { |
|
| 96 | 96 | $valArray = array(); |
| 97 | 97 | foreach ($data[$j] as $key => $val) { |
| 98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 119 | 119 | $encoder = new Encoder(); |
| 120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
| 122 | 122 | $out = $value->serialize(); |
| 123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | if (function_exists('xmlrpc_set_type')) { |
| 127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 129 | - for ($j = 0; $j < 10; $j++) { |
|
| 128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 129 | + for ($j = 0; $j<10; $j++) { |
|
| 130 | 130 | foreach ($keys as $k) { |
| 131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
| 140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 141 | 141 | $dummy = new Request(''); |
| 142 | 142 | $out = new Response($value); |
| 143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 144 | 144 | |
| 145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 147 | 147 | $response = $dummy->ParseResponse($in, true); |
| 148 | 148 | $value = $response->value(); |
| 149 | 149 | $result = array(); |
| 150 | - foreach($value as $val1) { |
|
| 150 | + foreach ($value as $val1) { |
|
| 151 | 151 | $out = array(); |
| 152 | - foreach($val1 as $name => $val) { |
|
| 152 | + foreach ($val1 as $name => $val) { |
|
| 153 | 153 | $out[$name] = array(); |
| 154 | - foreach($val as $data) { |
|
| 154 | + foreach ($val as $data) { |
|
| 155 | 155 | $out[$name][] = $data->scalarVal(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
| 161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 162 | 162 | |
| 163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 165 | 165 | $response = $dummy->ParseResponse($in, true); |
| 166 | 166 | $value = $response->value(); |
| 167 | 167 | $result = array(); |
| 168 | 168 | $l = $value->arraySize(); |
| 169 | - for ($k = 0; $k < $l; $k++) { |
|
| 169 | + for ($k = 0; $k<$l; $k++) { |
|
| 170 | 170 | $val1 = $value->arrayMem($k); |
| 171 | 171 | $out = array(); |
| 172 | - foreach($val1 as $name => $val) { |
|
| 172 | + foreach ($val1 as $name => $val) { |
|
| 173 | 173 | $out[$name] = array(); |
| 174 | 174 | $m = $val->arraySize(); |
| 175 | - for ($j = 0; $j < $m; $j++) { |
|
| 175 | + for ($j = 0; $j<$m; $j++) { |
|
| 176 | 176 | $data = $val->arrayMem($j); |
| 177 | 177 | $out[$name][] = $data->scalarVal(); |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 184 | 184 | |
| 185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 187 | 187 | $response = $dummy->parseResponse($in, true, 'phpvals'); |
| 188 | 188 | $value = $response->value(); |
| 189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | if (function_exists('xmlrpc_decode')) { |
| 193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 195 | 195 | $response = $dummy->parseResponse($in, true, 'xml'); |
| 196 | 196 | $value = xmlrpc_decode($response->value()); |
| 197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
| 216 | - if (count($server) > 1) { |
|
| 217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
| 216 | + if (count($server)>1) { |
|
| 217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
| 218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 219 | 219 | } else { |
| 220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
| 221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | begin_test($testName, 'http 10'); |
| 231 | 231 | $response = array(); |
| 232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 233 | 233 | $resp = $c->send($req); |
| 234 | 234 | $response[] = $resp->value(); |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
| 249 | 249 | $response = array(); |
| 250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 251 | 251 | $resp = $c->send($req, 10, 'http11'); |
| 252 | 252 | $response[] = $resp->value(); |
| 253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | begin_test($testName, 'http 10 w. compression'); |
| 271 | 271 | $response = array(); |
| 272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 273 | 273 | $resp = $c->send($req); |
| 274 | 274 | $response[] = $resp->value(); |
| 275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
| 281 | 281 | $response = array(); |
| 282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 283 | 283 | $resp = $c->send($req, 10, 'http11'); |
| 284 | 284 | $response[] = $resp->value(); |
| 285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 290 | 290 | $response = array(); |
| 291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 292 | 292 | $resp = $c->send($req, 10, 'http11'); |
| 293 | 293 | $response[] = $resp->value(); |
| 294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
| 310 | 310 | |
| 311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
| 312 | - if (count($server) > 1) { |
|
| 313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 312 | + if (count($server)>1) { |
|
| 313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 315 | 315 | } else { |
| 316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
| 318 | 318 | } |
| 319 | 319 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 328 | 328 | begin_test($testName, 'https no keep-alive'); |
| 329 | 329 | $response = array(); |
| 330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 331 | 331 | $resp = $c->send($req); |
| 332 | 332 | $response[] = $resp->value(); |
| 333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 337 | 337 | begin_test($testName, 'https w. keep-alive'); |
| 338 | 338 | $response = array(); |
| 339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 340 | 340 | $resp = $c->send($req, 10); |
| 341 | 341 | $response[] = $resp->value(); |
| 342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
| 359 | 359 | $response = array(); |
| 360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 361 | 361 | $resp = $c->send($req); |
| 362 | 362 | $response[] = $resp->value(); |
| 363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
| 368 | 368 | $response = array(); |
| 369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 370 | 370 | $resp = $c->send($req, 10); |
| 371 | 371 | $response[] = $resp->value(); |
| 372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
| 388 | 388 | |
| 389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
| 390 | - if (count($server) > 1) { |
|
| 391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 390 | + if (count($server)>1) { |
|
| 391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 393 | 393 | } else { |
| 394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
| 396 | 396 | } |
| 397 | 397 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 406 | 406 | begin_test($testName, 'http2 no keep-alive'); |
| 407 | 407 | $response = array(); |
| 408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 409 | 409 | $resp = $c->send($req); |
| 410 | 410 | $response[] = $resp->value(); |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 415 | 415 | begin_test($testName, 'http2 w. keep-alive'); |
| 416 | 416 | $response = array(); |
| 417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 418 | 418 | $resp = $c->send($req, 10); |
| 419 | 419 | $response[] = $resp->value(); |
| 420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
| 437 | 437 | $response = array(); |
| 438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 439 | 439 | $resp = $c->send($req); |
| 440 | 440 | $response[] = $resp->value(); |
| 441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
| 446 | 446 | $response = array(); |
| 447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 448 | 448 | $resp = $c->send($req, 10); |
| 449 | 449 | $response[] = $resp->value(); |
| 450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($test_results as $test => $results) { |
| 467 | 467 | echo "\nTEST: $test\n"; |
| 468 | 468 | foreach ($results as $case => $data) { |
| 469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST) |
| 47 | 47 | // Note that the only use-case for web-page mode is when this is used by benchmark.php |
| 48 | 48 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
| 49 | - foreach($_SERVER as $key => $val) { |
|
| 49 | + foreach ($_SERVER as $key => $val) { |
|
| 50 | 50 | if (array_key_exists($key, $args)) { |
| 51 | 51 | $$key = $val; |
| 52 | 52 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | //} |
| 92 | 92 | } |
| 93 | 93 | if ($HTTPURI[0] != '/') { |
| 94 | - $HTTPURI = '/' . $HTTPURI; |
|
| 94 | + $HTTPURI = '/'.$HTTPURI; |
|
| 95 | 95 | } |
| 96 | 96 | $args['HTTPURI'] = $HTTPURI; |
| 97 | 97 | |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if (isset($HTTPSIGNOREPEER)) { |
| 108 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
| 108 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if (isset($HTTPSVERIFYHOST)) { |
| 112 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
| 112 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if (isset($SSLVERSION)) { |
| 116 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
| 116 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | if (isset($PROXYSERVER)) { |
| 120 | 120 | $arr = explode(':', $PROXYSERVER); |
| 121 | 121 | $args['PROXYSERVER'] = $arr[0]; |
| 122 | - if (count($arr) > 1) { |
|
| 122 | + if (count($arr)>1) { |
|
| 123 | 123 | $args['PROXYPORT'] = $arr[1]; |
| 124 | 124 | } else { |
| 125 | 125 | $args['PROXYPORT'] = 8080; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase |
| 6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 17 | 17 | { |
| 18 | - $url = $this->baseUrl . $path; |
|
| 18 | + $url = $this->baseUrl.$path; |
|
| 19 | 19 | |
| 20 | 20 | $ch = curl_init($url); |
| 21 | 21 | curl_setopt_array($ch, array( |
@@ -29,21 +29,21 @@ discard block |
||
| 29 | 29 | CURLOPT_POSTFIELDS => $payload |
| 30 | 30 | )); |
| 31 | 31 | } |
| 32 | - $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId; |
|
| 32 | + $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId; |
|
| 33 | 33 | if ($this->collectCodeCoverageInformation) |
| 34 | 34 | { |
| 35 | - $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId; |
|
| 35 | + $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId; |
|
| 36 | 36 | } |
| 37 | 37 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
| 38 | 38 | |
| 39 | - if ($this->args['DEBUG'] > 0) { |
|
| 39 | + if ($this->args['DEBUG']>0) { |
|
| 40 | 40 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 41 | 41 | } |
| 42 | 42 | $page = curl_exec($ch); |
| 43 | 43 | $info = curl_getinfo($ch); |
| 44 | 44 | curl_close($ch); |
| 45 | 45 | |
| 46 | - $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']); |
|
| 46 | + $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']); |
|
| 47 | 47 | if (!$emptyPageOk) { |
| 48 | 48 | $this->assertNotEquals('', $page, 'Retrieved web page should not be empty'); |
| 49 | 49 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | protected function newClient($path) |
| 64 | 64 | { |
| 65 | - $client = new \PhpXmlRpc\Client($this->baseUrl . $path); |
|
| 65 | + $client = new \PhpXmlRpc\Client($this->baseUrl.$path); |
|
| 66 | 66 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId); |
| 67 | 67 | if ($this->collectCodeCoverageInformation) { |
| 68 | 68 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
@@ -187,12 +187,12 @@ discard block |
||
| 187 | 187 | // q: can php be built without ctype? should we use a regexp? |
| 188 | 188 | if (is_string($key) && !ctype_digit($key)) { |
| 189 | 189 | /// @todo on invalid options, throw/error-out instead of logging an error message? |
| 190 | - switch($key) { |
|
| 190 | + switch ($key) { |
|
| 191 | 191 | case 'target_charset': |
| 192 | 192 | if (function_exists('mb_convert_encoding')) { |
| 193 | 193 | $this->current_parsing_options['target_charset'] = $val; |
| 194 | 194 | } else { |
| 195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
| 195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
| 196 | 196 | } |
| 197 | 197 | break; |
| 198 | 198 | |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | if (is_callable($val)) { |
| 201 | 201 | $this->current_parsing_options['methodname_callback'] = $val; |
| 202 | 202 | } else { |
| 203 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
| 203 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
| 204 | 204 | } |
| 205 | 205 | break; |
| 206 | 206 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | break; |
| 212 | 212 | |
| 213 | 213 | default: |
| 214 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
| 214 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
| 215 | 215 | } |
| 216 | 216 | unset($mergedOptions[$key]); |
| 217 | 217 | } |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | |
| 258 | 258 | try { |
| 259 | 259 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
| 260 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 260 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 261 | 261 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 262 | 262 | // error handling: xml not well formed |
| 263 | - if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 263 | + if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 264 | 264 | $errCode = xml_get_error_code($parser); |
| 265 | 265 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 266 | 266 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | $this->_xh['isf_reason'] = $errStr; |
| 269 | 269 | } |
| 270 | 270 | // no need to parse further if we already have a fatal error |
| 271 | - if ($this->_xh['isf'] >= 2) { |
|
| 271 | + if ($this->_xh['isf']>=2) { |
|
| 272 | 272 | break; |
| 273 | 273 | } |
| 274 | 274 | } |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 314 | 314 | { |
| 315 | 315 | // if invalid xml-rpc already detected, skip all processing |
| 316 | - if ($this->_xh['isf'] >= 2) { |
|
| 316 | + if ($this->_xh['isf']>=2) { |
|
| 317 | 317 | return; |
| 318 | 318 | } |
| 319 | 319 | |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | if ($acceptSingleVals === false) { |
| 328 | 328 | $accept = $this->current_parsing_options['accept']; |
| 329 | 329 | } else { |
| 330 | - $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated'); |
|
| 330 | + $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated'); |
|
| 331 | 331 | $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE; |
| 332 | 332 | } |
| 333 | 333 | if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) || |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $this->_xh['rt'] = strtolower($name); |
| 338 | 338 | } else { |
| 339 | 339 | $this->_xh['isf'] = 2; |
| 340 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 340 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 341 | 341 | |
| 342 | 342 | return; |
| 343 | 343 | } |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | |
| 443 | 443 | case 'MEMBER': |
| 444 | 444 | // set member name to null, in case we do not find in the xml later on |
| 445 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null; |
|
| 445 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null; |
|
| 446 | 446 | //$this->_xh['ac']=''; |
| 447 | 447 | // Drop trough intentionally |
| 448 | 448 | |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | */ |
| 506 | 506 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 507 | 507 | { |
| 508 | - if ($this->_xh['isf'] >= 2) { |
|
| 508 | + if ($this->_xh['isf']>=2) { |
|
| 509 | 509 | return; |
| 510 | 510 | } |
| 511 | 511 | |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - if ($rebuildXmlrpcvals > 0) { |
|
| 530 | + if ($rebuildXmlrpcvals>0) { |
|
| 531 | 531 | // build the xml-rpc val out of the data received, and substitute it |
| 532 | 532 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 533 | 533 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -535,15 +535,15 @@ discard block |
||
| 535 | 535 | $temp->_php_class = $this->_xh['php_class']; |
| 536 | 536 | } |
| 537 | 537 | $this->_xh['value'] = $temp; |
| 538 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 538 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 539 | 539 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 540 | - $this->_xh['value'] = (object)array( |
|
| 540 | + $this->_xh['value'] = (object) array( |
|
| 541 | 541 | 'xmlrpc_type' => 'datetime', |
| 542 | 542 | 'scalar' => $this->_xh['value'], |
| 543 | 543 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 544 | 544 | ); |
| 545 | 545 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 546 | - $this->_xh['value'] = (object)array( |
|
| 546 | + $this->_xh['value'] = (object) array( |
|
| 547 | 547 | 'xmlrpc_type' => 'base64', |
| 548 | 548 | 'scalar' => $this->_xh['value'] |
| 549 | 549 | ); |
@@ -558,8 +558,8 @@ discard block |
||
| 558 | 558 | // check if we are inside an array or struct: |
| 559 | 559 | // if value just built is inside an array, let's move it into array on the stack |
| 560 | 560 | $vscount = count($this->_xh['valuestack']); |
| 561 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 562 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 561 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 562 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 563 | 563 | } |
| 564 | 564 | break; |
| 565 | 565 | |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | // log if receiving something strange, even though we set the value to false anyway |
| 587 | 587 | /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL |
| 588 | 588 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) { |
| 589 | - if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' . |
|
| 589 | + if (!$this->handleParsingError('invalid data received in BOOLEAN value: '. |
|
| 590 | 590 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 591 | 591 | return; |
| 592 | 592 | } |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | $this->_xh['vt'] = strtolower($name); |
| 607 | 607 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 608 | 608 | if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) { |
| 609 | - if (!$this->handleParsingError('non numeric data received in INT value: ' . |
|
| 609 | + if (!$this->handleParsingError('non numeric data received in INT value: '. |
|
| 610 | 610 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 611 | 611 | return; |
| 612 | 612 | } |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 615 | 615 | } else { |
| 616 | 616 | // it's ok, add it on |
| 617 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 617 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 618 | 618 | } |
| 619 | 619 | break; |
| 620 | 620 | |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | $this->_xh['vt'] = Value::$xmlrpcDouble; |
| 623 | 623 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 624 | 624 | if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) { |
| 625 | - if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' . |
|
| 625 | + if (!$this->handleParsingError('non numeric data received in DOUBLE value: '. |
|
| 626 | 626 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 627 | 627 | return; |
| 628 | 628 | } |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 631 | 631 | } else { |
| 632 | 632 | // it's ok, add it on |
| 633 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 633 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 634 | 634 | } |
| 635 | 635 | break; |
| 636 | 636 | |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 639 | 639 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 640 | 640 | if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) { |
| 641 | - if (!$this->handleParsingError('invalid data received in DATETIME value: ' . |
|
| 641 | + if (!$this->handleParsingError('invalid data received in DATETIME value: '. |
|
| 642 | 642 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 643 | 643 | return; |
| 644 | 644 | } |
@@ -649,9 +649,9 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | // the default regex used to validate the date string a few lines above should make this case impossible, |
| 651 | 651 | // but one never knows... |
| 652 | - } catch(\Exception $e) { |
|
| 652 | + } catch (\Exception $e) { |
|
| 653 | 653 | // what to do? We can not guarantee that a valid date can be created. We return null... |
| 654 | - if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' . |
|
| 654 | + if (!$this->handleParsingError('invalid data received in DATETIME value. Error '. |
|
| 655 | 655 | $e->getMessage(), __METHOD__)) { |
| 656 | 656 | return; |
| 657 | 657 | } |
@@ -668,14 +668,14 @@ discard block |
||
| 668 | 668 | $v = base64_decode($this->_xh['ac'], true); |
| 669 | 669 | if ($v === false) { |
| 670 | 670 | $this->_xh['isf'] = 2; |
| 671 | - $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']); |
|
| 671 | + $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']); |
|
| 672 | 672 | return; |
| 673 | 673 | } |
| 674 | 674 | } else { |
| 675 | 675 | $v = base64_decode($this->_xh['ac']); |
| 676 | 676 | if ($v === '' && $this->_xh['ac'] !== '') { |
| 677 | 677 | // only the empty string should decode to the empty string |
| 678 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' . |
|
| 678 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '. |
|
| 679 | 679 | $this->truncateValueForLog($this->_xh['ac'])); |
| 680 | 680 | } |
| 681 | 681 | } |
@@ -683,20 +683,20 @@ discard block |
||
| 683 | 683 | break; |
| 684 | 684 | |
| 685 | 685 | case 'NAME': |
| 686 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 686 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 687 | 687 | break; |
| 688 | 688 | |
| 689 | 689 | case 'MEMBER': |
| 690 | 690 | // add to array in the stack the last element built, unless no VALUE or no NAME were found |
| 691 | 691 | if ($this->_xh['vt']) { |
| 692 | 692 | $vscount = count($this->_xh['valuestack']); |
| 693 | - if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) { |
|
| 693 | + if ($this->_xh['valuestack'][$vscount-1]['name'] === null) { |
|
| 694 | 694 | if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) { |
| 695 | 695 | return; |
| 696 | 696 | } |
| 697 | - $this->_xh['valuestack'][$vscount - 1]['name'] = ''; |
|
| 697 | + $this->_xh['valuestack'][$vscount-1]['name'] = ''; |
|
| 698 | 698 | } |
| 699 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 699 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 700 | 700 | } else { |
| 701 | 701 | if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) { |
| 702 | 702 | return; |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | public function xmlrpc_cd($parser, $data) |
| 831 | 831 | { |
| 832 | 832 | // skip processing if xml fault already detected |
| 833 | - if ($this->_xh['isf'] >= 2) { |
|
| 833 | + if ($this->_xh['isf']>=2) { |
|
| 834 | 834 | return; |
| 835 | 835 | } |
| 836 | 836 | |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | public function xmlrpc_dh($parser, $data) |
| 853 | 853 | { |
| 854 | 854 | // skip processing if xml fault already detected |
| 855 | - if ($this->_xh['isf'] >= 2) { |
|
| 855 | + if ($this->_xh['isf']>=2) { |
|
| 856 | 856 | return; |
| 857 | 857 | } |
| 858 | 858 | |
@@ -932,8 +932,8 @@ discard block |
||
| 932 | 932 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 933 | 933 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 934 | 934 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 935 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 936 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 935 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 936 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 937 | 937 | $xmlChunk, $matches)) { |
| 938 | 938 | return strtoupper(substr($matches[2], 1, -1)); |
| 939 | 939 | } |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 952 | 952 | // IANA also likes better US-ASCII, so go with it |
| 953 | 953 | if ($enc == 'ASCII') { |
| 954 | - $enc = 'US-' . $enc; |
|
| 954 | + $enc = 'US-'.$enc; |
|
| 955 | 955 | } |
| 956 | 956 | |
| 957 | 957 | return $enc; |
@@ -992,8 +992,8 @@ discard block |
||
| 992 | 992 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 993 | 993 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 994 | 994 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 995 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 996 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 995 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 996 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 997 | 997 | $xmlChunk)) { |
| 998 | 998 | return true; |
| 999 | 999 | } |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | $this->_xh['isf_reason'] = ucfirst($message); |
| 1014 | 1014 | return false; |
| 1015 | 1015 | } else { |
| 1016 | - $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message); |
|
| 1016 | + $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message); |
|
| 1017 | 1017 | return true; |
| 1018 | 1018 | } |
| 1019 | 1019 | } |
@@ -1025,8 +1025,8 @@ discard block |
||
| 1025 | 1025 | */ |
| 1026 | 1026 | protected function truncateValueForLog($data) |
| 1027 | 1027 | { |
| 1028 | - if (strlen($data) > $this->maxLogValueLength) { |
|
| 1029 | - return substr($data, 0, $this->maxLogValueLength - 3) . '...'; |
|
| 1028 | + if (strlen($data)>$this->maxLogValueLength) { |
|
| 1029 | + return substr($data, 0, $this->maxLogValueLength-3).'...'; |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | return $data; |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | public function xmlrpc_se_any($parser, $name, $attrs) |
| 1048 | 1048 | { |
| 1049 | 1049 | // this will be spamming the log if this method is in use... |
| 1050 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1050 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1051 | 1051 | |
| 1052 | 1052 | $this->xmlrpc_se($parser, $name, $attrs, true); |
| 1053 | 1053 | } |
@@ -1057,12 +1057,12 @@ discard block |
||
| 1057 | 1057 | switch ($name) { |
| 1058 | 1058 | case '_xh': |
| 1059 | 1059 | case 'xmlrpc_valid_parents': |
| 1060 | - $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated'); |
|
| 1060 | + $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated'); |
|
| 1061 | 1061 | return $this->$name; |
| 1062 | 1062 | default: |
| 1063 | 1063 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1064 | 1064 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1065 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1065 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1066 | 1066 | $result = null; |
| 1067 | 1067 | return $result; |
| 1068 | 1068 | } |
@@ -1073,18 +1073,18 @@ discard block |
||
| 1073 | 1073 | switch ($name) { |
| 1074 | 1074 | // this should only ever be called by subclasses which overtook `parse()` |
| 1075 | 1075 | case 'accept': |
| 1076 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1076 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1077 | 1077 | $this->current_parsing_options['accept'] = $value; |
| 1078 | 1078 | break; |
| 1079 | 1079 | case '_xh': |
| 1080 | 1080 | case 'xmlrpc_valid_parents': |
| 1081 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1081 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1082 | 1082 | $this->$name = $value; |
| 1083 | 1083 | break; |
| 1084 | 1084 | default: |
| 1085 | 1085 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1086 | 1086 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1087 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1087 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1088 | 1088 | } |
| 1089 | 1089 | } |
| 1090 | 1090 | |
@@ -1092,11 +1092,11 @@ discard block |
||
| 1092 | 1092 | { |
| 1093 | 1093 | switch ($name) { |
| 1094 | 1094 | case 'accept': |
| 1095 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1095 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1096 | 1096 | return isset($this->current_parsing_options['accept']); |
| 1097 | 1097 | case '_xh': |
| 1098 | 1098 | case 'xmlrpc_valid_parents': |
| 1099 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1099 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1100 | 1100 | return isset($this->$name); |
| 1101 | 1101 | default: |
| 1102 | 1102 | return false; |
@@ -1108,18 +1108,18 @@ discard block |
||
| 1108 | 1108 | switch ($name) { |
| 1109 | 1109 | // q: does this make sense at all? |
| 1110 | 1110 | case 'accept': |
| 1111 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1111 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1112 | 1112 | unset($this->current_parsing_options['accept']); |
| 1113 | 1113 | break; |
| 1114 | 1114 | case '_xh': |
| 1115 | 1115 | case 'xmlrpc_valid_parents': |
| 1116 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1116 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1117 | 1117 | unset($this->$name); |
| 1118 | 1118 | break; |
| 1119 | 1119 | default: |
| 1120 | 1120 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1121 | 1121 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1122 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1122 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1123 | 1123 | } |
| 1124 | 1124 | } |
| 1125 | 1125 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | return true; |
| 86 | 86 | } else { |
| 87 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value'); |
|
| 87 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value'); |
|
| 88 | 88 | return false; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | $this->logDeprecationUnlessCalledBy('serialize'); |
| 135 | 135 | |
| 136 | 136 | if ($charsetEncoding != '') { |
| 137 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 137 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 138 | 138 | } else { |
| 139 | 139 | $this->content_type = 'text/xml'; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | $result = $this->xml_header($charsetEncoding); |
| 143 | - $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 144 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 143 | + $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 144 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 145 | 145 | $result .= "<params>\n"; |
| 146 | 146 | foreach ($this->params as $p) { |
| 147 | - $result .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 147 | + $result .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 148 | 148 | "</param>\n"; |
| 149 | 149 | } |
| 150 | 150 | $result .= "</params>\n"; |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | $this->logDeprecationUnlessCalledBy('createPayload'); |
| 165 | 165 | |
| 166 | 166 | if ($charsetEncoding != '') { |
| 167 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 167 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 168 | 168 | } else { |
| 169 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 169 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -228,14 +228,14 @@ discard block |
||
| 228 | 228 | */ |
| 229 | 229 | public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS) |
| 230 | 230 | { |
| 231 | - if ($this->debug > 0) { |
|
| 231 | + if ($this->debug>0) { |
|
| 232 | 232 | $this->getLogger()->debug("---GOT---\n$data\n---END---"); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 236 | 236 | |
| 237 | 237 | if ($data == '') { |
| 238 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 238 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 239 | 239 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
| 243 | 243 | if (substr($data, 0, 4) == 'HTTP') { |
| 244 | 244 | $httpParser = new Http(); |
| 245 | 245 | try { |
| 246 | - $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0); |
|
| 246 | + $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0); |
|
| 247 | 247 | } catch (HttpException $e) { |
| 248 | 248 | // failed processing of HTTP response headers |
| 249 | 249 | // save into response obj the full payload received, for debugging |
| 250 | 250 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code' => $e->statusCode())); |
| 251 | - } catch(\Exception $e) { |
|
| 251 | + } catch (\Exception $e) { |
|
| 252 | 252 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 253 | 253 | } |
| 254 | 254 | } else { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // idea from Luca Mariano, originally in PEARified version of the lib |
| 265 | 265 | $pos = strrpos($data, '</methodResponse>'); |
| 266 | 266 | if ($pos !== false) { |
| 267 | - $data = substr($data, 0, $pos + 17); |
|
| 267 | + $data = substr($data, 0, $pos+17); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | // try to 'guestimate' the character encoding of the received response |
@@ -273,21 +273,21 @@ discard block |
||
| 273 | 273 | $data |
| 274 | 274 | ); |
| 275 | 275 | |
| 276 | - if ($this->debug >= 0) { |
|
| 276 | + if ($this->debug>=0) { |
|
| 277 | 277 | $this->httpResponse = $httpResponse; |
| 278 | 278 | } else { |
| 279 | 279 | $httpResponse = null; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - if ($this->debug > 0) { |
|
| 282 | + if ($this->debug>0) { |
|
| 283 | 283 | $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 284 | 284 | if ($start) { |
| 285 | 285 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 286 | 286 | /// @todo what if there is no end tag? |
| 287 | 287 | $end = strpos($data, '-->', $start); |
| 288 | - $comments = substr($data, $start, $end - $start); |
|
| 289 | - $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" . |
|
| 290 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding)); |
|
| 288 | + $comments = substr($data, $start, $end-$start); |
|
| 289 | + $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t". |
|
| 290 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding)); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | if ($respEncoding == 'ISO-8859-1') { |
| 310 | 310 | $data = utf8_encode($data); |
| 311 | 311 | } else { |
| 312 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
| 312 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
| 313 | 313 | } |
| 314 | 314 | } |
| 315 | 315 | } |
@@ -339,16 +339,16 @@ discard block |
||
| 339 | 339 | // there could be proxies meddling with the request, or network data corruption... |
| 340 | 340 | |
| 341 | 341 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 342 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 342 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 343 | 343 | |
| 344 | - if ($this->debug > 0) { |
|
| 344 | + if ($this->debug>0) { |
|
| 345 | 345 | $this->getLogger()->debug($_xh['isf_reason']); |
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | // second error check: xml well-formed but not xml-rpc compliant |
| 349 | 349 | elseif ($_xh['isf'] == 2) { |
| 350 | 350 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 351 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 351 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 352 | 352 | |
| 353 | 353 | /// @todo echo something for the user? check if it was already done by the parser... |
| 354 | 354 | //if ($this->debug > 0) { |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | // third error check: parsing of the response has somehow gone boink. |
| 359 | 359 | /// @todo shall we omit the 2nd part of this check, since we trust the parsing code? |
| 360 | 360 | /// Either that, or check the fault results too... |
| 361 | - elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 361 | + elseif ($_xh['isf']>3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 362 | 362 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
| 363 | 363 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
| 364 | 364 | '', $httpResponse |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | |
| 367 | 367 | /// @todo echo something for the user? |
| 368 | 368 | } else { |
| 369 | - if ($this->debug > 1) { |
|
| 369 | + if ($this->debug>1) { |
|
| 370 | 370 | $this->getLogger()->debug( |
| 371 | 371 | "---PARSED---\n".var_export($_xh['value'], true)."\n---END---" |
| 372 | 372 | ); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if ($errNo == 0) { |
| 391 | 391 | // FAULT returned, errno needs to reflect that |
| 392 | 392 | /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr |
| 393 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 393 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 394 | 394 | /// @todo in Encoder::decodeXML, we use PhpXmlRpc::$xmlrpcerr['invalid_return'] for this case (see |
| 395 | 395 | /// also the todo 17 lines above) |
| 396 | 396 | $errNo = -1; |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | case '_php_class': |
| 439 | 439 | case 'payload': |
| 440 | 440 | case 'content_type': |
| 441 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 441 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 442 | 442 | return $this->$name; |
| 443 | 443 | case 'httpResponse': |
| 444 | 444 | // manually implement the 'protected property' behaviour |
@@ -450,16 +450,16 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | if ($canAccess) { |
| 453 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 453 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 454 | 454 | return $this->httpResponse; |
| 455 | 455 | } else { |
| 456 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 456 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 457 | 457 | } |
| 458 | 458 | break; |
| 459 | 459 | default: |
| 460 | 460 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 461 | 461 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 462 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 462 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 463 | 463 | $result = null; |
| 464 | 464 | return $result; |
| 465 | 465 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | case 'debug': |
| 474 | 474 | case 'payload': |
| 475 | 475 | case 'content_type': |
| 476 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 476 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 477 | 477 | $this->$name = $value; |
| 478 | 478 | break; |
| 479 | 479 | case 'httpResponse': |
@@ -486,16 +486,16 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | } |
| 488 | 488 | if ($canAccess) { |
| 489 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 489 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 490 | 490 | $this->httpResponse = $value; |
| 491 | 491 | } else { |
| 492 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 492 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 493 | 493 | } |
| 494 | 494 | break; |
| 495 | 495 | default: |
| 496 | 496 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 497 | 497 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 498 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 498 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | case 'debug': |
| 508 | 508 | case 'payload': |
| 509 | 509 | case 'content_type': |
| 510 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 510 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 511 | 511 | return isset($this->$name); |
| 512 | 512 | case 'httpResponse': |
| 513 | 513 | // manually implement the 'protected property' behaviour |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | if ($canAccess) { |
| 522 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 522 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 523 | 523 | return isset($this->httpResponse); |
| 524 | 524 | } |
| 525 | 525 | // break through voluntarily |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | case 'debug': |
| 537 | 537 | case 'payload': |
| 538 | 538 | case 'content_type': |
| 539 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 539 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 540 | 540 | unset($this->$name); |
| 541 | 541 | break; |
| 542 | 542 | case 'httpResponse': |
@@ -549,16 +549,16 @@ discard block |
||
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | 551 | if ($canAccess) { |
| 552 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 552 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 553 | 553 | unset($this->httpResponse); |
| 554 | 554 | } else { |
| 555 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 555 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 556 | 556 | } |
| 557 | 557 | break; |
| 558 | 558 | default: |
| 559 | 559 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 560 | 560 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 561 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 561 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | } |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -231,22 +231,22 @@ discard block |
||
| 231 | 231 | $msg[0]->setPayload($payload); |
| 232 | 232 | } else { |
| 233 | 233 | $msg[0]->setPayload( |
| 234 | - $msg[0]->xml_header($inputcharset) . |
|
| 235 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 236 | - $payload . |
|
| 237 | - "</params>\n" . $msg[0]->xml_footer() |
|
| 234 | + $msg[0]->xml_header($inputcharset). |
|
| 235 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 236 | + $payload. |
|
| 237 | + "</params>\n".$msg[0]->xml_footer() |
|
| 238 | 238 | ); |
| 239 | 239 | } |
| 240 | - $actionname = 'Execution of method ' . $method; |
|
| 240 | + $actionname = 'Execution of method '.$method; |
|
| 241 | 241 | break; |
| 242 | 242 | default: // give a warning |
| 243 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 243 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 248 | 248 | // this gives good user feedback for long-running methods... |
| 249 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 249 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 250 | 250 | flush(); |
| 251 | 251 | |
| 252 | 252 | $response = null; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | - $time = microtime(true) - $time; |
|
| 266 | + $time = microtime(true)-$time; |
|
| 267 | 267 | if ($debug) { |
| 268 | 268 | echo "</div>\n"; |
| 269 | 269 | } |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | // call failed! echo out error msg! |
| 274 | 274 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 275 | 275 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 276 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 277 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 276 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 277 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 278 | 278 | echo(date("d/M/Y:H:i:s\n")); |
| 279 | 279 | } else { |
| 280 | 280 | // call succeeded: parse results |
@@ -290,36 +290,36 @@ discard block |
||
| 290 | 290 | $max = $v->count(); |
| 291 | 291 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 292 | 292 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 293 | - foreach($v as $i => $rec) { |
|
| 293 | + foreach ($v as $i => $rec) { |
|
| 294 | 294 | if ($i % 2) { |
| 295 | 295 | $class = ' class="oddrow"'; |
| 296 | 296 | } else { |
| 297 | 297 | $class = ' class="evenrow"'; |
| 298 | 298 | } |
| 299 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 300 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 299 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 300 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 323 | 323 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 324 | 324 | //echo("</tr>\n"); |
| 325 | 325 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $r2 = $resp[1]->value(); |
| 347 | 347 | |
| 348 | 348 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 349 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 349 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 350 | 350 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 351 | 351 | if ($desc == "") { |
| 352 | 352 | $desc = "-"; |
@@ -356,24 +356,24 @@ discard block |
||
| 356 | 356 | if ($r2->kindOf() != "array") { |
| 357 | 357 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 358 | 358 | } else { |
| 359 | - foreach($r2 as $i => $x) { |
|
| 359 | + foreach ($r2 as $i => $x) { |
|
| 360 | 360 | $payload = ""; |
| 361 | 361 | $alt_payload = ""; |
| 362 | - if ($i + 1 % 2) { |
|
| 362 | + if ($i+1 % 2) { |
|
| 363 | 363 | $class = ' class="oddrow"'; |
| 364 | 364 | } else { |
| 365 | 365 | $class = ' class="evenrow"'; |
| 366 | 366 | } |
| 367 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 367 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 368 | 368 | if ($x->kindOf() == "array") { |
| 369 | 369 | $ret = $x[0]; |
| 370 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 371 | - if ($x->count() > 1) { |
|
| 372 | - foreach($x as $k => $y) { |
|
| 370 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 371 | + if ($x->count()>1) { |
|
| 372 | + foreach ($x as $k => $y) { |
|
| 373 | 373 | if ($k == 0) continue; |
| 374 | 374 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 375 | if ($wstype == 1) { |
| 376 | - switch($y->scalarval()) { |
|
| 376 | + switch ($y->scalarval()) { |
|
| 377 | 377 | case 'string': |
| 378 | 378 | case 'dateTime.iso8601': |
| 379 | 379 | case 'base64': |
@@ -406,22 +406,22 @@ discard block |
||
| 406 | 406 | } else { |
| 407 | 407 | $type = $y->scalarval(); |
| 408 | 408 | $payload .= '<param><value>'; |
| 409 | - switch($type) { |
|
| 409 | + switch ($type) { |
|
| 410 | 410 | case 'undefined': |
| 411 | 411 | break; |
| 412 | 412 | case 'null': |
| 413 | 413 | $type = 'nil'; |
| 414 | 414 | // fall thru intentionally |
| 415 | 415 | default: |
| 416 | - $payload .= '<' . |
|
| 417 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 418 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 416 | + $payload .= '<'. |
|
| 417 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 418 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 419 | 419 | '>'; |
| 420 | 420 | } |
| 421 | 421 | $payload .= "</value></param>\n"; |
| 422 | 422 | } |
| 423 | 423 | $alt_payload .= $y->scalarval(); |
| 424 | - if ($k < $x->count() - 1) { |
|
| 424 | + if ($k<$x->count()-1) { |
|
| 425 | 425 | $alt_payload .= ';'; |
| 426 | 426 | if ($wstype == 1) { |
| 427 | 427 | $payload .= ', '; |
@@ -437,63 +437,63 @@ discard block |
||
| 437 | 437 | echo '</td>'; |
| 438 | 438 | // button to test this method |
| 439 | 439 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 440 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 441 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 440 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 441 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 464 | 464 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 465 | 465 | //if ($wstype != 1) { |
| 466 | 466 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 467 | 467 | //} |
| 468 | 468 | echo "</form></td>\n"; |
| 469 | 469 | |
| 470 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 471 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 494 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 495 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 496 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 470 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 471 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 494 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 495 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 496 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 497 | 497 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 498 | 498 | echo "</form></td></tr>\n"; |
| 499 | 499 | } |
@@ -505,14 +505,14 @@ discard block |
||
| 505 | 505 | case 'wrap': |
| 506 | 506 | $r1 = $resp[0]->value(); |
| 507 | 507 | $r2 = $resp[1]->value(); |
| 508 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 508 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 509 | 509 | echo "Error: signature unknown\n"; |
| 510 | 510 | } else { |
| 511 | 511 | $mdesc = $r1->scalarval(); |
| 512 | 512 | $encoder = new PhpXmlRpc\Encoder(); |
| 513 | 513 | $msig = $encoder->decode($r2); |
| 514 | 514 | $msig = $msig[$methodsig]; |
| 515 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 515 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 516 | 516 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 517 | 517 | $clientcookies == '') { |
| 518 | 518 | $opts = 1; // simple client copy in stub code |
@@ -533,12 +533,12 @@ discard block |
||
| 533 | 533 | $client, |
| 534 | 534 | $method, |
| 535 | 535 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 536 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 536 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 537 | 537 | ); |
| 538 | 538 | //if ($code) |
| 539 | 539 | //{ |
| 540 | 540 | echo "<div id=\"phpcode\">\n"; |
| 541 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 541 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 542 | 542 | echo "\n</div>"; |
| 543 | 543 | //} |
| 544 | 544 | //else |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | break; |
| 550 | 550 | |
| 551 | 551 | case 'execute': |
| 552 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 552 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 553 | 553 | break; |
| 554 | 554 | |
| 555 | 555 | default: // give a warning |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function getOptions() |
| 252 | 252 | { |
| 253 | 253 | $values = array(); |
| 254 | - foreach(static::$options as $opt) { |
|
| 254 | + foreach (static::$options as $opt) { |
|
| 255 | 255 | $values[$opt] = $this->getOption($opt); |
| 256 | 256 | } |
| 257 | 257 | return $values; |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | */ |
| 265 | 265 | public function setOptions($options) |
| 266 | 266 | { |
| 267 | - foreach($options as $name => $value) { |
|
| 267 | + foreach ($options as $name => $value) { |
|
| 268 | 268 | $this->setOption($name, $value); |
| 269 | 269 | } |
| 270 | 270 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public static function xmlrpc_debugmsg($msg) |
| 304 | 304 | { |
| 305 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 305 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | */ |
| 315 | 315 | public static function error_occurred($msg) |
| 316 | 316 | { |
| 317 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 317 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | /** |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 336 | 336 | $out = ''; |
| 337 | 337 | if ($this->debug_info != '') { |
| 338 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 338 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 339 | 339 | } |
| 340 | 340 | if (static::$_xmlrpc_debuginfo != '') { |
| 341 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 341 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 342 | 342 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 343 | 343 | // into return payload AFTER the beginning tag |
| 344 | 344 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -367,8 +367,8 @@ discard block |
||
| 367 | 367 | $this->debug_info = ''; |
| 368 | 368 | |
| 369 | 369 | // Save what we received, before parsing it |
| 370 | - if ($this->debug > 1) { |
|
| 371 | - $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 370 | + if ($this->debug>1) { |
|
| 371 | + $this->debugMsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -385,13 +385,13 @@ discard block |
||
| 385 | 385 | $resp->raw_data = $rawData; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | - $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 390 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 388 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | + $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 390 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | $header = $resp->xml_header($respCharset); |
| 394 | - if ($this->debug > 0) { |
|
| 394 | + if ($this->debug>0) { |
|
| 395 | 395 | $header .= $this->serializeDebug($respCharset); |
| 396 | 396 | } |
| 397 | 397 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | if (empty($payload)) { |
| 403 | 403 | $payload = $resp->serialize($respCharset); |
| 404 | 404 | } |
| 405 | - $payload = $header . $payload; |
|
| 405 | + $payload = $header.$payload; |
|
| 406 | 406 | |
| 407 | 407 | if ($returnPayload) { |
| 408 | 408 | return $payload; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | // if we get a warning/error that has output some text before here, then we cannot |
| 412 | 412 | // add a new header. We cannot say we are sending xml, either... |
| 413 | 413 | if (!headers_sent()) { |
| 414 | - header('Content-Type: ' . $resp->getContentType()); |
|
| 414 | + header('Content-Type: '.$resp->getContentType()); |
|
| 415 | 415 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
| 416 | 416 | header("Vary: Accept-Charset"); |
| 417 | 417 | |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 435 | 435 | // responses up to 8000 bytes |
| 436 | 436 | if ($phpNoSelfCompress) { |
| 437 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 437 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 438 | 438 | } |
| 439 | 439 | } else { |
| 440 | 440 | /// @todo allow the user to easily subclass this in a way which allows the resp. headers to be already sent |
| 441 | 441 | /// by now without flagging it as an error. Possibly check for presence of Content-Type header |
| 442 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 442 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | print $payload; |
@@ -528,9 +528,9 @@ discard block |
||
| 528 | 528 | $numParams = count($in); |
| 529 | 529 | } |
| 530 | 530 | foreach ($sigs as $curSig) { |
| 531 | - if (count($curSig) == $numParams + 1) { |
|
| 531 | + if (count($curSig) == $numParams+1) { |
|
| 532 | 532 | $itsOK = 1; |
| 533 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 533 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 534 | 534 | if (is_object($in)) { |
| 535 | 535 | $p = $in->getParam($n); |
| 536 | 536 | if ($p->kindOf() == 'scalar') { |
@@ -543,10 +543,10 @@ discard block |
||
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | // param index is $n+1, as first member of sig is return type |
| 546 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 546 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 547 | 547 | $itsOK = 0; |
| 548 | - $pno = $n + 1; |
|
| 549 | - $wanted = $curSig[$n + 1]; |
|
| 548 | + $pno = $n+1; |
|
| 549 | + $wanted = $curSig[$n+1]; |
|
| 550 | 550 | $got = $pt; |
| 551 | 551 | break; |
| 552 | 552 | } |
@@ -573,10 +573,10 @@ discard block |
||
| 573 | 573 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 574 | 574 | // (this is true even when in CLI mode) |
| 575 | 575 | if (count($_SERVER) == 0) { |
| 576 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 576 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | - if ($this->debug > 1) { |
|
| 579 | + if ($this->debug>1) { |
|
| 580 | 580 | if (function_exists('getallheaders')) { |
| 581 | 581 | $this->debugMsg(''); // empty line |
| 582 | 582 | foreach (getallheaders() as $name => $val) { |
@@ -601,13 +601,13 @@ discard block |
||
| 601 | 601 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 602 | 602 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 603 | 603 | $data = $degzdata; |
| 604 | - if ($this->debug > 1) { |
|
| 605 | - $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 604 | + if ($this->debug>1) { |
|
| 605 | + $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 606 | 606 | } |
| 607 | 607 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 608 | 608 | $data = $degzdata; |
| 609 | - if ($this->debug > 1) { |
|
| 610 | - $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 609 | + if ($this->debug>1) { |
|
| 610 | + $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 611 | 611 | } |
| 612 | 612 | } else { |
| 613 | 613 | $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | if ($reqEncoding == 'ISO-8859-1') { |
| 696 | 696 | $data = utf8_encode($data); |
| 697 | 697 | } else { |
| 698 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
| 698 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
| 699 | 699 | } |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches); |
| 730 | 730 | return new static::$responseClass( |
| 731 | 731 | 0, |
| 732 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 732 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 733 | 733 | $_xh['isf_reason']); |
| 734 | 734 | } elseif ($_xh['isf']) { |
| 735 | 735 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs. |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | return new static::$responseClass( |
| 738 | 738 | 0, |
| 739 | 739 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 740 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']); |
|
| 740 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']); |
|
| 741 | 741 | } else { |
| 742 | 742 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
| 743 | 743 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -747,8 +747,8 @@ discard block |
||
| 747 | 747 | ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 748 | 748 | ) |
| 749 | 749 | ) { |
| 750 | - if ($this->debug > 1) { |
|
| 751 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++"); |
|
| 750 | + if ($this->debug>1) { |
|
| 751 | + $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++"); |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']); |
@@ -756,12 +756,12 @@ discard block |
||
| 756 | 756 | // build a Request object with data parsed from xml and add parameters in |
| 757 | 757 | $req = new Request($_xh['method']); |
| 758 | 758 | /// @todo for more speed, we could just pass in the array to the constructor (and loose the type validation)... |
| 759 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
| 759 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
| 760 | 760 | $req->addParam($_xh['params'][$i]); |
| 761 | 761 | } |
| 762 | 762 | |
| 763 | - if ($this->debug > 1) { |
|
| 764 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 763 | + if ($this->debug>1) { |
|
| 764 | + $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | return $this->execute($req); |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | return new static::$responseClass( |
| 812 | 812 | 0, |
| 813 | 813 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 814 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 814 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 815 | 815 | ); |
| 816 | 816 | } |
| 817 | 817 | } |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | // build string representation of function 'name' |
| 827 | 827 | if (is_array($func)) { |
| 828 | 828 | if (is_object($func[0])) { |
| 829 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 829 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 830 | 830 | } else { |
| 831 | 831 | $funcName = implode('::', $func); |
| 832 | 832 | } |
@@ -838,16 +838,16 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | // verify that function to be invoked is in fact callable |
| 840 | 840 | if (!is_callable($func)) { |
| 841 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 841 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 842 | 842 | return new static::$responseClass( |
| 843 | 843 | 0, |
| 844 | 844 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 845 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 845 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 846 | 846 | ); |
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | if (isset($dmap[$methodName]['exception_handling'])) { |
| 850 | - $exception_handling = (int)$dmap[$methodName]['exception_handling']; |
|
| 850 | + $exception_handling = (int) $dmap[$methodName]['exception_handling']; |
|
| 851 | 851 | } else { |
| 852 | 852 | $exception_handling = $this->exception_handling; |
| 853 | 853 | } |
@@ -868,14 +868,14 @@ discard block |
||
| 868 | 868 | $r = call_user_func($func, $req); |
| 869 | 869 | } |
| 870 | 870 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 871 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 871 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 872 | 872 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 873 | 873 | $r = new static::$responseClass($r); |
| 874 | 874 | } else { |
| 875 | 875 | $r = new static::$responseClass( |
| 876 | 876 | 0, |
| 877 | 877 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 878 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 878 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 879 | 879 | ); |
| 880 | 880 | } |
| 881 | 881 | } |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
| 891 | 891 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
| 892 | 892 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 893 | - $r = new static::$responseClass(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 893 | + $r = new static::$responseClass(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 894 | 894 | } else { |
| 895 | 895 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
| 896 | 896 | // return type correctly |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | */ |
| 1022 | 1022 | protected function debugMsg($string) |
| 1023 | 1023 | { |
| 1024 | - $this->debug_info .= $string . "\n"; |
|
| 1024 | + $this->debug_info .= $string."\n"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | /** |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | $i++; // for error message, we count params from 1 |
| 1313 | 1313 | return static::_xmlrpcs_multicall_error(new static::$responseClass(0, |
| 1314 | 1314 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1315 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1315 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1316 | 1316 | } |
| 1317 | 1317 | } |
| 1318 | 1318 | |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | } |
| 1394 | 1394 | } else { |
| 1395 | 1395 | $numCalls = count($req); |
| 1396 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1396 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1397 | 1397 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1398 | 1398 | } |
| 1399 | 1399 | } |
@@ -1421,7 +1421,7 @@ discard block |
||
| 1421 | 1421 | // From PHP 8.4 the E_STRICT constant has been deprecated and will emit deprecation notices. |
| 1422 | 1422 | // PHP core and core extensions since PHP 8.0 and later do not emit E_STRICT notices at all. |
| 1423 | 1423 | // On PHP 7 series before PHP 7.4, some functions conditionally emit E_STRICT notices. |
| 1424 | - if (PHP_VERSION_ID >= 70400) { |
|
| 1424 | + if (PHP_VERSION_ID>=70400) { |
|
| 1425 | 1425 | static::error_occurred($errString); |
| 1426 | 1426 | } elseif ($errCode != E_STRICT) { |
| 1427 | 1427 | static::error_occurred($errString); |
@@ -1462,12 +1462,12 @@ discard block |
||
| 1462 | 1462 | */ |
| 1463 | 1463 | protected function xml_header($charsetEncoding = '') |
| 1464 | 1464 | { |
| 1465 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1465 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1466 | 1466 | |
| 1467 | 1467 | if ($charsetEncoding != '') { |
| 1468 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 1468 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 1469 | 1469 | } else { |
| 1470 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 1470 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 1471 | 1471 | } |
| 1472 | 1472 | } |
| 1473 | 1473 | |
@@ -1483,7 +1483,7 @@ discard block |
||
| 1483 | 1483 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1484 | 1484 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1485 | 1485 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1486 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1486 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1487 | 1487 | return $this->$name; |
| 1488 | 1488 | case 'accepted_charset_encodings': |
| 1489 | 1489 | // manually implement the 'protected property' behaviour |
@@ -1495,16 +1495,16 @@ discard block |
||
| 1495 | 1495 | } |
| 1496 | 1496 | } |
| 1497 | 1497 | if ($canAccess) { |
| 1498 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1498 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1499 | 1499 | return $this->accepted_compression; |
| 1500 | 1500 | } else { |
| 1501 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1501 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1502 | 1502 | } |
| 1503 | 1503 | break; |
| 1504 | 1504 | default: |
| 1505 | 1505 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1506 | 1506 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1507 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1507 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1508 | 1508 | $result = null; |
| 1509 | 1509 | return $result; |
| 1510 | 1510 | } |
@@ -1521,7 +1521,7 @@ discard block |
||
| 1521 | 1521 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1522 | 1522 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1523 | 1523 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1524 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1524 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1525 | 1525 | $this->$name = $value; |
| 1526 | 1526 | break; |
| 1527 | 1527 | case 'accepted_charset_encodings': |
@@ -1534,16 +1534,16 @@ discard block |
||
| 1534 | 1534 | } |
| 1535 | 1535 | } |
| 1536 | 1536 | if ($canAccess) { |
| 1537 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1537 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1538 | 1538 | $this->accepted_compression = $value; |
| 1539 | 1539 | } else { |
| 1540 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1540 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1541 | 1541 | } |
| 1542 | 1542 | break; |
| 1543 | 1543 | default: |
| 1544 | 1544 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1545 | 1545 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1546 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1546 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1547 | 1547 | } |
| 1548 | 1548 | } |
| 1549 | 1549 | |
@@ -1558,7 +1558,7 @@ discard block |
||
| 1558 | 1558 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1559 | 1559 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1560 | 1560 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1561 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1561 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1562 | 1562 | return isset($this->$name); |
| 1563 | 1563 | case 'accepted_charset_encodings': |
| 1564 | 1564 | // manually implement the 'protected property' behaviour |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | } |
| 1571 | 1571 | } |
| 1572 | 1572 | if ($canAccess) { |
| 1573 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1573 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1574 | 1574 | return isset($this->accepted_compression); |
| 1575 | 1575 | } |
| 1576 | 1576 | // break through voluntarily |
@@ -1590,7 +1590,7 @@ discard block |
||
| 1590 | 1590 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1591 | 1591 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1592 | 1592 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1593 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1593 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1594 | 1594 | unset($this->$name); |
| 1595 | 1595 | break; |
| 1596 | 1596 | case 'accepted_charset_encodings': |
@@ -1603,16 +1603,16 @@ discard block |
||
| 1603 | 1603 | } |
| 1604 | 1604 | } |
| 1605 | 1605 | if ($canAccess) { |
| 1606 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1606 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1607 | 1607 | unset($this->accepted_compression); |
| 1608 | 1608 | } else { |
| 1609 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1609 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1610 | 1610 | } |
| 1611 | 1611 | break; |
| 1612 | 1612 | default: |
| 1613 | 1613 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1614 | 1614 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1615 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1615 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1616 | 1616 | } |
| 1617 | 1617 | } |
| 1618 | 1618 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -require_once __DIR__ . "/_prepend.php"; |
|
| 27 | +require_once __DIR__."/_prepend.php"; |
|
| 28 | 28 | |
| 29 | 29 | use PhpXmlRpc\PhpXmlRpc; |
| 30 | 30 | use PhpXmlRpc\Server; |
