gggeek /
phpxmlrpc
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $val = reset($ar); |
| 108 | 108 | $typ = key($ar); |
| 109 | 109 | |
| 110 | - return '<value>' . $this->serializedata($typ, $val) . "</value>\n"; |
|
| 110 | + return '<value>'.$this->serializedata($typ, $val)."</value>\n"; |
|
| 111 | 111 | //} |
| 112 | 112 | } |
| 113 | 113 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // preserve back compatibility |
| 127 | 127 | |
| 128 | 128 | if (is_array($b)) { |
| 129 | - foreach($b as $id => $cont) { |
|
| 129 | + foreach ($b as $id => $cont) { |
|
| 130 | 130 | $b[$id] = $cont->scalarval(); |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | // add support for structures directly encoding php objects |
| 135 | 135 | if (is_object($b)) { |
| 136 | 136 | $t = get_object_vars($b); |
| 137 | - foreach($t as $id => $cont) { |
|
| 137 | + foreach ($t as $id => $cont) { |
|
| 138 | 138 | $t[$id] = $cont->scalarval(); |
| 139 | 139 | } |
| 140 | - foreach($t as $id => $cont) { |
|
| 140 | + foreach ($t as $id => $cont) { |
|
| 141 | 141 | @$b->$id = $cont; |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -179,17 +179,17 @@ discard block |
||
| 179 | 179 | /* Expose as global functions the ones which are now class methods */ |
| 180 | 180 | |
| 181 | 181 | /// Wrong speling, but we are adamant on backwards compatibility! |
| 182 | -function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='') |
|
| 182 | +function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '') |
|
| 183 | 183 | { |
| 184 | 184 | return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | -function iso8601_encode($timeT, $utc=0) |
|
| 187 | +function iso8601_encode($timeT, $utc = 0) |
|
| 188 | 188 | { |
| 189 | 189 | return Date::iso8601Encode($timeT, $utc); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | -function iso8601_decode($iDate, $utc=0) |
|
| 192 | +function iso8601_decode($iDate, $utc = 0) |
|
| 193 | 193 | { |
| 194 | 194 | return Date::iso8601Decode($iDate, $utc); |
| 195 | 195 | } |
@@ -199,25 +199,25 @@ discard block |
||
| 199 | 199 | return Http::decodeChunked($buffer); |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | -function php_xmlrpc_decode($xmlrpcVal, $options=array()) |
|
| 202 | +function php_xmlrpc_decode($xmlrpcVal, $options = array()) |
|
| 203 | 203 | { |
| 204 | 204 | $encoder = new Encoder(); |
| 205 | 205 | return $encoder->decode($xmlrpcVal, $options); |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | -function php_xmlrpc_encode($phpVal, $options=array()) |
|
| 208 | +function php_xmlrpc_encode($phpVal, $options = array()) |
|
| 209 | 209 | { |
| 210 | 210 | $encoder = new Encoder(); |
| 211 | 211 | return $encoder->encode($phpVal, $options); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function php_xmlrpc_decode_xml($xmlVal, $options=array()) |
|
| 214 | +function php_xmlrpc_decode_xml($xmlVal, $options = array()) |
|
| 215 | 215 | { |
| 216 | 216 | $encoder = new Encoder(); |
| 217 | 217 | return $encoder->decodeXml($xmlVal, $options); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | -function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null) |
|
| 220 | +function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null) |
|
| 221 | 221 | { |
| 222 | 222 | return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs); |
| 223 | 223 | } |
@@ -17,7 +17,12 @@ discard block |
||
| 17 | 17 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
| 18 | 18 | <head> |
| 19 | 19 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 20 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 20 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 21 | + echo 'JSONRPC'; |
|
| 22 | +} else { |
|
| 23 | + echo 'XMLRPC'; |
|
| 24 | +} |
|
| 25 | +?> Debugger</title> |
|
| 21 | 26 | <meta name="robots" content="index,nofollow"/> |
| 22 | 27 | <style type="text/css"> |
| 23 | 28 | <!-- |
@@ -366,7 +371,9 @@ discard block |
||
| 366 | 371 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 367 | 372 | if ($x->count() > 1) { |
| 368 | 373 | foreach($x as $k => $y) { |
| 369 | - if ($k == 0) continue; |
|
| 374 | + if ($k == 0) { |
|
| 375 | + continue; |
|
| 376 | + } |
|
| 370 | 377 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 371 | 378 | if ($wstype != 1) { |
| 372 | 379 | $type = $y->scalarval(); |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | <body> |
| 93 | 93 | <?php |
| 94 | 94 | |
| 95 | -include __DIR__ . '/common.php'; |
|
| 95 | +include __DIR__.'/common.php'; |
|
| 96 | 96 | |
| 97 | 97 | if ($action) { |
| 98 | 98 | |
| 99 | 99 | // make sure the script waits long enough for the call to complete... |
| 100 | 100 | if ($timeout) { |
| 101 | - set_time_limit($timeout + 10); |
|
| 101 | + set_time_limit($timeout+10); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | if ($wstype == 1) { |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | $server = "$host$path"; |
| 124 | 124 | } |
| 125 | 125 | if ($protocol == 2 || $protocol == 3) { |
| 126 | - $server = 'https://' . $server; |
|
| 126 | + $server = 'https://'.$server; |
|
| 127 | 127 | } else { |
| 128 | - $server = 'http://' . $server; |
|
| 128 | + $server = 'http://'.$server; |
|
| 129 | 129 | } |
| 130 | 130 | if ($proxy != '') { |
| 131 | 131 | $pproxy = explode(':', $proxy); |
| 132 | - if (count($pproxy) > 1) { |
|
| 132 | + if (count($pproxy)>1) { |
|
| 133 | 133 | $pport = $pproxy[1]; |
| 134 | 134 | } else { |
| 135 | 135 | $pport = 8080; |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | case 'wrap': |
| 205 | 205 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 206 | 206 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 207 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 207 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 208 | 208 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 209 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 209 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 210 | 210 | break; |
| 211 | 211 | case 'list': |
| 212 | 212 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -219,9 +219,9 @@ discard block |
||
| 219 | 219 | $msg[0] = new $requestClass($method, array(), $id); |
| 220 | 220 | // hack! build xml payload by hand |
| 221 | 221 | if ($wstype == 1) { |
| 222 | - $msg[0]->payload = "{\n" . |
|
| 223 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 224 | - $payload . |
|
| 222 | + $msg[0]->payload = "{\n". |
|
| 223 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 224 | + $payload. |
|
| 225 | 225 | "\n],\n\"id\": "; |
| 226 | 226 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 227 | 227 | if ($id == "") { |
@@ -234,20 +234,20 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | } else { |
| 237 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 238 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 239 | - $payload . |
|
| 240 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 237 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 238 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 239 | + $payload. |
|
| 240 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 241 | 241 | } |
| 242 | - $actionname = 'Execution of method ' . $method; |
|
| 242 | + $actionname = 'Execution of method '.$method; |
|
| 243 | 243 | break; |
| 244 | 244 | default: // give a warning |
| 245 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 245 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 249 | 249 | // this gives good user feedback for long-running methods... |
| 250 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 250 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 251 | 251 | flush(); |
| 252 | 252 | |
| 253 | 253 | $response = null; |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | break; |
| 266 | 266 | } |
| 267 | 267 | } |
| 268 | - $time = microtime(true) - $time; |
|
| 268 | + $time = microtime(true)-$time; |
|
| 269 | 269 | if ($debug) { |
| 270 | 270 | echo "</div>\n"; |
| 271 | 271 | } |
@@ -275,8 +275,8 @@ discard block |
||
| 275 | 275 | // call failed! echo out error msg! |
| 276 | 276 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 277 | 277 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 278 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 279 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 278 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 279 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 280 | 280 | echo(date("d/M/Y:H:i:s\n")); |
| 281 | 281 | } else { |
| 282 | 282 | // call succeeded: parse results |
@@ -292,36 +292,36 @@ discard block |
||
| 292 | 292 | $max = $v->count(); |
| 293 | 293 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 294 | 294 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 295 | - foreach($v as $i => $rec) { |
|
| 295 | + foreach ($v as $i => $rec) { |
|
| 296 | 296 | if ($i % 2) { |
| 297 | 297 | $class = ' class="oddrow"'; |
| 298 | 298 | } else { |
| 299 | 299 | $class = ' class="evenrow"'; |
| 300 | 300 | } |
| 301 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 302 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 323 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 324 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 301 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 302 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 323 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 324 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 325 | 325 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 326 | 326 | //echo("</tr>\n"); |
| 327 | 327 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $r2 = $resp[1]->value(); |
| 349 | 349 | |
| 350 | 350 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 351 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 351 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 352 | 352 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 353 | 353 | if ($desc == "") { |
| 354 | 354 | $desc = "-"; |
@@ -358,41 +358,41 @@ discard block |
||
| 358 | 358 | if ($r2->kindOf() != "array") { |
| 359 | 359 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 360 | 360 | } else { |
| 361 | - foreach($r2 as $i => $x) { |
|
| 361 | + foreach ($r2 as $i => $x) { |
|
| 362 | 362 | $payload = ""; |
| 363 | 363 | $alt_payload = ""; |
| 364 | - if ($i + 1 % 2) { |
|
| 364 | + if ($i+1 % 2) { |
|
| 365 | 365 | $class = ' class="oddrow"'; |
| 366 | 366 | } else { |
| 367 | 367 | $class = ' class="evenrow"'; |
| 368 | 368 | } |
| 369 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 369 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 370 | 370 | if ($x->kindOf() == "array") { |
| 371 | 371 | $ret = $x[0]; |
| 372 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 373 | - if ($x->count() > 1) { |
|
| 374 | - foreach($x as $k => $y) { |
|
| 372 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 373 | + if ($x->count()>1) { |
|
| 374 | + foreach ($x as $k => $y) { |
|
| 375 | 375 | if ($k == 0) continue; |
| 376 | 376 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 377 | 377 | if ($wstype != 1) { |
| 378 | 378 | $type = $y->scalarval(); |
| 379 | 379 | $payload .= '<param><value>'; |
| 380 | - switch($type) { |
|
| 380 | + switch ($type) { |
|
| 381 | 381 | case 'undefined': |
| 382 | 382 | break; |
| 383 | 383 | case 'null'; |
| 384 | 384 | $type = 'nil'; |
| 385 | 385 | // fall thru intentionally |
| 386 | 386 | default: |
| 387 | - $payload .= '<' . |
|
| 388 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 389 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 387 | + $payload .= '<'. |
|
| 388 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 389 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 390 | 390 | '>'; |
| 391 | 391 | } |
| 392 | 392 | $payload .= "</value></param>\n"; |
| 393 | 393 | } |
| 394 | 394 | $alt_payload .= $y->scalarval(); |
| 395 | - if ($k < $x->count() - 1) { |
|
| 395 | + if ($k<$x->count()-1) { |
|
| 396 | 396 | $alt_payload .= ';'; |
| 397 | 397 | echo ", "; |
| 398 | 398 | } |
@@ -405,63 +405,63 @@ discard block |
||
| 405 | 405 | echo '</td>'; |
| 406 | 406 | // button to test this method |
| 407 | 407 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 408 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 409 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 410 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 411 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 412 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 413 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 414 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 415 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 416 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 417 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 418 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 419 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 427 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 428 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 429 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 430 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 431 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 408 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 409 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 410 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 411 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 412 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 413 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 414 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 415 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 416 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 417 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 418 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 419 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 427 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 428 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 429 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 430 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 431 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 432 | 432 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 433 | 433 | if ($wstype != 1) { |
| 434 | 434 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 435 | 435 | } |
| 436 | 436 | echo "</form></td>\n"; |
| 437 | 437 | |
| 438 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 439 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 464 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 438 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 439 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 464 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 465 | 465 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 466 | 466 | echo "</form></td></tr>\n"; |
| 467 | 467 | } |
@@ -473,14 +473,14 @@ discard block |
||
| 473 | 473 | case 'wrap': |
| 474 | 474 | $r1 = $resp[0]->value(); |
| 475 | 475 | $r2 = $resp[1]->value(); |
| 476 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 476 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 477 | 477 | echo "Error: signature unknown\n"; |
| 478 | 478 | } else { |
| 479 | 479 | $mdesc = $r1->scalarval(); |
| 480 | 480 | $encoder = new PhpXmlRpc\Encoder(); |
| 481 | 481 | $msig = $encoder->decode($r2); |
| 482 | 482 | $msig = $msig[$methodsig]; |
| 483 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 483 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 484 | 484 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 485 | 485 | $clientcookies == '' |
| 486 | 486 | ) { |
@@ -494,11 +494,11 @@ discard block |
||
| 494 | 494 | $prefix = 'xmlrpc'; |
| 495 | 495 | } |
| 496 | 496 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 497 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 497 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 498 | 498 | //if ($code) |
| 499 | 499 | //{ |
| 500 | 500 | echo "<div id=\"phpcode\">\n"; |
| 501 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 501 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 502 | 502 | echo "\n</div>"; |
| 503 | 503 | //} |
| 504 | 504 | //else |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | break; |
| 510 | 510 | |
| 511 | 511 | case 'execute': |
| 512 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 512 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 513 | 513 | break; |
| 514 | 514 | |
| 515 | 515 | default: // give a warning |
@@ -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) { |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | if (count($this->xml_iso88591_Entities['in'])) { |
| 69 | 69 | return; |
| 70 | 70 | } |
| 71 | - for ($i = 0; $i < 32; $i++) { |
|
| 71 | + for ($i = 0; $i<32; $i++) { |
|
| 72 | 72 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 73 | 73 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 77 | 77 | |
| 78 | - for ($i = 160; $i < 256; $i++) { |
|
| 78 | + for ($i = 160; $i<256; $i++) { |
|
| 79 | 79 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 80 | 80 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 81 | 81 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | break;*/ |
| 104 | 104 | |
| 105 | 105 | default: |
| 106 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
| 106 | + throw new \Exception('Unsupported table: '.$tableName); |
|
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $destEncoding = 'US-ASCII'; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
| 149 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
| 150 | 150 | |
| 151 | 151 | // list ordered with (expected) most common scenarios first |
| 152 | 152 | switch ($conversion) { |
@@ -164,20 +164,20 @@ discard block |
||
| 164 | 164 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
| 165 | 165 | $escapedData = ''; |
| 166 | 166 | // be kind to users creating string xmlrpc values out of different php types |
| 167 | - $data = (string)$data; |
|
| 167 | + $data = (string) $data; |
|
| 168 | 168 | $ns = strlen($data); |
| 169 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
| 169 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
| 170 | 170 | $ch = $data[$nn]; |
| 171 | 171 | $ii = ord($ch); |
| 172 | 172 | // 7 bits in 1 byte: 0bbbbbbb (127) |
| 173 | - if ($ii < 32) { |
|
| 173 | + if ($ii<32) { |
|
| 174 | 174 | if ($conversion == 'UTF-8_US-ASCII') { |
| 175 | 175 | $escapedData .= sprintf('&#%d;', $ii); |
| 176 | 176 | } else { |
| 177 | 177 | $escapedData .= $ch; |
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | - else if ($ii < 128) { |
|
| 180 | + else if ($ii<128) { |
|
| 181 | 181 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 182 | 182 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 183 | 183 | switch ($ii) { |
@@ -202,25 +202,25 @@ discard block |
||
| 202 | 202 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
| 203 | 203 | elseif ($ii >> 5 == 6) { |
| 204 | 204 | $b1 = ($ii & 31); |
| 205 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 206 | - $ii = ($b1 * 64) + $b2; |
|
| 205 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 206 | + $ii = ($b1 * 64)+$b2; |
|
| 207 | 207 | $escapedData .= sprintf('&#%d;', $ii); |
| 208 | 208 | $nn += 1; |
| 209 | 209 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
| 210 | 210 | elseif ($ii >> 4 == 14) { |
| 211 | 211 | $b1 = ($ii & 15); |
| 212 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 213 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 214 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
| 212 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 213 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 214 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
| 215 | 215 | $escapedData .= sprintf('&#%d;', $ii); |
| 216 | 216 | $nn += 2; |
| 217 | 217 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
| 218 | 218 | elseif ($ii >> 3 == 30) { |
| 219 | 219 | $b1 = ($ii & 7); |
| 220 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 221 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 222 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
| 223 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
| 220 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 221 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 222 | + $b4 = (ord($data[$nn+3]) & 63); |
|
| 223 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
| 224 | 224 | $escapedData .= sprintf('&#%d;', $ii); |
| 225 | 225 | $nn += 3; |
| 226 | 226 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | default: |
| 270 | 270 | $escapedData = ''; |
| 271 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 271 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | return $escapedData; |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | case 'iso88591': |
| 323 | 323 | return $this->xml_iso88591_Entities; |
| 324 | 324 | default: |
| 325 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
| 325 | + throw new \Exception('Unsupported charset: '.$charset); |
|
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | } |
@@ -27,11 +27,11 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | global $stateNames; |
| 29 | 29 | |
| 30 | - if (isset($stateNames[$stateNo - 1])) { |
|
| 31 | - return $stateNames[$stateNo - 1]; |
|
| 30 | + if (isset($stateNames[$stateNo-1])) { |
|
| 31 | + return $stateNames[$stateNo-1]; |
|
| 32 | 32 | } else { |
| 33 | 33 | // not, there so complain |
| 34 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
@@ -125,13 +125,13 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $findstate10_sig = array( |
| 127 | 127 | /// @todo add a demo/test with a closure |
| 128 | - "function" => function ($req) { return findState($req); }, |
|
| 128 | + "function" => function($req) { return findState($req); }, |
|
| 129 | 129 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 130 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 130 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 131 | 131 | 'index of that state name in an alphabetic order.', |
| 132 | 132 | ); |
| 133 | 133 | |
| 134 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 134 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 135 | 135 | |
| 136 | 136 | /// @todo do we really need a new instance ? |
| 137 | 137 | $c = new xmlrpcServerMethodsContainer(); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
| 142 | 142 | |
| 143 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 143 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 144 | 144 | |
| 145 | 145 | return array_merge( |
| 146 | 146 | array( |
@@ -591,8 +591,9 @@ |
||
| 591 | 591 | } |
| 592 | 592 | foreach ($parsVariations as $i => $pars) { |
| 593 | 593 | $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 594 | - if ($i < (count($parsVariations) - 1)) |
|
| 595 | - $innerCode .= "else\n"; |
|
| 594 | + if ($i < (count($parsVariations) - 1)) { |
|
| 595 | + $innerCode .= "else\n"; |
|
| 596 | + } |
|
| 596 | 597 | } |
| 597 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
| 598 | 599 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -252,23 +252,23 @@ discard block |
||
| 252 | 252 | if (is_array($callable)) { |
| 253 | 253 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 254 | 254 | if ($func->isPrivate()) { |
| 255 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 255 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 256 | 256 | return false; |
| 257 | 257 | } |
| 258 | 258 | if ($func->isProtected()) { |
| 259 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 259 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 260 | 260 | return false; |
| 261 | 261 | } |
| 262 | 262 | if ($func->isConstructor()) { |
| 263 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 263 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 264 | 264 | return false; |
| 265 | 265 | } |
| 266 | 266 | if ($func->isDestructor()) { |
| 267 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 267 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | 270 | if ($func->isAbstract()) { |
| 271 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | /// @todo add more checks for static vs. nonstatic? |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | if ($func->isInternal()) { |
| 279 | 279 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 280 | 280 | // instead of getparameters to fully reflect internal php functions ? |
| 281 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 281 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 282 | 282 | return false; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $i = 0; |
| 331 | 331 | foreach ($func->getParameters() as $paramObj) { |
| 332 | 332 | $params[$i] = array(); |
| 333 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 333 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 334 | 334 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 335 | 335 | $i++; |
| 336 | 336 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // build a signature |
| 396 | 396 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 397 | 397 | $pSig = array($funcDesc['returnsDocs']); |
| 398 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 398 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 399 | 399 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 400 | 400 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 401 | 401 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -761,21 +761,21 @@ discard block |
||
| 761 | 761 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 762 | 762 | { |
| 763 | 763 | $namespace = '\\PhpXmlRpc\\'; |
| 764 | - $reqClass = $namespace . 'Request'; |
|
| 765 | - $valClass = $namespace . 'Value'; |
|
| 766 | - $decoderClass = $namespace . 'Encoder'; |
|
| 764 | + $reqClass = $namespace.'Request'; |
|
| 765 | + $valClass = $namespace.'Value'; |
|
| 766 | + $decoderClass = $namespace.'Encoder'; |
|
| 767 | 767 | |
| 768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 772 | 772 | |
| 773 | 773 | $req = new $reqClass('system.methodSignature'); |
| 774 | 774 | $req->addparam(new $valClass($methodName)); |
| 775 | 775 | $client->setDebug($debug); |
| 776 | 776 | $response = $client->send($req, $timeout, $protocol); |
| 777 | 777 | if ($response->faultCode()) { |
| 778 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 778 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 779 | 779 | return false; |
| 780 | 780 | } |
| 781 | 781 | |
@@ -785,8 +785,8 @@ discard block |
||
| 785 | 785 | $mSig = $decoder->decode($mSig); |
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 789 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 788 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 789 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 790 | 790 | return false; |
| 791 | 791 | } |
| 792 | 792 | |
@@ -802,11 +802,11 @@ discard block |
||
| 802 | 802 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 803 | 803 | { |
| 804 | 804 | $namespace = '\\PhpXmlRpc\\'; |
| 805 | - $reqClass = $namespace . 'Request'; |
|
| 806 | - $valClass = $namespace . 'Value'; |
|
| 805 | + $reqClass = $namespace.'Request'; |
|
| 806 | + $valClass = $namespace.'Value'; |
|
| 807 | 807 | |
| 808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 811 | 811 | |
| 812 | 812 | $mDesc = ''; |
@@ -840,10 +840,10 @@ discard block |
||
| 840 | 840 | $clientClone = clone $client; |
| 841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 842 | 842 | { |
| 843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 847 | 847 | if (isset($extraOptions['return_on_fault'])) { |
| 848 | 848 | $decodeFault = true; |
| 849 | 849 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -852,9 +852,9 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | $namespace = '\\PhpXmlRpc\\'; |
| 855 | - $reqClass = $namespace . 'Request'; |
|
| 856 | - $encoderClass = $namespace . 'Encoder'; |
|
| 857 | - $valueClass = $namespace . 'Value'; |
|
| 855 | + $reqClass = $namespace.'Request'; |
|
| 856 | + $encoderClass = $namespace.'Encoder'; |
|
| 857 | + $valueClass = $namespace.'Value'; |
|
| 858 | 858 | |
| 859 | 859 | $encoder = new $encoderClass(); |
| 860 | 860 | $encodeOptions = array(); |
@@ -925,13 +925,13 @@ discard block |
||
| 925 | 925 | * @param string $mDesc |
| 926 | 926 | * @return string[] keys: source, docstring |
| 927 | 927 | */ |
| 928 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 928 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 929 | 929 | { |
| 930 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 930 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 931 | 931 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 932 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 933 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 934 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 932 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 933 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 934 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 935 | 935 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 936 | 936 | if (isset($extraOptions['return_on_fault'])) { |
| 937 | 937 | $decodeFault = true; |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | $namespace = '\\PhpXmlRpc\\'; |
| 945 | 945 | |
| 946 | 946 | $code = "function $newFuncName ("; |
| 947 | - if ($clientCopyMode < 2) { |
|
| 947 | + if ($clientCopyMode<2) { |
|
| 948 | 948 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 949 | 949 | $verbatimClientCopy = !$clientCopyMode; |
| 950 | 950 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | |
| 960 | 960 | if ($mDesc != '') { |
| 961 | 961 | // take care that PHP comment is not terminated unwillingly by method description |
| 962 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 962 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 963 | 963 | } else { |
| 964 | 964 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 965 | 965 | } |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 969 | 969 | $plist = array(); |
| 970 | 970 | $pCount = count($mSig); |
| 971 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 971 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 972 | 972 | $plist[] = "\$p$i"; |
| 973 | 973 | $pType = $mSig[$i]; |
| 974 | 974 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -984,19 +984,19 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | } |
| 986 | 986 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 987 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 987 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 988 | 988 | } |
| 989 | - if ($clientCopyMode < 2) { |
|
| 989 | + if ($clientCopyMode<2) { |
|
| 990 | 990 | $plist[] = '$debug=0'; |
| 991 | 991 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 992 | 992 | } |
| 993 | 993 | $plist = implode(', ', $plist); |
| 994 | - $mDesc .= '* @return {$namespace}Response|' . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 994 | + $mDesc .= '* @return {$namespace}Response|'.$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 995 | 995 | |
| 996 | 996 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 997 | 997 | if ($decodeFault) { |
| 998 | 998 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 999 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 999 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1000 | 1000 | } else { |
| 1001 | 1001 | $respCode = var_export($faultResponse, true); |
| 1002 | 1002 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1012 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1013 | 1013 | |
| 1014 | 1014 | return array('source' => $code, 'docstring' => $mDesc); |
| 1015 | 1015 | } |
@@ -1035,23 +1035,23 @@ discard block |
||
| 1035 | 1035 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1036 | 1036 | { |
| 1037 | 1037 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1038 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1038 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1039 | 1039 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1040 | 1040 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1041 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1042 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1041 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1042 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1043 | 1043 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1044 | 1044 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1045 | 1045 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1046 | 1046 | $namespace = '\\PhpXmlRpc\\'; |
| 1047 | 1047 | |
| 1048 | - $reqClass = $namespace . 'Request'; |
|
| 1049 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1048 | + $reqClass = $namespace.'Request'; |
|
| 1049 | + $decoderClass = $namespace.'Encoder'; |
|
| 1050 | 1050 | |
| 1051 | 1051 | $req = new $reqClass('system.listMethods'); |
| 1052 | 1052 | $response = $client->send($req, $timeout, $protocol); |
| 1053 | 1053 | if ($response->faultCode()) { |
| 1054 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1054 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1055 | 1055 | |
| 1056 | 1056 | return false; |
| 1057 | 1057 | } else { |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | $mList = $decoder->decode($mList); |
| 1062 | 1062 | } |
| 1063 | 1063 | if (!is_array($mList) || !count($mList)) { |
| 1064 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1064 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1065 | 1065 | |
| 1066 | 1066 | return false; |
| 1067 | 1067 | } else { |
@@ -1069,8 +1069,8 @@ discard block |
||
| 1069 | 1069 | if ($newClassName != '') { |
| 1070 | 1070 | $xmlrpcClassName = $newClassName; |
| 1071 | 1071 | } else { |
| 1072 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | - array('_', ''), $client->server) . '_client'; |
|
| 1072 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | + array('_', ''), $client->server).'_client'; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1076 | 1076 | $xmlrpcClassName .= 'x'; |
@@ -1101,20 +1101,20 @@ discard block |
||
| 1101 | 1101 | if (!$buildIt) { |
| 1102 | 1102 | $source .= $methodWrap['docstring']; |
| 1103 | 1103 | } |
| 1104 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1104 | + $source .= $methodWrap['source']."\n"; |
|
| 1105 | 1105 | } else { |
| 1106 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1106 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | } |
| 1110 | 1110 | $source .= "}\n"; |
| 1111 | 1111 | if ($buildIt) { |
| 1112 | 1112 | $allOK = 0; |
| 1113 | - eval($source . '$allOK=1;'); |
|
| 1113 | + eval($source.'$allOK=1;'); |
|
| 1114 | 1114 | if ($allOK) { |
| 1115 | 1115 | return $xmlrpcClassName; |
| 1116 | 1116 | } else { |
| 1117 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1117 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1118 | 1118 | return false; |
| 1119 | 1119 | } |
| 1120 | 1120 | } else { |
@@ -1137,8 +1137,8 @@ discard block |
||
| 1137 | 1137 | */ |
| 1138 | 1138 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1139 | 1139 | { |
| 1140 | - $code = "\$client = new {$namespace}Client('" . str_replace("'", "\'", $client->path) . |
|
| 1141 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 1140 | + $code = "\$client = new {$namespace}Client('".str_replace("'", "\'", $client->path). |
|
| 1141 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 1142 | 1142 | |
| 1143 | 1143 | // copy all client fields to the client that will be generated runtime |
| 1144 | 1144 | // (this provides for future expansion or subclassing of client obj) |
@@ -951,9 +951,9 @@ |
||
| 951 | 951 | } |
| 952 | 952 | |
| 953 | 953 | protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 954 | - $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 955 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 956 | - $keyPass = '', $sslVersion = 0) |
|
| 954 | + $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
| 955 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
| 956 | + $keyPass = '', $sslVersion = 0) |
|
| 957 | 957 | { |
| 958 | 958 | if ($port == 0) { |
| 959 | 959 | if (in_array($method, array('http', 'http10', 'http11', 'h2c'))) { |
@@ -157,10 +157,10 @@ discard block |
||
| 157 | 157 | $server = $parts['host']; |
| 158 | 158 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 159 | 159 | if (isset($parts['query'])) { |
| 160 | - $path .= '?' . $parts['query']; |
|
| 160 | + $path .= '?'.$parts['query']; |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($parts['fragment'])) { |
| 163 | - $path .= '#' . $parts['fragment']; |
|
| 163 | + $path .= '#'.$parts['fragment']; |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($parts['port'])) { |
| 166 | 166 | $port = $parts['port']; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | if ($path == '' || $path[0] != '/') { |
| 179 | - $this->path = '/' . $path; |
|
| 179 | + $this->path = '/'.$path; |
|
| 180 | 180 | } else { |
| 181 | 181 | $this->path = $path; |
| 182 | 182 | } |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | }*/ |
| 215 | 215 | |
| 216 | 216 | // initialize user_agent string |
| 217 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 217 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | */ |
| 593 | 593 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 594 | 594 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 595 | - $method='http') |
|
| 595 | + $method = 'http') |
|
| 596 | 596 | { |
| 597 | 597 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
| 598 | 598 | |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | * @param int $sslVersion |
| 625 | 625 | * @return Response |
| 626 | 626 | */ |
| 627 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 627 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 628 | 628 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 629 | 629 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 630 | 630 | $sslVersion = 0) |
@@ -663,13 +663,13 @@ discard block |
||
| 663 | 663 | */ |
| 664 | 664 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 665 | 665 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 666 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 666 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 667 | 667 | $sslVersion = 0) |
| 668 | 668 | { |
| 669 | 669 | /// @todo log a warning if passed an unsupported method |
| 670 | 670 | |
| 671 | 671 | if ($port == 0) { |
| 672 | - $port = ( $method === 'https' ) ? 443 : 80; |
|
| 672 | + $port = ($method === 'https') ? 443 : 80; |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | // Only create the payload if it was not created previously |
@@ -699,15 +699,15 @@ discard block |
||
| 699 | 699 | // thanks to Grant Rauscher <[email protected]> for this |
| 700 | 700 | $credentials = ''; |
| 701 | 701 | if ($username != '') { |
| 702 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 702 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 703 | 703 | if ($authType != 1) { |
| 704 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 704 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 705 | 705 | } |
| 706 | 706 | } |
| 707 | 707 | |
| 708 | 708 | $acceptedEncoding = ''; |
| 709 | 709 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 710 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 710 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | $proxyCredentials = ''; |
@@ -718,17 +718,17 @@ discard block |
||
| 718 | 718 | $connectServer = $proxyHost; |
| 719 | 719 | $connectPort = $proxyPort; |
| 720 | 720 | $transport = 'tcp'; |
| 721 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 721 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 722 | 722 | if ($proxyUsername != '') { |
| 723 | 723 | if ($proxyAuthType != 1) { |
| 724 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 724 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 725 | 725 | } |
| 726 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 726 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 727 | 727 | } |
| 728 | 728 | } else { |
| 729 | 729 | $connectServer = $server; |
| 730 | 730 | $connectPort = $port; |
| 731 | - $transport = ( $method === 'https' ) ? 'tls' : 'tcp'; |
|
| 731 | + $transport = ($method === 'https') ? 'tls' : 'tcp'; |
|
| 732 | 732 | $uri = $this->path; |
| 733 | 733 | } |
| 734 | 734 | |
@@ -738,45 +738,45 @@ discard block |
||
| 738 | 738 | $version = ''; |
| 739 | 739 | foreach ($this->cookies as $name => $cookie) { |
| 740 | 740 | if ($cookie['version']) { |
| 741 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 742 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 741 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 742 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 743 | 743 | if ($cookie['path']) { |
| 744 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 744 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 745 | 745 | } |
| 746 | 746 | if ($cookie['domain']) { |
| 747 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 747 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 748 | 748 | } |
| 749 | 749 | if ($cookie['port']) { |
| 750 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 750 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 751 | 751 | } |
| 752 | 752 | } else { |
| 753 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 753 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 754 | 754 | } |
| 755 | 755 | } |
| 756 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 756 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | // omit port if default |
| 760 | 760 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 761 | - $port = ''; |
|
| 761 | + $port = ''; |
|
| 762 | 762 | } else { |
| 763 | - $port = ':' . $port; |
|
| 763 | + $port = ':'.$port; |
|
| 764 | 764 | } |
| 765 | 765 | |
| 766 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 767 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 768 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 769 | - $credentials . |
|
| 770 | - $proxyCredentials . |
|
| 771 | - $acceptedEncoding . |
|
| 772 | - $encodingHdr . |
|
| 773 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 774 | - $cookieHeader . |
|
| 775 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 776 | - strlen($payload) . "\r\n\r\n" . |
|
| 766 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 767 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 768 | + 'Host: '.$server.$port."\r\n". |
|
| 769 | + $credentials. |
|
| 770 | + $proxyCredentials. |
|
| 771 | + $acceptedEncoding. |
|
| 772 | + $encodingHdr. |
|
| 773 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 774 | + $cookieHeader. |
|
| 775 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 776 | + strlen($payload)."\r\n\r\n". |
|
| 777 | 777 | $payload; |
| 778 | 778 | |
| 779 | - if ($this->debug > 1) { |
|
| 779 | + if ($this->debug>1) { |
|
| 780 | 780 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
| 781 | 781 | } |
| 782 | 782 | |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | |
| 804 | 804 | $context = stream_context_create($contextOptions); |
| 805 | 805 | |
| 806 | - if ($timeout <= 0) { |
|
| 806 | + if ($timeout<=0) { |
|
| 807 | 807 | $connectTimeout = ini_get('default_socket_timeout'); |
| 808 | 808 | } else { |
| 809 | 809 | $connectTimeout = $timeout; |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 816 | 816 | STREAM_CLIENT_CONNECT, $context); |
| 817 | 817 | if ($fp) { |
| 818 | - if ($timeout > 0) { |
|
| 818 | + if ($timeout>0) { |
|
| 819 | 819 | stream_set_timeout($fp, $timeout); |
| 820 | 820 | } |
| 821 | 821 | } else { |
@@ -824,8 +824,8 @@ discard block |
||
| 824 | 824 | $this->errstr = $err['message']; |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 828 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 827 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 828 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 829 | 829 | |
| 830 | 830 | return $r; |
| 831 | 831 | } |
@@ -914,13 +914,13 @@ discard block |
||
| 914 | 914 | |
| 915 | 915 | $result = curl_exec($curl); |
| 916 | 916 | |
| 917 | - if ($this->debug > 1) { |
|
| 917 | + if ($this->debug>1) { |
|
| 918 | 918 | $message = "---CURL INFO---\n"; |
| 919 | 919 | foreach (curl_getinfo($curl) as $name => $val) { |
| 920 | 920 | if (is_array($val)) { |
| 921 | 921 | $val = implode("\n", $val); |
| 922 | 922 | } |
| 923 | - $message .= $name . ': ' . $val . "\n"; |
|
| 923 | + $message .= $name.': '.$val."\n"; |
|
| 924 | 924 | } |
| 925 | 925 | $message .= '---END---'; |
| 926 | 926 | $this->getLogger()->debugMessage($message); |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 931 | 931 | |
| 932 | 932 | $this->errstr = 'no response'; |
| 933 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 933 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 934 | 934 | curl_close($curl); |
| 935 | 935 | if ($keepAlive) { |
| 936 | 936 | $this->xmlrpc_curl_handle = null; |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | $protocol = $method; |
| 1000 | 1000 | } |
| 1001 | 1001 | } |
| 1002 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 1002 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 1003 | 1003 | if ($keepAlive) { |
| 1004 | 1004 | $this->xmlrpc_curl_handle = $curl; |
| 1005 | 1005 | } |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | // results into variable |
| 1011 | 1011 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1012 | 1012 | |
| 1013 | - if ($this->debug > 1) { |
|
| 1013 | + if ($this->debug>1) { |
|
| 1014 | 1014 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1015 | 1015 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 1016 | 1016 | } |
@@ -1035,7 +1035,7 @@ discard block |
||
| 1035 | 1035 | } |
| 1036 | 1036 | } |
| 1037 | 1037 | // extra headers |
| 1038 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 1038 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 1039 | 1039 | // if no keepalive is wanted, let the server know it in advance |
| 1040 | 1040 | if (!$keepAlive) { |
| 1041 | 1041 | $headers[] = 'Connection: close'; |
@@ -1052,10 +1052,10 @@ discard block |
||
| 1052 | 1052 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1053 | 1053 | // timeout is borked |
| 1054 | 1054 | if ($timeout) { |
| 1055 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 1055 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | - switch($method) { |
|
| 1058 | + switch ($method) { |
|
| 1059 | 1059 | case 'http10': |
| 1060 | 1060 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
| 1061 | 1061 | break; |
@@ -1071,11 +1071,11 @@ discard block |
||
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | if ($username && $password) { |
| 1074 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 1074 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 1075 | 1075 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1076 | 1076 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 1077 | 1077 | } elseif ($authType != 1) { |
| 1078 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1078 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1079 | 1079 | } |
| 1080 | 1080 | } |
| 1081 | 1081 | |
@@ -1117,13 +1117,13 @@ discard block |
||
| 1117 | 1117 | if ($proxyPort == 0) { |
| 1118 | 1118 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1119 | 1119 | } |
| 1120 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1120 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1121 | 1121 | if ($proxyUsername) { |
| 1122 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1122 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1123 | 1123 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1124 | 1124 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1125 | 1125 | } elseif ($proxyAuthType != 1) { |
| 1126 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1126 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1127 | 1127 | } |
| 1128 | 1128 | } |
| 1129 | 1129 | } |
@@ -1133,7 +1133,7 @@ discard block |
||
| 1133 | 1133 | if (count($this->cookies)) { |
| 1134 | 1134 | $cookieHeader = ''; |
| 1135 | 1135 | foreach ($this->cookies as $name => $cookie) { |
| 1136 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1136 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1137 | 1137 | } |
| 1138 | 1138 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1139 | 1139 | } |
@@ -1142,7 +1142,7 @@ discard block |
||
| 1142 | 1142 | curl_setopt($curl, $opt, $val); |
| 1143 | 1143 | } |
| 1144 | 1144 | |
| 1145 | - if ($this->debug > 1) { |
|
| 1145 | + if ($this->debug>1) { |
|
| 1146 | 1146 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 1147 | 1147 | } |
| 1148 | 1148 | |
@@ -1240,7 +1240,7 @@ discard block |
||
| 1240 | 1240 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1241 | 1241 | $numParams = $req->getNumParams(); |
| 1242 | 1242 | $params = array(); |
| 1243 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1243 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1244 | 1244 | $params[$i] = $req->getParam($i); |
| 1245 | 1245 | } |
| 1246 | 1246 | $call['params'] = new Value($params, 'array'); |
@@ -1266,15 +1266,15 @@ discard block |
||
| 1266 | 1266 | /// @todo test this code branch... |
| 1267 | 1267 | $rets = $result->value(); |
| 1268 | 1268 | if (!is_array($rets)) { |
| 1269 | - return false; // bad return type from system.multicall |
|
| 1269 | + return false; // bad return type from system.multicall |
|
| 1270 | 1270 | } |
| 1271 | 1271 | $numRets = count($rets); |
| 1272 | 1272 | if ($numRets != count($reqs)) { |
| 1273 | - return false; // wrong number of return values. |
|
| 1273 | + return false; // wrong number of return values. |
|
| 1274 | 1274 | } |
| 1275 | 1275 | |
| 1276 | 1276 | $response = array(); |
| 1277 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1277 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1278 | 1278 | $val = $rets[$i]; |
| 1279 | 1279 | if (!is_array($val)) { |
| 1280 | 1280 | return false; |
@@ -1282,7 +1282,7 @@ discard block |
||
| 1282 | 1282 | switch (count($val)) { |
| 1283 | 1283 | case 1: |
| 1284 | 1284 | if (!isset($val[0])) { |
| 1285 | - return false; // Bad value |
|
| 1285 | + return false; // Bad value |
|
| 1286 | 1286 | } |
| 1287 | 1287 | // Normal return value |
| 1288 | 1288 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1310,19 +1310,19 @@ discard block |
||
| 1310 | 1310 | |
| 1311 | 1311 | $rets = $result->value(); |
| 1312 | 1312 | if ($rets->kindOf() != 'array') { |
| 1313 | - return false; // bad return type from system.multicall |
|
| 1313 | + return false; // bad return type from system.multicall |
|
| 1314 | 1314 | } |
| 1315 | 1315 | $numRets = $rets->count(); |
| 1316 | 1316 | if ($numRets != count($reqs)) { |
| 1317 | - return false; // wrong number of return values. |
|
| 1317 | + return false; // wrong number of return values. |
|
| 1318 | 1318 | } |
| 1319 | 1319 | |
| 1320 | 1320 | $response = array(); |
| 1321 | - foreach($rets as $val) { |
|
| 1321 | + foreach ($rets as $val) { |
|
| 1322 | 1322 | switch ($val->kindOf()) { |
| 1323 | 1323 | case 'array': |
| 1324 | 1324 | if ($val->count() != 1) { |
| 1325 | - return false; // Bad value |
|
| 1325 | + return false; // Bad value |
|
| 1326 | 1326 | } |
| 1327 | 1327 | // Normal return value |
| 1328 | 1328 | $response[] = new Response($val[0]); |
@@ -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->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->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->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->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | begin_test($testName, 'https no keep-alive'); |
| 328 | 328 | $c->keepalive = false; |
| 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 | begin_test($testName, 'https w. keep-alive'); |
| 337 | 337 | $c->keepalive = true; |
| 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->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->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->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | begin_test($testName, 'http2 no keep-alive'); |
| 406 | 406 | $c->keepalive = false; |
| 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 | begin_test($testName, 'http2 w. keep-alive'); |
| 415 | 415 | $c->keepalive = true; |
| 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->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->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 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $this->me['struct'] = $val; |
| 120 | 120 | break; |
| 121 | 121 | default: |
| 122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | if ($typeOf !== 1) { |
| 147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 148 | 148 | return 0; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | switch ($this->mytype) { |
| 163 | 163 | case 1: |
| 164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 165 | 165 | return 0; |
| 166 | 166 | case 3: |
| 167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 168 | 168 | return 0; |
| 169 | 169 | case 2: |
| 170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | return 1; |
| 208 | 208 | } else { |
| 209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 210 | 210 | return 0; |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | return 1; |
| 239 | 239 | } else { |
| 240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 241 | 241 | return 0; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -279,19 +279,19 @@ discard block |
||
| 279 | 279 | case 1: |
| 280 | 280 | switch ($typ) { |
| 281 | 281 | case static::$xmlrpcBase64: |
| 282 | - $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>"; |
|
| 282 | + $rs .= "<${typ}>".base64_encode($val)."</${typ}>"; |
|
| 283 | 283 | break; |
| 284 | 284 | case static::$xmlrpcBoolean: |
| 285 | - $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>"; |
|
| 285 | + $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>"; |
|
| 286 | 286 | break; |
| 287 | 287 | case static::$xmlrpcString: |
| 288 | 288 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 289 | - $rs .= "<${typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>"; |
|
| 289 | + $rs .= "<${typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>"; |
|
| 290 | 290 | break; |
| 291 | 291 | case static::$xmlrpcInt: |
| 292 | 292 | case static::$xmlrpcI4: |
| 293 | 293 | case static::$xmlrpcI8: |
| 294 | - $rs .= "<${typ}>" . (int)$val . "</${typ}>"; |
|
| 294 | + $rs .= "<${typ}>".(int) $val."</${typ}>"; |
|
| 295 | 295 | break; |
| 296 | 296 | case static::$xmlrpcDouble: |
| 297 | 297 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -299,16 +299,16 @@ discard block |
||
| 299 | 299 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
| 300 | 300 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 301 | 301 | // but there is of course no limit in the number of decimal places to be used... |
| 302 | - $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</${typ}>"; |
|
| 302 | + $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</${typ}>"; |
|
| 303 | 303 | break; |
| 304 | 304 | case static::$xmlrpcDateTime: |
| 305 | 305 | if (is_string($val)) { |
| 306 | 306 | $rs .= "<${typ}>${val}</${typ}>"; |
| 307 | 307 | // DateTimeInterface is not present in php 5.4... |
| 308 | 308 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 309 | - $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>"; |
|
| 309 | + $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>"; |
|
| 310 | 310 | } elseif (is_int($val)) { |
| 311 | - $rs .= "<${typ}>" . date('Ymd\TH:i:s', $val) . "</${typ}>"; |
|
| 311 | + $rs .= "<${typ}>".date('Ymd\TH:i:s', $val)."</${typ}>"; |
|
| 312 | 312 | } else { |
| 313 | 313 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 314 | 314 | $rs .= "<${typ}>${val}</${typ}>"; |
@@ -330,14 +330,14 @@ discard block |
||
| 330 | 330 | case 3: |
| 331 | 331 | // struct |
| 332 | 332 | if ($this->_php_class) { |
| 333 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 333 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 334 | 334 | } else { |
| 335 | 335 | $rs .= "<struct>\n"; |
| 336 | 336 | } |
| 337 | 337 | $charsetEncoder = $this->getCharsetEncoder(); |
| 338 | 338 | /** @var Value $val2 */ |
| 339 | 339 | foreach ($val as $key2 => $val2) { |
| 340 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 340 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 341 | 341 | //$rs.=$this->serializeval($val2); |
| 342 | 342 | $rs .= $val2->serialize($charsetEncoding); |
| 343 | 343 | $rs .= "</member>\n"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | $val = reset($this->me); |
| 374 | 374 | $typ = key($this->me); |
| 375 | 375 | |
| 376 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 376 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
@@ -2,20 +2,20 @@ |
||
| 2 | 2 | |
| 3 | 3 | use PHPUnit\Runner\Version as PHPUnit_Version; |
| 4 | 4 | |
| 5 | -if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true |
|
| 6 | - && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false |
|
| 5 | +if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true |
|
| 6 | + && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false |
|
| 7 | 7 | ) { |
| 8 | - class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ); |
|
| 8 | + class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage'); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | -if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true |
|
| 12 | - && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false |
|
| 11 | +if (class_exists('PHPUnit_Runner_BaseTestRunner') === true |
|
| 12 | + && class_exists('PHPUnit\Runner\BaseTestRunner') === false |
|
| 13 | 13 | ) { |
| 14 | - class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' ); |
|
| 14 | + class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner'); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | if (class_exists('PHPUnit\Runner\Version') === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) { |
| 18 | - include_once __DIR__ . '/PolyfillTestCase7.php'; |
|
| 18 | + include_once __DIR__.'/PolyfillTestCase7.php'; |
|
| 19 | 19 | } else { |
| 20 | - include_once __DIR__ . '/PolyfillTestCase8.php'; |
|
| 20 | + include_once __DIR__.'/PolyfillTestCase8.php'; |
|
| 21 | 21 | } |
