@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | class DebuggerTest extends PhpXmlRpc_WebTestCase |
6 | 6 | { |
@@ -8,9 +8,9 @@ discard block |
||
8 | 8 | { |
9 | 9 | $this->args = argParser::getArgs(); |
10 | 10 | |
11 | - $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] ); |
|
11 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']); |
|
12 | 12 | |
13 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
|
13 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function testIndex() |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
2 | +require_once __DIR__."/client/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('html lang="en"> |
5 | 5 | <head><title>xmlrpc</title></head> |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | output("<h3>Testing value serialization</h3>\n"); |
12 | 12 | |
13 | 13 | $v = new PhpXmlRpc\Value(23, "int"); |
14 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
14 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
15 | 15 | $v = new PhpXmlRpc\Value("What are you saying? >> << &&"); |
16 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
16 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
17 | 17 | |
18 | 18 | $v = new PhpXmlRpc\Value( |
19 | 19 | array( |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | "array" |
25 | 25 | ); |
26 | 26 | |
27 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
27 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
28 | 28 | |
29 | 29 | $v = new PhpXmlRpc\Value( |
30 | 30 | array( |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | "struct" |
53 | 53 | ); |
54 | 54 | |
55 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
55 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
56 | 56 | |
57 | 57 | $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array"); |
58 | 58 | |
59 | -output("<PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
59 | +output("<PRE>".htmlentities($w->serialize())."</PRE>"); |
|
60 | 60 | |
61 | 61 | $w = new PhpXmlRpc\Value("Mary had a little lamb, |
62 | 62 | Whose fleece was white as snow, |
@@ -68,26 +68,26 @@ discard block |
||
68 | 68 | Ten thousand volts went down its back |
69 | 69 | And turned it into nylon", "base64" |
70 | 70 | ); |
71 | -output("<PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
72 | -output("<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>"); |
|
71 | +output("<PRE>".htmlentities($w->serialize())."</PRE>"); |
|
72 | +output("<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>"); |
|
73 | 73 | |
74 | 74 | $req->method(''); |
75 | 75 | $req->addParam(new PhpXmlRpc\Value("41", "int")); |
76 | 76 | |
77 | 77 | output("<h3>Testing request serialization</h3>\n"); |
78 | 78 | $op = $req->serialize(); |
79 | -output("<PRE>" . htmlentities($op) . "</PRE>"); |
|
79 | +output("<PRE>".htmlentities($op)."</PRE>"); |
|
80 | 80 | |
81 | 81 | output("<h3>Testing ISO date format</h3><pre>\n"); |
82 | 82 | |
83 | 83 | $t = time(); |
84 | 84 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
85 | 85 | output("Now is $t --> $date\n"); |
86 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
86 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
87 | 87 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
88 | 88 | output("That is to say $date --> $tb\n"); |
89 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
90 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
89 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
90 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
91 | 91 | |
92 | 92 | output("</pre>\n"); |
93 | 93 |
@@ -14,5 +14,5 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
18 | 18 | PhpXmlRpc\Autoloader::register(); |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | * @license code licensed under the BSD License: see file license.txt |
11 | 11 | */ |
12 | 12 | |
13 | -require_once __DIR__ . "/_prepend.php"; |
|
13 | +require_once __DIR__."/_prepend.php"; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Forward an xmlrpc request to another server, and return to client the response received. |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | // NB: here we should validate the received url, using f.e. a whitelist... |
32 | 32 | $client = new PhpXmlRpc\Client($url); |
33 | 33 | |
34 | - if ($req->getNumParams() > 3) { |
|
34 | + if ($req->getNumParams()>3) { |
|
35 | 35 | // we have to set some options onto the client. |
36 | 36 | // Note that if we do not untaint the received values, warnings might be generated... |
37 | 37 | $options = $encoder->decode($req->getParam(3)); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $client->setSSLVerifyPeer($val); |
52 | 52 | break; |
53 | 53 | case 'Timeout': |
54 | - $timeout = (integer)$val; |
|
54 | + $timeout = (integer) $val; |
|
55 | 55 | break; |
56 | 56 | } // switch |
57 | 57 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | // add debug info into response we give back to caller |
72 | - PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
72 | + PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
73 | 73 | |
74 | 74 | return $client->send($req, $timeout); |
75 | 75 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>xmlrpc - Getstatename demo</title></head> |
@@ -11,30 +11,30 @@ discard block |
||
11 | 11 | '); |
12 | 12 | |
13 | 13 | if (isset($_POST["stateno"]) && $_POST["stateno"] != "") { |
14 | - $stateNo = (integer)$_POST["stateno"]; |
|
14 | + $stateNo = (integer) $_POST["stateno"]; |
|
15 | 15 | $encoder = new PhpXmlRpc\Encoder(); |
16 | 16 | $req = new PhpXmlRpc\Request('examples.getStateName', |
17 | 17 | array($encoder->encode($stateNo)) |
18 | 18 | ); |
19 | - output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . "\n\n</pre>Debug info of server data follows...\n\n"); |
|
19 | + output("Sending the following request:<pre>\n\n".htmlentities($req->serialize())."\n\n</pre>Debug info of server data follows...\n\n"); |
|
20 | 20 | $client = new PhpXmlRpc\Client(XMLRPCSERVER); |
21 | 21 | $client->setDebug(1); |
22 | 22 | $r = $client->send($req); |
23 | 23 | if (!$r->faultCode()) { |
24 | 24 | $v = $r->value(); |
25 | - output("<br/>State number <b>" . $stateNo . "</b> is <b>" |
|
26 | - . htmlspecialchars($encoder->decode($v)) . "</b><br/><br/>"); |
|
25 | + output("<br/>State number <b>".$stateNo."</b> is <b>" |
|
26 | + . htmlspecialchars($encoder->decode($v))."</b><br/><br/>"); |
|
27 | 27 | } else { |
28 | 28 | output("An error occurred: "); |
29 | - output("Code: " . htmlspecialchars($r->faultCode()) |
|
30 | - . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>"); |
|
29 | + output("Code: ".htmlspecialchars($r->faultCode()) |
|
30 | + . " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>"); |
|
31 | 31 | } |
32 | 32 | } else { |
33 | 33 | $stateNo = ""; |
34 | 34 | } |
35 | 35 | |
36 | 36 | output("<form action=\"getstatename.php\" method=\"POST\"> |
37 | -<input name=\"stateno\" value=\"" . $stateNo . "\"> |
|
37 | +<input name=\"stateno\" value=\"" . $stateNo."\"> |
|
38 | 38 | <input type=\"submit\" value=\"go\" name=\"submit\"> |
39 | 39 | </form> |
40 | 40 | <p>Enter a state number to query its name</p>"); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | use PhpXmlRpc\Encoder; |
5 | 5 | use PhpXmlRpc\Client; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $handles = array(); |
25 | 25 | $curl = curl_multi_init(); |
26 | 26 | |
27 | - foreach($requests as $k => $req) { |
|
27 | + foreach ($requests as $k => $req) { |
|
28 | 28 | $req->setDebug($this->debug); |
29 | 29 | |
30 | 30 | $handle = $this->prepareCurlHandle( |
@@ -57,19 +57,19 @@ discard block |
||
57 | 57 | $running = 0; |
58 | 58 | do { |
59 | 59 | curl_multi_exec($curl, $running); |
60 | - } while($running > 0); |
|
60 | + } while ($running>0); |
|
61 | 61 | |
62 | 62 | $responses = array(); |
63 | - foreach($handles as $k => $h) { |
|
63 | + foreach ($handles as $k => $h) { |
|
64 | 64 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
65 | 65 | |
66 | - if ($this->debug > 1) { |
|
66 | + if ($this->debug>1) { |
|
67 | 67 | $message = "---CURL INFO---\n"; |
68 | 68 | foreach (curl_getinfo($h) as $name => $val) { |
69 | 69 | if (is_array($val)) { |
70 | 70 | $val = implode("\n", $val); |
71 | 71 | } |
72 | - $message .= $name . ': ' . $val . "\n"; |
|
72 | + $message .= $name.': '.$val."\n"; |
|
73 | 73 | } |
74 | 74 | $message .= '---END---'; |
75 | 75 | $this->getLogger()->debugMessage($message); |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | } |
81 | 81 | curl_multi_close($curl); |
82 | 82 | |
83 | - foreach($responses as $k => $resp) { |
|
83 | + foreach ($responses as $k => $resp) { |
|
84 | 84 | if (!$resp) { |
85 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
85 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
86 | 86 | } else { |
87 | 87 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
88 | 88 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $value = $encoder->encode($data, array('auto_dates')); |
100 | 100 | $req = new Request('interopEchoTests.echoValue', array($value)); |
101 | 101 | $reqs = array(); |
102 | -for ($i = 0; $i < $num_tests; $i++) { |
|
102 | +for ($i = 0; $i<$num_tests; $i++) { |
|
103 | 103 | $reqs[] = $req; |
104 | 104 | } |
105 | 105 | |
@@ -108,16 +108,16 @@ discard block |
||
108 | 108 | |
109 | 109 | $t = microtime(true); |
110 | 110 | $resp = $client->send($reqs); |
111 | -$t = microtime(true) - $t; |
|
111 | +$t = microtime(true)-$t; |
|
112 | 112 | echo "Sequential send: $t secs\n"; |
113 | 113 | |
114 | 114 | $t = microtime(true); |
115 | 115 | $resp = $client->sendParallel($reqs); |
116 | -$t = microtime(true) - $t; |
|
116 | +$t = microtime(true)-$t; |
|
117 | 117 | echo "Parallel send: $t secs\n"; |
118 | 118 | |
119 | 119 | $client->no_multicall = false; |
120 | 120 | $t = microtime(true); |
121 | 121 | $resp = $client->send($reqs); |
122 | -$t = microtime(true) - $t; |
|
122 | +$t = microtime(true)-$t; |
|
123 | 123 | echo "Multicall send: $t secs\n"; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>xmlrpc - Agesort demo</title></head> |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $inAr = array("Dave" => 24, "Edd" => 45, "Joe" => 37, "Fred" => 27); |
14 | 14 | output("This is the input data:<br/><pre>"); |
15 | 15 | foreach ($inAr as $key => $val) { |
16 | - output($key . ", " . $val . "\n"); |
|
16 | + output($key.", ".$val."\n"); |
|
17 | 17 | } |
18 | 18 | output("</pre>"); |
19 | 19 | |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | ); |
30 | 30 | } |
31 | 31 | $v = new PhpXmlRpc\Value($p, "array"); |
32 | -output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
32 | +output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
33 | 33 | |
34 | 34 | // create client and message objects |
35 | 35 | $req = new PhpXmlRpc\Request('examples.sortByAge', array($v)); |
@@ -49,15 +49,15 @@ discard block |
||
49 | 49 | foreach ($value as $struct) { |
50 | 50 | $name = $struct["name"]; |
51 | 51 | $age = $struct["age"]; |
52 | - output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n"); |
|
52 | + output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n"); |
|
53 | 53 | } |
54 | 54 | |
55 | - output("<hr/>For nerds: I got this value back<br/><pre>" . |
|
56 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
55 | + output("<hr/>For nerds: I got this value back<br/><pre>". |
|
56 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
57 | 57 | } else { |
58 | 58 | output("An error occurred:<pre>"); |
59 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
60 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>'); |
|
59 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
60 | + "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | output("</body></html>\n"); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>xmlrpc - Webservice wrappper demo</title></head> |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals |
21 | 21 | $resp = $client->send(new PhpXmlRpc\Request('system.listMethods')); |
22 | 22 | if ($resp->faultCode()) { |
23 | - output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n"); |
|
23 | + output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n"); |
|
24 | 24 | } else { |
25 | 25 | output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n"); |
26 | 26 | flush(); |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | if ($methodName == 'examples.getStateName') { |
33 | 33 | $callable = $wrapper->wrapXmlrpcMethod($client, $methodName); |
34 | 34 | if ($callable) { |
35 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n"); |
|
35 | + output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n"); |
|
36 | 36 | } else { |
37 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n"); |
|
37 | + output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n"); |
|
38 | 38 | } |
39 | 39 | break; |
40 | 40 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
18 | 18 | PhpXmlRpc\Autoloader::register(); |
19 | 19 | |
20 | 20 | // Let unit tests run against localhost, 'plain' demos against a known public server |