gggeek /
phpxmlrpc
@@ -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 | - $msg[0]->payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $msg[0]->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 == "") { |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } else { |
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 234 | - $payload . |
|
| 235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 234 | + $payload. |
|
| 235 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 236 | 236 | } |
| 237 | - $actionname = 'Execution of method ' . $method; |
|
| 237 | + $actionname = 'Execution of method '.$method; |
|
| 238 | 238 | break; |
| 239 | 239 | default: // give a warning |
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 245 | 245 | // this gives good user feedback for long-running methods... |
| 246 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 246 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 247 | 247 | flush(); |
| 248 | 248 | |
| 249 | 249 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $time = microtime(true) - $time; |
|
| 263 | + $time = microtime(true)-$time; |
|
| 264 | 264 | if ($debug) { |
| 265 | 265 | echo "</div>\n"; |
| 266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | // call failed! echo out error msg! |
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 275 | 275 | echo(date("d/M/Y:H:i:s\n")); |
| 276 | 276 | } else { |
| 277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
| 287 | 287 | $max = $v->count(); |
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 290 | - foreach($v as $i => $rec) { |
|
| 290 | + foreach ($v as $i => $rec) { |
|
| 291 | 291 | if ($i % 2) { |
| 292 | 292 | $class = ' class="oddrow"'; |
| 293 | 293 | } else { |
| 294 | 294 | $class = ' class="evenrow"'; |
| 295 | 295 | } |
| 296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 321 | 321 | //echo("</tr>\n"); |
| 322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $r2 = $resp[1]->value(); |
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 348 | 348 | if ($desc == "") { |
| 349 | 349 | $desc = "-"; |
@@ -353,24 +353,24 @@ discard block |
||
| 353 | 353 | if ($r2->kindOf() != "array") { |
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 355 | 355 | } else { |
| 356 | - foreach($r2 as $i => $x) { |
|
| 356 | + foreach ($r2 as $i => $x) { |
|
| 357 | 357 | $payload = ""; |
| 358 | 358 | $alt_payload = ""; |
| 359 | - if ($i + 1 % 2) { |
|
| 359 | + if ($i+1 % 2) { |
|
| 360 | 360 | $class = ' class="oddrow"'; |
| 361 | 361 | } else { |
| 362 | 362 | $class = ' class="evenrow"'; |
| 363 | 363 | } |
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 365 | 365 | if ($x->kindOf() == "array") { |
| 366 | 366 | $ret = $x[0]; |
| 367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 368 | - if ($x->count() > 1) { |
|
| 369 | - foreach($x as $k => $y) { |
|
| 367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 368 | + if ($x->count()>1) { |
|
| 369 | + foreach ($x as $k => $y) { |
|
| 370 | 370 | if ($k == 0) continue; |
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 372 | if ($wstype == 1) { |
| 373 | - switch($y->scalarval()) { |
|
| 373 | + switch ($y->scalarval()) { |
|
| 374 | 374 | case 'string': |
| 375 | 375 | case 'dateTime.iso8601': |
| 376 | 376 | case 'base64': |
@@ -403,22 +403,22 @@ discard block |
||
| 403 | 403 | } else { |
| 404 | 404 | $type = $y->scalarval(); |
| 405 | 405 | $payload .= '<param><value>'; |
| 406 | - switch($type) { |
|
| 406 | + switch ($type) { |
|
| 407 | 407 | case 'undefined': |
| 408 | 408 | break; |
| 409 | 409 | case 'null'; |
| 410 | 410 | $type = 'nil'; |
| 411 | 411 | // fall thru intentionally |
| 412 | 412 | default: |
| 413 | - $payload .= '<' . |
|
| 414 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 415 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 413 | + $payload .= '<'. |
|
| 414 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 415 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 416 | 416 | '>'; |
| 417 | 417 | } |
| 418 | 418 | $payload .= "</value></param>\n"; |
| 419 | 419 | } |
| 420 | 420 | $alt_payload .= $y->scalarval(); |
| 421 | - if ($k < $x->count() - 1) { |
|
| 421 | + if ($k<$x->count()-1) { |
|
| 422 | 422 | $alt_payload .= ';'; |
| 423 | 423 | if ($wstype == 1) { |
| 424 | 424 | $payload .= ', '; |
@@ -434,63 +434,63 @@ discard block |
||
| 434 | 434 | echo '</td>'; |
| 435 | 435 | // button to test this method |
| 436 | 436 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 437 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 438 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 437 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 438 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 461 | 461 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 462 | 462 | //if ($wstype != 1) { |
| 463 | 463 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 464 | 464 | //} |
| 465 | 465 | echo "</form></td>\n"; |
| 466 | 466 | |
| 467 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 468 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 469 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 470 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 471 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 467 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 468 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 469 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 470 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 471 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 494 | 494 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 495 | 495 | echo "</form></td></tr>\n"; |
| 496 | 496 | } |
@@ -502,14 +502,14 @@ discard block |
||
| 502 | 502 | case 'wrap': |
| 503 | 503 | $r1 = $resp[0]->value(); |
| 504 | 504 | $r2 = $resp[1]->value(); |
| 505 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 505 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 506 | 506 | echo "Error: signature unknown\n"; |
| 507 | 507 | } else { |
| 508 | 508 | $mdesc = $r1->scalarval(); |
| 509 | 509 | $encoder = new PhpXmlRpc\Encoder(); |
| 510 | 510 | $msig = $encoder->decode($r2); |
| 511 | 511 | $msig = $msig[$methodsig]; |
| 512 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 512 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 513 | 513 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 514 | 514 | $clientcookies == '') { |
| 515 | 515 | $opts = 1; // simple client copy in stub code |
@@ -530,12 +530,12 @@ discard block |
||
| 530 | 530 | $client, |
| 531 | 531 | $method, |
| 532 | 532 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 533 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 533 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 534 | 534 | ); |
| 535 | 535 | //if ($code) |
| 536 | 536 | //{ |
| 537 | 537 | echo "<div id=\"phpcode\">\n"; |
| 538 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 538 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 539 | 539 | echo "\n</div>"; |
| 540 | 540 | //} |
| 541 | 541 | //else |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | break; |
| 547 | 547 | |
| 548 | 548 | case 'execute': |
| 549 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 549 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 550 | 550 | break; |
| 551 | 551 | |
| 552 | 552 | default: // give a warning |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // construct a latin string with all chars (except control ones) |
| 34 | 34 | $this->latinString = "\n\r\t"; |
| 35 | - for($i = 32; $i < 127; $i++) { |
|
| 35 | + for ($i = 32; $i<127; $i++) { |
|
| 36 | 36 | $this->latinString .= chr($i); |
| 37 | 37 | } |
| 38 | - for($i = 160; $i < 256; $i++) { |
|
| 38 | + for ($i = 160; $i<256; $i++) { |
|
| 39 | 39 | $this->latinString .= chr($i); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing. |
| 104 | 104 | /// We should fix that, then re-enable this test |
| 105 | 105 | if (version_compare(PHP_VERSION, '5.6.0', '>=')) { |
| 106 | - $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>'); |
|
| 106 | + $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>'); |
|
| 107 | 107 | $this->assertEquals($string, $i->scalarVal()); |
| 108 | 108 | } |
| 109 | 109 | |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $this->assertequals(1, count($v1)); |
| 129 | 129 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 130 | 130 | |
| 131 | - foreach($v1 as $key => $val) |
|
| 131 | + foreach ($v1 as $key => $val) |
|
| 132 | 132 | { |
| 133 | 133 | $this->assertArrayHasKey($key, $out); |
| 134 | 134 | $expected = $out[$key]; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $this->assertequals(2, count($v2)); |
| 144 | 144 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 145 | 145 | $i = 0; |
| 146 | - foreach($v2 as $key => $val) |
|
| 146 | + foreach ($v2 as $key => $val) |
|
| 147 | 147 | { |
| 148 | 148 | $expected = $out[$i]; |
| 149 | 149 | $this->assertequals($expected['key'], $key); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | { |
| 158 | 158 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
| 159 | 159 | $data = array(); |
| 160 | - for ($i = 0; $i < 500000; $i++ ) { |
|
| 160 | + for ($i = 0; $i<500000; $i++) { |
|
| 161 | 161 | $data[] = 'hello world'; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/08ServerTest.php'; |
|
| 8 | +include_once __DIR__.'/08ServerTest.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests which stress http features of the library. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | $methods = array(); |
| 33 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 33 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 34 | 34 | { |
| 35 | 35 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
| 36 | 36 | { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
| 305 | 305 | $ubuntuVersion = @$matches[1]; |
| 306 | 306 | } |
| 307 | - if ($ubuntuVersion >= 20) { |
|
| 307 | + if ($ubuntuVersion>=20) { |
|
| 308 | 308 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
| 309 | 309 | return; |
| 310 | 310 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | require_once __DIR__.'/methodProviders/CommentManager.php'; |
| 5 | 5 | |
@@ -25,33 +25,33 @@ discard block |
||
| 25 | 25 | // generate a file with a class definition |
| 26 | 26 | |
| 27 | 27 | // the generated code does not have an autoloader included - we need to add in one |
| 28 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 28 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 29 | 29 | |
| 30 | 30 | file_put_contents($targetClassFile, |
| 31 | - "<?php\n\n" . |
|
| 32 | - "require_once '$autoloader';\n\n" . |
|
| 31 | + "<?php\n\n". |
|
| 32 | + "require_once '$autoloader';\n\n". |
|
| 33 | 33 | "class MyServerClass\n{\n\n" |
| 34 | 34 | ) || die('uh oh'); |
| 35 | 35 | |
| 36 | 36 | // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions |
| 37 | 37 | |
| 38 | -foreach($code as $methodName => $methodDef) { |
|
| 39 | - file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh'); |
|
| 40 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
| 38 | +foreach ($code as $methodName => $methodDef) { |
|
| 39 | + file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh'); |
|
| 40 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
| 41 | 41 | unset($code[$methodName]['source']); |
| 42 | 42 | } |
| 43 | 43 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
| 44 | 44 | |
| 45 | 45 | // generate separate files with the xml-rpc server instantiation and its dispatch map |
| 46 | 46 | |
| 47 | -file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n"); |
|
| 47 | +file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n"); |
|
| 48 | 48 | |
| 49 | 49 | file_put_contents($targetControllerFile, |
| 50 | - "<?php\n\n" . |
|
| 50 | + "<?php\n\n". |
|
| 51 | 51 | |
| 52 | - "require_once '$autoloader';\n\n" . |
|
| 52 | + "require_once '$autoloader';\n\n". |
|
| 53 | 53 | |
| 54 | - "require_once '$targetClassFile';\n\n" . |
|
| 54 | + "require_once '$targetClassFile';\n\n". |
|
| 55 | 55 | |
| 56 | 56 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
| 57 | 57 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | // Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm); |
| 62 | 62 | // Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm); |
| 63 | 63 | |
| 64 | - "\$dm = require_once '$targetDispatchMapFile';\n" . |
|
| 65 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" . |
|
| 66 | - '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" . |
|
| 67 | - '$s->setDebug(2);' . "\n" . |
|
| 68 | - '$s->exception_handling = 1;' . "\n" . |
|
| 69 | - '$s->service();' . "\n" |
|
| 64 | + "\$dm = require_once '$targetDispatchMapFile';\n". |
|
| 65 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n". |
|
| 66 | + '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n". |
|
| 67 | + '$s->setDebug(2);'."\n". |
|
| 68 | + '$s->exception_handling = 1;'."\n". |
|
| 69 | + '$s->service();'."\n" |
|
| 70 | 70 | ) || die('uh oh'); |
| 71 | 71 | |
| 72 | 72 | // test that everything worked by running it in realtime (note that this will return an xml-rpc error message if run |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
| 3 | +include_once __DIR__.'/WebTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests for the bundled debugger. |
@@ -12,8 +12,8 @@ discard block |
||
| 12 | 12 | $this->args = argParser::getArgs(); |
| 13 | 13 | |
| 14 | 14 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
| 15 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 16 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 15 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 16 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function testIndex() |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/parse_args.php'; |
|
| 3 | +include_once __DIR__.'/parse_args.php'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 5 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
| 8 | 8 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function _run($result = NULL) |
| 27 | 27 | { |
| 28 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 28 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 29 | 29 | |
| 30 | 30 | if ($result === NULL) { |
| 31 | 31 | $result = $this->createResult(); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 62 | 62 | { |
| 63 | - $url = $this->baseUrl . $path; |
|
| 63 | + $url = $this->baseUrl.$path; |
|
| 64 | 64 | |
| 65 | 65 | $ch = curl_init($url); |
| 66 | 66 | curl_setopt_array($ch, array( |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
| 80 | 80 | } |
| 81 | - if ($this->args['DEBUG'] > 0) { |
|
| 81 | + if ($this->args['DEBUG']>0) { |
|
| 82 | 82 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 83 | 83 | } |
| 84 | 84 | $page = curl_exec($ch); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | protected function getClient($path) |
| 98 | 98 | { |
| 99 | - $client = new xmlrpc_client($this->baseUrl . $path); |
|
| 99 | + $client = new xmlrpc_client($this->baseUrl.$path); |
|
| 100 | 100 | if ($this->collectCodeCoverageInformation) { |
| 101 | 101 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
| 102 | 102 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
| 3 | +include_once __DIR__.'/WebTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests for php files in the 'demo' directory. |
@@ -14,8 +14,8 @@ discard block |
||
| 14 | 14 | $this->args = argParser::getArgs(); |
| 15 | 15 | |
| 16 | 16 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
| 17 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 18 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 17 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
| 18 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | public function testVardemo() |
