@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * @license code licensed under the BSD License: see file license.txt |
17 | 17 | */ |
18 | 18 | |
19 | -require_once __DIR__ . "/_prepend.php"; |
|
19 | +require_once __DIR__."/_prepend.php"; |
|
20 | 20 | |
21 | 21 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
22 | 22 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | // fe. any url using the 'file://' protocol might be considered a hacking attempt |
48 | 48 | $client = new Client($url); |
49 | 49 | |
50 | - if ($req->getNumParams() > 3) { |
|
50 | + if ($req->getNumParams()>3) { |
|
51 | 51 | // We have to set some options onto the client. |
52 | 52 | // Note that if we do not untaint the received values, warnings might be generated... |
53 | 53 | $options = $encoder->decode($req->getParam(3)); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $client->setOption(Client::OPT_VERIFY_PEER, $val); |
88 | 88 | break; |
89 | 89 | case 'Timeout': |
90 | - $timeout = (integer)$val; |
|
90 | + $timeout = (integer) $val; |
|
91 | 91 | break; |
92 | 92 | } // switch |
93 | 93 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | /// X-forwarded-for anyway, unless they consider this server as trusted...) |
101 | 101 | $reqMethod = $req->getParam(1)->scalarVal(); |
102 | 102 | $req = new Request($reqMethod); |
103 | - if ($req->getNumParams() > 1) { |
|
103 | + if ($req->getNumParams()>1) { |
|
104 | 104 | $pars = $req->getParam(2); |
105 | 105 | foreach ($pars as $par) { |
106 | 106 | $req->addParam($par); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | // add debug info into response we give back to caller |
111 | - Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
111 | + Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
112 | 112 | |
113 | 113 | return $client->send($req, $timeout); |
114 | 114 | } |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | $snv = $sno->scalarVal(); |
55 | 55 | |
56 | 56 | // look it up in our array (zero-based) |
57 | - if (isset(self::$stateNames[$snv - 1])) { |
|
58 | - $stateName = self::$stateNames[$snv - 1]; |
|
57 | + if (isset(self::$stateNames[$snv-1])) { |
|
58 | + $stateName = self::$stateNames[$snv-1]; |
|
59 | 59 | } else { |
60 | 60 | // not there, so complain |
61 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
61 | + $err = "I don't have a state for the index '".$snv."'"; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | if ($err != '') { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $s = $req->getParam(0); |
133 | 133 | $t = $req->getParam(1); |
134 | 134 | |
135 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcInt)); |
|
135 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcInt)); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | public static $addtwodouble_sig = array(array('double', 'double', 'double')); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $s = $req->getParam(0); |
143 | 143 | $t = $req->getParam(1); |
144 | 144 | |
145 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcDouble)); |
|
145 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcDouble)); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | public static $stringecho_sig = array(array('string', 'string')); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | /// In fact, we miss some API (or extra data) in the Request... |
166 | 166 | //$payload = file_get_contents('php://input'); |
167 | 167 | $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding); |
168 | - $s = "I got the following message:\n" . $payload; |
|
168 | + $s = "I got the following message:\n".$payload; |
|
169 | 169 | |
170 | 170 | return new Response(new Value($s)); |
171 | 171 | } |
@@ -238,17 +238,17 @@ discard block |
||
238 | 238 | |
239 | 239 | /// @todo in real life, we should check for presence of return characters to avoid header injection! |
240 | 240 | |
241 | - $msgHdr = "From: " . $mFrom->scalarVal() . "\n"; |
|
242 | - $msgHdr .= "To: " . $mTo->scalarVal() . "\n"; |
|
241 | + $msgHdr = "From: ".$mFrom->scalarVal()."\n"; |
|
242 | + $msgHdr .= "To: ".$mTo->scalarVal()."\n"; |
|
243 | 243 | |
244 | 244 | if ($mCc->scalarVal() != "") { |
245 | - $msgHdr .= "Cc: " . $mCc->scalarVal() . "\n"; |
|
245 | + $msgHdr .= "Cc: ".$mCc->scalarVal()."\n"; |
|
246 | 246 | } |
247 | 247 | if ($mBcc->scalarVal() != "") { |
248 | - $msgHdr .= "Bcc: " . $mBcc->scalarVal() . "\n"; |
|
248 | + $msgHdr .= "Bcc: ".$mBcc->scalarVal()."\n"; |
|
249 | 249 | } |
250 | 250 | if ($mMime->scalarVal() != "") { |
251 | - $msgHdr .= "Content-type: " . $mMime->scalarVal() . "\n"; |
|
251 | + $msgHdr .= "Content-type: ".$mMime->scalarVal()."\n"; |
|
252 | 252 | } |
253 | 253 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
254 | 254 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | array(Value::$xmlrpcInt, Value::$xmlrpcArray) |
18 | 18 | ), |
19 | 19 | "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.', |
20 | - "function" => function ($req) |
|
20 | + "function" => function($req) |
|
21 | 21 | { |
22 | 22 | $sno = $req->getParam(0); |
23 | 23 | $numCurly = 0; |
@@ -38,13 +38,13 @@ discard block |
||
38 | 38 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
39 | 39 | ), |
40 | 40 | "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
41 | - "function" => function ($req) |
|
41 | + "function" => function($req) |
|
42 | 42 | { |
43 | 43 | $sno = $req->getParam(0); |
44 | 44 | $moe = $sno["moe"]; |
45 | 45 | $larry = $sno["larry"]; |
46 | 46 | $curly = $sno["curly"]; |
47 | - $num = $moe->scalarVal() + $larry->scalarVal() + $curly->scalarVal(); |
|
47 | + $num = $moe->scalarVal()+$larry->scalarVal()+$curly->scalarVal(); |
|
48 | 48 | |
49 | 49 | return new Response(new Value($num, Value::$xmlrpcInt)); |
50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | array(Value::$xmlrpcStruct, Value::$xmlrpcStruct) |
56 | 56 | ), |
57 | 57 | "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.', |
58 | - "function" => function ($req) |
|
58 | + "function" => function($req) |
|
59 | 59 | { |
60 | 60 | $sno = $req->getParam(0); |
61 | 61 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | ) |
72 | 72 | ), |
73 | 73 | "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.', |
74 | - "function" => function ($req) |
|
74 | + "function" => function($req) |
|
75 | 75 | { |
76 | 76 | return new Response(new Value( |
77 | 77 | array( |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | array(Value::$xmlrpcString, Value::$xmlrpcArray) |
93 | 93 | ), |
94 | 94 | "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.', |
95 | - "function" => function ($req) |
|
95 | + "function" => function($req) |
|
96 | 96 | { |
97 | 97 | $ar = $req->getParam(0); |
98 | 98 | $sz = $ar->count(); |
99 | 99 | $first = $ar[0]; |
100 | - $last = $ar[$sz - 1]; |
|
100 | + $last = $ar[$sz-1]; |
|
101 | 101 | |
102 | - return new Response(new Value($first->scalarVal() . $last->scalarVal(), Value::$xmlrpcString)); |
|
102 | + return new Response(new Value($first->scalarVal().$last->scalarVal(), Value::$xmlrpcString)); |
|
103 | 103 | } |
104 | 104 | ), |
105 | 105 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | array(Value::$xmlrpcStruct, Value::$xmlrpcInt) |
109 | 109 | ), |
110 | 110 | "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.', |
111 | - "function" => function ($req) |
|
111 | + "function" => function($req) |
|
112 | 112 | { |
113 | 113 | $sno = $req->getParam(0); |
114 | 114 | $v = $sno->scalarVal(); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
130 | 130 | ), |
131 | 131 | "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
132 | - "function" => function ($req) |
|
132 | + "function" => function($req) |
|
133 | 133 | { |
134 | 134 | $sno = $req->getParam(0); |
135 | 135 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $larry = $fools["larry"]; |
141 | 141 | $moe = $fools["moe"]; |
142 | 142 | |
143 | - return new Response(new Value($curly->scalarVal() + $larry->scalarVal() + $moe->scalarVal(), Value::$xmlrpcInt)); |
|
143 | + return new Response(new Value($curly->scalarVal()+$larry->scalarVal()+$moe->scalarVal(), Value::$xmlrpcInt)); |
|
144 | 144 | } |
145 | 145 | ), |
146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | array(Value::$xmlrpcStruct, Value::$xmlrpcString) |
150 | 150 | ), |
151 | 151 | "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely <, >, & \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.', |
152 | - "function" => function ($req) |
|
152 | + "function" => function($req) |
|
153 | 153 | { |
154 | 154 | $sno = $req->getParam(0); |
155 | 155 | $str = $sno->scalarVal(); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $ap = 0; |
159 | 159 | $qu = 0; |
160 | 160 | $amp = 0; |
161 | - for ($i = 0; $i < strlen($str); $i++) { |
|
161 | + for ($i = 0; $i<strlen($str); $i++) { |
|
162 | 162 | $c = substr($str, $i, 1); |
163 | 163 | switch ($c) { |
164 | 164 | case ">": |
@@ -69,11 +69,12 @@ |
||
69 | 69 | $a = $req->getParam(0); |
70 | 70 | $b = $req->getParam(1); |
71 | 71 | |
72 | - if ($a->scalarTyp() == Value::$xmlrpcNull) |
|
73 | - return new Response(new Value(plain_findstate($b->scalarVal()))); |
|
74 | - else |
|
75 | - return new Response(new Value(plain_findstate($a->scalarVal()))); |
|
76 | -} |
|
72 | + if ($a->scalarTyp() == Value::$xmlrpcNull) { |
|
73 | + return new Response(new Value(plain_findstate($b->scalarVal()))); |
|
74 | + } else { |
|
75 | + return new Response(new Value(plain_findstate($a->scalarVal()))); |
|
76 | + } |
|
77 | + } |
|
77 | 78 | |
78 | 79 | return array( |
79 | 80 | "tests.getallheaders" => array( |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION']; |
44 | 44 | } elseif (isset($_SERVER['PHP_AUTH_USER'])) { |
45 | 45 | $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; |
46 | - $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass); |
|
46 | + $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass); |
|
47 | 47 | } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) { |
48 | 48 | $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST']; |
49 | 49 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
116 | 116 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
117 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
117 | + "tests.utf8methodname.".'κόσμε' => array( |
|
118 | 118 | "function" => "exampleMethods::stringEcho", |
119 | 119 | "signature" => exampleMethods::$stringecho_sig, |
120 | 120 | "docstring" => exampleMethods::$stringecho_doc, |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | use PhpXmlRpc\Encoder; |
20 | 20 | |
21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
23 | 23 | |
24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
24 | +include __DIR__.'/../tests/parse_args.php'; |
|
25 | 25 | $args = argParser::getArgs(); |
26 | 26 | |
27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
42 | 42 | trigger_error('ending test that was not started'); |
43 | 43 | } |
44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
46 | 46 | echo '.'; |
47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | if ($is_web) { |
78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
79 | 79 | if ($xd) { |
80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
81 | 81 | } |
82 | 82 | flush(); |
83 | 83 | ob_flush(); |
84 | 84 | } else { |
85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
86 | 86 | if ($xd) { |
87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
94 | 94 | $vals = array(); |
95 | - for ($j = 0; $j < 10; $j++) { |
|
95 | + for ($j = 0; $j<10; $j++) { |
|
96 | 96 | $valArray = array(); |
97 | 97 | foreach ($data[$j] as $key => $val) { |
98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
119 | 119 | $encoder = new Encoder(); |
120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
122 | 122 | $out = $value->serialize(); |
123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | |
126 | 126 | if (function_exists('xmlrpc_set_type')) { |
127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
129 | - for ($j = 0; $j < 10; $j++) { |
|
128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
129 | + for ($j = 0; $j<10; $j++) { |
|
130 | 130 | foreach ($keys as $k) { |
131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
141 | 141 | $dummy = new Request(''); |
142 | 142 | $out = new Response($value); |
143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
144 | 144 | |
145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
147 | 147 | $response = $dummy->ParseResponse($in, true); |
148 | 148 | $value = $response->value(); |
149 | 149 | $result = array(); |
150 | - foreach($value as $val1) { |
|
150 | + foreach ($value as $val1) { |
|
151 | 151 | $out = array(); |
152 | - foreach($val1 as $name => $val) { |
|
152 | + foreach ($val1 as $name => $val) { |
|
153 | 153 | $out[$name] = array(); |
154 | - foreach($val as $data) { |
|
154 | + foreach ($val as $data) { |
|
155 | 155 | $out[$name][] = $data->scalarVal(); |
156 | 156 | } |
157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
162 | 162 | |
163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
165 | 165 | $response = $dummy->ParseResponse($in, true); |
166 | 166 | $value = $response->value(); |
167 | 167 | $result = array(); |
168 | 168 | $l = $value->arraySize(); |
169 | - for ($k = 0; $k < $l; $k++) { |
|
169 | + for ($k = 0; $k<$l; $k++) { |
|
170 | 170 | $val1 = $value->arrayMem($k); |
171 | 171 | $out = array(); |
172 | - foreach($val1 as $name => $val) { |
|
172 | + foreach ($val1 as $name => $val) { |
|
173 | 173 | $out[$name] = array(); |
174 | 174 | $m = $val->arraySize(); |
175 | - for ($j = 0; $j < $m; $j++) { |
|
175 | + for ($j = 0; $j<$m; $j++) { |
|
176 | 176 | $data = $val->arrayMem($j); |
177 | 177 | $out[$name][] = $data->scalarVal(); |
178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
184 | 184 | |
185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
187 | 187 | $response = $dummy->parseResponse($in, true, 'phpvals'); |
188 | 188 | $value = $response->value(); |
189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | |
192 | 192 | if (function_exists('xmlrpc_decode')) { |
193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
195 | 195 | $response = $dummy->parseResponse($in, true, 'xml'); |
196 | 196 | $value = xmlrpc_decode($response->value()); |
197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
210 | 210 | $reqs = array(); |
211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
212 | 212 | $reqs[] = $req; |
213 | 213 | } |
214 | 214 | |
215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
216 | - if (count($server) > 1) { |
|
217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
216 | + if (count($server)>1) { |
|
217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
219 | 219 | } else { |
220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
222 | 222 | } |
223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | |
230 | 230 | begin_test($testName, 'http 10'); |
231 | 231 | $response = array(); |
232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
233 | 233 | $resp = $c->send($req); |
234 | 234 | $response[] = $resp->value(); |
235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $c->setOption(Client::OPT_KEEPALIVE, false); |
240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
241 | 241 | $response = array(); |
242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
243 | 243 | $resp = $c->send($req, 10, 'http11'); |
244 | 244 | $response[] = $resp->value(); |
245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | |
248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
249 | 249 | $response = array(); |
250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
251 | 251 | $resp = $c->send($req, 10, 'http11'); |
252 | 252 | $response[] = $resp->value(); |
253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | |
270 | 270 | begin_test($testName, 'http 10 w. compression'); |
271 | 271 | $response = array(); |
272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
273 | 273 | $resp = $c->send($req); |
274 | 274 | $response[] = $resp->value(); |
275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | $c->setOption(Client::OPT_KEEPALIVE, false); |
280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
281 | 281 | $response = array(); |
282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
283 | 283 | $resp = $c->send($req, 10, 'http11'); |
284 | 284 | $response[] = $resp->value(); |
285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $c->setOption(Client::OPT_KEEPALIVE, true); |
289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
290 | 290 | $response = array(); |
291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
292 | 292 | $resp = $c->send($req, 10, 'http11'); |
293 | 293 | $response[] = $resp->value(); |
294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
310 | 310 | |
311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
312 | - if (count($server) > 1) { |
|
313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
312 | + if (count($server)>1) { |
|
313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
315 | 315 | } else { |
316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
318 | 318 | } |
319 | 319 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $c->setOption(Client::OPT_KEEPALIVE, false); |
328 | 328 | begin_test($testName, 'https no keep-alive'); |
329 | 329 | $response = array(); |
330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
331 | 331 | $resp = $c->send($req); |
332 | 332 | $response[] = $resp->value(); |
333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | $c->setOption(Client::OPT_KEEPALIVE, true); |
337 | 337 | begin_test($testName, 'https w. keep-alive'); |
338 | 338 | $response = array(); |
339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
340 | 340 | $resp = $c->send($req, 10); |
341 | 341 | $response[] = $resp->value(); |
342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | $c->setOption(Client::OPT_KEEPALIVE, false); |
358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
359 | 359 | $response = array(); |
360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
361 | 361 | $resp = $c->send($req); |
362 | 362 | $response[] = $resp->value(); |
363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | $c->setOption(Client::OPT_KEEPALIVE, true); |
367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
368 | 368 | $response = array(); |
369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
370 | 370 | $resp = $c->send($req, 10); |
371 | 371 | $response[] = $resp->value(); |
372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
388 | 388 | |
389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
390 | - if (count($server) > 1) { |
|
391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
390 | + if (count($server)>1) { |
|
391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
393 | 393 | } else { |
394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
396 | 396 | } |
397 | 397 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $c->setOption(Client::OPT_KEEPALIVE, false); |
406 | 406 | begin_test($testName, 'http2 no keep-alive'); |
407 | 407 | $response = array(); |
408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
409 | 409 | $resp = $c->send($req); |
410 | 410 | $response[] = $resp->value(); |
411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | $c->setOption(Client::OPT_KEEPALIVE, true); |
415 | 415 | begin_test($testName, 'http2 w. keep-alive'); |
416 | 416 | $response = array(); |
417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
418 | 418 | $resp = $c->send($req, 10); |
419 | 419 | $response[] = $resp->value(); |
420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | $c->setOption(Client::OPT_KEEPALIVE, false); |
436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
437 | 437 | $response = array(); |
438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
439 | 439 | $resp = $c->send($req); |
440 | 440 | $response[] = $resp->value(); |
441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | $c->setOption(Client::OPT_KEEPALIVE, true); |
445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
446 | 446 | $response = array(); |
447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
448 | 448 | $resp = $c->send($req, 10); |
449 | 449 | $response[] = $resp->value(); |
450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | foreach ($test_results as $test => $results) { |
467 | 467 | echo "\nTEST: $test\n"; |
468 | 468 | foreach ($results as $case => $data) { |
469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
470 | 470 | } |
471 | 471 | } |
472 | 472 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also |
8 | 8 | // write a specific file to disk. |
9 | 9 | // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file |
10 | -$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt'; |
|
10 | +$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt'; |
|
11 | 11 | $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : ''; |
12 | 12 | $fileId = file_exists($idFile) ? file_get_contents($idFile) : ''; |
13 | 13 | if ($randId == '' || $fileId == '' || $fileId !== $randId) { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
32 | 32 | } |
33 | 33 | |
34 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
34 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $targetFile = null; |
@@ -54,5 +54,5 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
57 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
57 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
58 | 58 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST) |
47 | 47 | // Note that the only use-case for web-page mode is when this is used by benchmark.php |
48 | 48 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
49 | - foreach($_SERVER as $key => $val) { |
|
49 | + foreach ($_SERVER as $key => $val) { |
|
50 | 50 | if (array_key_exists($key, $args)) { |
51 | 51 | $$key = $val; |
52 | 52 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | //} |
92 | 92 | } |
93 | 93 | if ($HTTPURI[0] != '/') { |
94 | - $HTTPURI = '/' . $HTTPURI; |
|
94 | + $HTTPURI = '/'.$HTTPURI; |
|
95 | 95 | } |
96 | 96 | $args['HTTPURI'] = $HTTPURI; |
97 | 97 | |
@@ -105,21 +105,21 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | if (isset($HTTPSIGNOREPEER)) { |
108 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
108 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (isset($HTTPSVERIFYHOST)) { |
112 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
112 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if (isset($SSLVERSION)) { |
116 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
116 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | if (isset($PROXYSERVER)) { |
120 | 120 | $arr = explode(':', $PROXYSERVER); |
121 | 121 | $args['PROXYSERVER'] = $arr[0]; |
122 | - if (count($arr) > 1) { |
|
122 | + if (count($arr)>1) { |
|
123 | 123 | $args['PROXYPORT'] = $arr[1]; |
124 | 124 | } else { |
125 | 125 | $args['PROXYPORT'] = 8080; |
@@ -5,8 +5,8 @@ |
||
5 | 5 | * It mimics server.php, but does not rely on other autoload mechanisms than the loading of xmlrpc.inc and xmlrpcs.inc |
6 | 6 | */ |
7 | 7 | |
8 | -require_once __DIR__ . "/../../lib/xmlrpc.inc"; |
|
9 | -require_once __DIR__ . "/../../lib/xmlrpcs.inc"; |
|
8 | +require_once __DIR__."/../../lib/xmlrpc.inc"; |
|
9 | +require_once __DIR__."/../../lib/xmlrpcs.inc"; |
|
10 | 10 | |
11 | 11 | $signatures1 = include(__DIR__.'/methodProviders/functions.php'); |
12 | 12 | $signatures2 = include(__DIR__.'/methodProviders/interop.php'); |
@@ -4,15 +4,15 @@ discard block |
||
4 | 4 | * A test file designed to test the legacy API class-loading mechanism, ie. not using phpunit/composer's autoload_ |
5 | 5 | */ |
6 | 6 | |
7 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
7 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
8 | 8 | |
9 | -include_once __DIR__ . '/parse_args.php'; |
|
9 | +include_once __DIR__.'/parse_args.php'; |
|
10 | 10 | |
11 | 11 | $args = argParser::getArgs(); |
12 | -$baseurl = 'http://' . $args['HTTPSERVER'] . str_replace('/server.php', '/legacy.php', $args['HTTPURI']); |
|
12 | +$baseurl = 'http://'.$args['HTTPSERVER'].str_replace('/server.php', '/legacy.php', $args['HTTPURI']); |
|
13 | 13 | |
14 | 14 | $randId = uniqid(); |
15 | -file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', $randId); |
|
15 | +file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', $randId); |
|
16 | 16 | |
17 | 17 | $client = new xmlrpc_client($baseurl); |
18 | 18 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', $randId); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $req = new xmlrpcmsg('system.listMethods', array()); |
21 | 21 | $resp = $client->send($req); |
22 | 22 | if ($resp->faultCode() !== 0) { |
23 | - throw new \Exception("system.listMethods returned fault " . $resp->faultCode()); |
|
23 | + throw new \Exception("system.listMethods returned fault ".$resp->faultCode()); |
|
24 | 24 | } |
25 | 25 | |
26 | -unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt'); |
|
26 | +unlink(sys_get_temp_dir().'/phpunit_rand_id.txt'); |