@@ -176,8 +176,7 @@ |
||
176 | 176 | } else { |
177 | 177 | $escapedData .= $ch; |
178 | 178 | } |
179 | - } |
|
180 | - else if ($ii < 128) { |
|
179 | + } else if ($ii < 128) { |
|
181 | 180 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
182 | 181 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
183 | 182 | switch ($ii) { |
@@ -605,8 +605,9 @@ |
||
605 | 605 | } |
606 | 606 | foreach ($parsVariations as $i => $pars) { |
607 | 607 | $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
608 | - if ($i < (count($parsVariations) - 1)) |
|
609 | - $innerCode .= " else\n"; |
|
608 | + if ($i < (count($parsVariations) - 1)) { |
|
609 | + $innerCode .= " else\n"; |
|
610 | + } |
|
610 | 611 | } |
611 | 612 | $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
612 | 613 | /// q: why not do the same for int, float, bool, string? |
@@ -88,11 +88,12 @@ |
||
88 | 88 | $a = $req->getParam(0); |
89 | 89 | $b = $req->getParam(1); |
90 | 90 | |
91 | - if ($a->scalarTyp() == Value::$xmlrpcNull) |
|
92 | - return new Response(new Value(plain_findstate($b->scalarVal()))); |
|
93 | - else |
|
94 | - return new Response(new Value(plain_findstate($a->scalarVal()))); |
|
95 | -} |
|
91 | + if ($a->scalarTyp() == Value::$xmlrpcNull) { |
|
92 | + return new Response(new Value(plain_findstate($b->scalarVal()))); |
|
93 | + } else { |
|
94 | + return new Response(new Value(plain_findstate($a->scalarVal()))); |
|
95 | + } |
|
96 | + } |
|
96 | 97 | |
97 | 98 | $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt)); |
98 | 99 | $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response'; |
@@ -304,8 +304,7 @@ discard block |
||
304 | 304 | if (!function_exists('curl_init')) |
305 | 305 | { |
306 | 306 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
307 | - } |
|
308 | - else if ($this->args['HTTPSSERVER'] == '') |
|
307 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
309 | 308 | { |
310 | 309 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
311 | 310 | } |
@@ -480,8 +479,7 @@ discard block |
||
480 | 479 | if (!function_exists('curl_init')) |
481 | 480 | { |
482 | 481 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
483 | - } |
|
484 | - else if ($this->args['PROXYSERVER'] == '') |
|
482 | + } else if ($this->args['PROXYSERVER'] == '') |
|
485 | 483 | { |
486 | 484 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
487 | 485 | } |
@@ -505,12 +503,10 @@ discard block |
||
505 | 503 | if (!function_exists('curl_init')) |
506 | 504 | { |
507 | 505 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
508 | - } |
|
509 | - else if ($this->args['PROXYSERVER'] == '') |
|
506 | + } else if ($this->args['PROXYSERVER'] == '') |
|
510 | 507 | { |
511 | 508 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
512 | - } |
|
513 | - else if ($this->args['HTTPSSERVER'] == '') |
|
509 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
514 | 510 | { |
515 | 511 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
516 | 512 | } |
@@ -272,19 +272,25 @@ |
||
272 | 272 | } |
273 | 273 | /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times |
274 | 274 | } catch (\Exception $e) { |
275 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
275 | + if (PHP_MAJOR_VERSION < 8) { |
|
276 | + xml_parser_free($parser); |
|
277 | + } |
|
276 | 278 | $this->current_parsing_options = array(); |
277 | 279 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
278 | 280 | throw $e; |
279 | 281 | } catch (\Error $e) { |
280 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
282 | + if (PHP_MAJOR_VERSION < 8) { |
|
283 | + xml_parser_free($parser); |
|
284 | + } |
|
281 | 285 | $this->current_parsing_options = array(); |
282 | 286 | //$this->accept = $prevAccept; |
283 | 287 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
284 | 288 | throw $e; |
285 | 289 | } |
286 | 290 | |
287 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
291 | + if (PHP_MAJOR_VERSION < 8) { |
|
292 | + xml_parser_free($parser); |
|
293 | + } |
|
288 | 294 | $this->current_parsing_options = array(); |
289 | 295 | |
290 | 296 | // BC |
@@ -41,7 +41,9 @@ |
||
41 | 41 | } |
42 | 42 | $page = curl_exec($ch); |
43 | 43 | $info = curl_getinfo($ch); |
44 | - if (PHP_MAJOR_VERSION < 8) curl_close($ch); |
|
44 | + if (PHP_MAJOR_VERSION < 8) { |
|
45 | + curl_close($ch); |
|
46 | + } |
|
45 | 47 | |
46 | 48 | $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']); |
47 | 49 | if (!$emptyPageOk) { |
@@ -13,7 +13,12 @@ |
||
13 | 13 | <html lang="en"> |
14 | 14 | <head> |
15 | 15 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
16 | - <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
16 | + <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) { |
|
17 | + echo 'JSON-RPC'; |
|
18 | +} else { |
|
19 | + echo 'XML-RPC'; |
|
20 | +} |
|
21 | +?> Debugger</title> |
|
17 | 22 | </head> |
18 | 23 | <frameset rows="360,*"> |
19 | 24 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |
@@ -15,7 +15,12 @@ discard block |
||
15 | 15 | <html lang="en"> |
16 | 16 | <head> |
17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
18 | - <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
18 | + <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) { |
|
19 | + echo 'JSON-RPC'; |
|
20 | +} else { |
|
21 | + echo 'XML-RPC'; |
|
22 | +} |
|
23 | +?> Debugger</title> |
|
19 | 24 | <meta name="robots" content="index,nofollow"/> |
20 | 25 | <style type="text/css"> |
21 | 26 | <!-- |
@@ -404,7 +409,9 @@ discard block |
||
404 | 409 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
405 | 410 | if ($x->count() > 1) { |
406 | 411 | foreach($x as $k => $y) { |
407 | - if ($k == 0) continue; |
|
412 | + if ($k == 0) { |
|
413 | + continue; |
|
414 | + } |
|
408 | 415 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
409 | 416 | if ($wstype == 1 || $wstype == 2) { |
410 | 417 | switch($y->scalarval()) { |
@@ -1276,19 +1276,25 @@ discard block |
||
1276 | 1276 | $this->errstr = 'no response'; |
1277 | 1277 | $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . |
1278 | 1278 | ': ' . curl_error($curl)); |
1279 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1279 | + if (PHP_MAJOR_VERSION < 8) { |
|
1280 | + curl_close($curl); |
|
1281 | + } |
|
1280 | 1282 | if ($opts['keepalive']) { |
1281 | 1283 | $this->xmlrpc_curl_handle = null; |
1282 | 1284 | } |
1283 | 1285 | } else { |
1284 | 1286 | if (!$opts['keepalive']) { |
1285 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1287 | + if (PHP_MAJOR_VERSION < 8) { |
|
1288 | + curl_close($curl); |
|
1289 | + } |
|
1286 | 1290 | } |
1287 | 1291 | $resp = $req->parseResponse($result, true, $opts['return_type']); |
1288 | 1292 | if ($opts['keepalive']) { |
1289 | 1293 | /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls |
1290 | 1294 | if (is_object($resp) && $resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) { |
1291 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1295 | + if (PHP_MAJOR_VERSION < 8) { |
|
1296 | + curl_close($curl); |
|
1297 | + } |
|
1292 | 1298 | $this->xmlrpc_curl_handle = null; |
1293 | 1299 | } |
1294 | 1300 | } |
@@ -1447,7 +1453,9 @@ discard block |
||
1447 | 1453 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
1448 | 1454 | } else { |
1449 | 1455 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
1450 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1456 | + if (PHP_MAJOR_VERSION < 8) { |
|
1457 | + curl_close($curl); |
|
1458 | + } |
|
1451 | 1459 | return false; |
1452 | 1460 | } |
1453 | 1461 | break; |
@@ -1462,7 +1470,9 @@ discard block |
||
1462 | 1470 | curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']); |
1463 | 1471 | } elseif ($opts['authtype'] != 1) { |
1464 | 1472 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
1465 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1473 | + if (PHP_MAJOR_VERSION < 8) { |
|
1474 | + curl_close($curl); |
|
1475 | + } |
|
1466 | 1476 | return false; |
1467 | 1477 | } |
1468 | 1478 | } |
@@ -1513,7 +1523,9 @@ discard block |
||
1513 | 1523 | curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']); |
1514 | 1524 | } elseif ($opts['proxy_authtype'] != 1) { |
1515 | 1525 | $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
1516 | - if (PHP_MAJOR_VERSION < 8) curl_close($curl); |
|
1526 | + if (PHP_MAJOR_VERSION < 8) { |
|
1527 | + curl_close($curl); |
|
1528 | + } |
|
1517 | 1529 | return false; |
1518 | 1530 | } |
1519 | 1531 | } |