@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->me['struct'] = $val; |
84 | 84 | break; |
85 | 85 | default: |
86 | - error_log("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
86 | + error_log("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | if ($typeOf !== 1) { |
111 | - error_log("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
111 | + error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
112 | 112 | return 0; |
113 | 113 | } |
114 | 114 | |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | |
126 | 126 | switch ($this->mytype) { |
127 | 127 | case 1: |
128 | - error_log('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
128 | + error_log('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
129 | 129 | return 0; |
130 | 130 | case 3: |
131 | - error_log('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
131 | + error_log('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
132 | 132 | return 0; |
133 | 133 | case 2: |
134 | 134 | // we're adding a scalar value to an array here |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | |
171 | 171 | return 1; |
172 | 172 | } else { |
173 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
173 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
174 | 174 | return 0; |
175 | 175 | } |
176 | 176 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | |
202 | 202 | return 1; |
203 | 203 | } else { |
204 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
204 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
205 | 205 | return 0; |
206 | 206 | } |
207 | 207 | } |
@@ -240,20 +240,20 @@ discard block |
||
240 | 240 | case 1: |
241 | 241 | switch ($typ) { |
242 | 242 | case static::$xmlrpcBase64: |
243 | - $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>"; |
|
243 | + $rs .= "<${typ}>".base64_encode($val)."</${typ}>"; |
|
244 | 244 | break; |
245 | 245 | case static::$xmlrpcBoolean: |
246 | - $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>"; |
|
246 | + $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>"; |
|
247 | 247 | break; |
248 | 248 | case static::$xmlrpcString: |
249 | 249 | // G. Giunta 2005/2/13: do NOT use htmlentities, since |
250 | 250 | // it will produce named html entities, which are invalid xml |
251 | - $rs .= "<${typ}>" . Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>"; |
|
251 | + $rs .= "<${typ}>".Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>"; |
|
252 | 252 | break; |
253 | 253 | case static::$xmlrpcInt: |
254 | 254 | case static::$xmlrpcI4: |
255 | 255 | case static::$xmlrpcI8: |
256 | - $rs .= "<${typ}>" . (int)$val . "</${typ}>"; |
|
256 | + $rs .= "<${typ}>".(int) $val."</${typ}>"; |
|
257 | 257 | break; |
258 | 258 | case static::$xmlrpcDouble: |
259 | 259 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -261,15 +261,15 @@ discard block |
||
261 | 261 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
262 | 262 | // The code below tries its best at keeping max precision while avoiding exp notation, |
263 | 263 | // but there is of course no limit in the number of decimal places to be used... |
264 | - $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, 128, '.', '')) . "</${typ}>"; |
|
264 | + $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>"; |
|
265 | 265 | break; |
266 | 266 | case static::$xmlrpcDateTime: |
267 | 267 | if (is_string($val)) { |
268 | 268 | $rs .= "<${typ}>${val}</${typ}>"; |
269 | 269 | } elseif (is_a($val, 'DateTime')) { |
270 | - $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>"; |
|
270 | + $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>"; |
|
271 | 271 | } elseif (is_int($val)) { |
272 | - $rs .= "<${typ}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>"; |
|
272 | + $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>"; |
|
273 | 273 | } else { |
274 | 274 | // not really a good idea here: but what shall we output anyway? left for backward compat... |
275 | 275 | $rs .= "<${typ}>${val}</${typ}>"; |
@@ -291,14 +291,14 @@ discard block |
||
291 | 291 | case 3: |
292 | 292 | // struct |
293 | 293 | if ($this->_php_class) { |
294 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
294 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
295 | 295 | } else { |
296 | 296 | $rs .= "<struct>\n"; |
297 | 297 | } |
298 | 298 | $charsetEncoder = Charset::instance(); |
299 | 299 | /** @var Value $val2 */ |
300 | 300 | foreach ($val as $key2 => $val2) { |
301 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
301 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
302 | 302 | //$rs.=$this->serializeval($val2); |
303 | 303 | $rs .= $val2->serialize($charsetEncoding); |
304 | 304 | $rs .= "</member>\n"; |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | $val = reset($this->me); |
335 | 335 | $typ = key($this->me); |
336 | 336 | |
337 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
337 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | /** |
@@ -6,20 +6,20 @@ discard block |
||
6 | 6 | <h3>The code demonstrates usage of multicall and introspection methods</h3> |
7 | 7 | <?php |
8 | 8 | |
9 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
9 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
10 | 10 | PhpXmlRpc\Autoloader::register(); |
11 | 11 | |
12 | 12 | function display_error($r) |
13 | 13 | { |
14 | 14 | print "An error occurred: "; |
15 | - print "Code: " . $r->faultCode() |
|
16 | - . " Reason: '" . $r->faultString() . "'<br/>"; |
|
15 | + print "Code: ".$r->faultCode() |
|
16 | + . " Reason: '".$r->faultString()."'<br/>"; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | $client = new PhpXmlRpc\Client("http://phpxmlrpc.sourceforge.net/server.php"); |
20 | 20 | |
21 | 21 | // First off, let's retrieve the list of methods available on the remote server |
22 | -print "<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"; |
|
22 | +print "<h3>methods available at http://".$client->server.$client->path."</h3>\n"; |
|
23 | 23 | $req = new PhpXmlRpc\Request('system.listMethods'); |
24 | 24 | $resp = $client->send($req); |
25 | 25 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | // Then, retrieve the signature and help text of each available method |
32 | 32 | foreach ($v as $methodName) { |
33 | - print "<h4>" . $methodName->scalarval() . "</h4>\n"; |
|
33 | + print "<h4>".$methodName->scalarval()."</h4>\n"; |
|
34 | 34 | // build messages first, add params later |
35 | 35 | $m1 = new PhpXmlRpc\Request('system.methodHelp'); |
36 | 36 | $m2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | if ($val->kindOf() == "array") { |
62 | 62 | foreach ($val as $x) { |
63 | 63 | $ret = $x[0]; |
64 | - print "<code>" . htmlspecialchars($ret->scalarval()) . " " |
|
65 | - . htmlspecialchars($methodName->scalarval()) . "("; |
|
66 | - if ($x->count() > 1) { |
|
67 | - for ($k = 1; $k < $x->count(); $k++) { |
|
64 | + print "<code>".htmlspecialchars($ret->scalarval())." " |
|
65 | + . htmlspecialchars($methodName->scalarval())."("; |
|
66 | + if ($x->count()>1) { |
|
67 | + for ($k = 1; $k<$x->count(); $k++) { |
|
68 | 68 | $y = $x[$k]; |
69 | 69 | print htmlspecialchars($y->scalarval()); |
70 | - if ($k < $x->count() - 1) { |
|
70 | + if ($k<$x->count()-1) { |
|
71 | 71 | print ", "; |
72 | 72 | } |
73 | 73 | } |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | use PhpXmlRpc\Response; |
18 | 18 | use PhpXmlRpc\Encoder; |
19 | 19 | |
20 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
20 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
21 | 21 | |
22 | -include __DIR__ . '/parse_args.php'; |
|
22 | +include __DIR__.'/parse_args.php'; |
|
23 | 23 | $args = argParser::getArgs(); |
24 | 24 | |
25 | 25 | function begin_test($test_name, $test_case) |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | if (!isset($test_results[$test_name][$test_case])) { |
40 | 40 | trigger_error('ending test that was not started'); |
41 | 41 | } |
42 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
42 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
43 | 43 | $test_results[$test_name][$test_case]['result'] = $test_result; |
44 | 44 | echo '.'; |
45 | 45 | flush(); |
@@ -73,24 +73,24 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | if ($is_web) { |
76 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
76 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
77 | 77 | if ($xd) { |
78 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
78 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
79 | 79 | } |
80 | 80 | flush(); |
81 | 81 | ob_flush(); |
82 | 82 | } else { |
83 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
83 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
84 | 84 | if ($xd) { |
85 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
85 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | |
89 | 89 | // test 'manual style' data encoding vs. 'automatic style' encoding |
90 | 90 | begin_test('Data encoding (large array)', 'manual encoding'); |
91 | -for ($i = 0; $i < $num_tests; $i++) { |
|
91 | +for ($i = 0; $i<$num_tests; $i++) { |
|
92 | 92 | $vals = array(); |
93 | - for ($j = 0; $j < 10; $j++) { |
|
93 | + for ($j = 0; $j<10; $j++) { |
|
94 | 94 | $valarray = array(); |
95 | 95 | foreach ($data[$j] as $key => $val) { |
96 | 96 | $values = array(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | begin_test('Data encoding (large array)', 'automatic encoding'); |
117 | 117 | $encoder = new Encoder(); |
118 | -for ($i = 0; $i < $num_tests; $i++) { |
|
118 | +for ($i = 0; $i<$num_tests; $i++) { |
|
119 | 119 | $value = $encoder->encode($data, array('auto_dates')); |
120 | 120 | $out = $value->serialize(); |
121 | 121 | } |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | |
124 | 124 | if (function_exists('xmlrpc_set_type')) { |
125 | 125 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
126 | - for ($i = 0; $i < $num_tests; $i++) { |
|
127 | - for ($j = 0; $j < 10; $j++) { |
|
126 | + for ($i = 0; $i<$num_tests; $i++) { |
|
127 | + for ($j = 0; $j<10; $j++) { |
|
128 | 128 | foreach ($keys as $k) { |
129 | 129 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
130 | 130 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -138,18 +138,18 @@ discard block |
||
138 | 138 | // test 'old style' data decoding vs. 'automatic style' decoding |
139 | 139 | $dummy = new Request(''); |
140 | 140 | $out = new Response($value); |
141 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
141 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
142 | 142 | |
143 | 143 | begin_test('Data decoding (large array)', 'manual decoding'); |
144 | -for ($i = 0; $i < $num_tests; $i++) { |
|
144 | +for ($i = 0; $i<$num_tests; $i++) { |
|
145 | 145 | $response = $dummy->ParseResponse($in, true); |
146 | 146 | $value = $response->value(); |
147 | 147 | $result = array(); |
148 | - foreach($value as $val1) { |
|
148 | + foreach ($value as $val1) { |
|
149 | 149 | $out = array(); |
150 | - foreach($val1 as $name => $val) { |
|
150 | + foreach ($val1 as $name => $val) { |
|
151 | 151 | $out[$name] = array(); |
152 | - foreach($val as $data) { |
|
152 | + foreach ($val as $data) { |
|
153 | 153 | $out[$name][] = $data->scalarval(); |
154 | 154 | } |
155 | 155 | } |
@@ -159,18 +159,18 @@ discard block |
||
159 | 159 | end_test('Data decoding (large array)', 'manual decoding', $result); |
160 | 160 | |
161 | 161 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
162 | -for ($i = 0; $i < $num_tests; $i++) { |
|
162 | +for ($i = 0; $i<$num_tests; $i++) { |
|
163 | 163 | $response = $dummy->ParseResponse($in, true); |
164 | 164 | $value = $response->value(); |
165 | 165 | $result = array(); |
166 | 166 | $l = $value->arraysize(); |
167 | - for ($k = 0; $k < $l; $k++) { |
|
167 | + for ($k = 0; $k<$l; $k++) { |
|
168 | 168 | $val1 = $value->arraymem($k); |
169 | 169 | $out = array(); |
170 | - foreach($val1 as $name => $val) { |
|
170 | + foreach ($val1 as $name => $val) { |
|
171 | 171 | $out[$name] = array(); |
172 | 172 | $m = $val->arraysize(); |
173 | - for ($j = 0; $j < $m; $j++) { |
|
173 | + for ($j = 0; $j<$m; $j++) { |
|
174 | 174 | $data = $val->arraymem($j); |
175 | 175 | $out[$name][] = $data->scalarval(); |
176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
182 | 182 | |
183 | 183 | begin_test('Data decoding (large array)', 'automatic decoding'); |
184 | -for ($i = 0; $i < $num_tests; $i++) { |
|
184 | +for ($i = 0; $i<$num_tests; $i++) { |
|
185 | 185 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
186 | 186 | $value = $response->value(); |
187 | 187 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | if (function_exists('xmlrpc_decode')) { |
191 | 191 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
192 | - for ($i = 0; $i < $num_tests; $i++) { |
|
192 | + for ($i = 0; $i<$num_tests; $i++) { |
|
193 | 193 | $response = $dummy->ParseResponse($in, true, 'xml'); |
194 | 194 | $value = xmlrpc_decode($response->value()); |
195 | 195 | } |
@@ -203,15 +203,15 @@ discard block |
||
203 | 203 | $value = $encoder->encode($data1, array('auto_dates')); |
204 | 204 | $req = new Request('interopEchoTests.echoValue', array($value)); |
205 | 205 | $reqs = array(); |
206 | - for ($i = 0; $i < 25; $i++) { |
|
206 | + for ($i = 0; $i<25; $i++) { |
|
207 | 207 | $reqs[] = $req; |
208 | 208 | } |
209 | 209 | $server = explode(':', $args['LOCALSERVER']); |
210 | - if (count($server) > 1) { |
|
211 | - $srv = $server[1] . '://' . $server[0] . $args['URI']; |
|
210 | + if (count($server)>1) { |
|
211 | + $srv = $server[1].'://'.$server[0].$args['URI']; |
|
212 | 212 | $c = new Client($args['URI'], $server[0], $server[1]); |
213 | 213 | } else { |
214 | - $srv = $args['LOCALSERVER'] . $args['URI']; |
|
214 | + $srv = $args['LOCALSERVER'].$args['URI']; |
|
215 | 215 | $c = new Client($args['URI'], $args['LOCALSERVER']); |
216 | 216 | } |
217 | 217 | // do not interfere with http compression |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | begin_test($testName, 'http 10'); |
227 | 227 | $response = array(); |
228 | - for ($i = 0; $i < 25; $i++) { |
|
228 | + for ($i = 0; $i<25; $i++) { |
|
229 | 229 | $resp = $c->send($req); |
230 | 230 | $response[] = $resp->value(); |
231 | 231 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | if (function_exists('curl_init')) { |
235 | 235 | begin_test($testName, 'http 11 w. keep-alive'); |
236 | 236 | $response = array(); |
237 | - for ($i = 0; $i < 25; $i++) { |
|
237 | + for ($i = 0; $i<25; $i++) { |
|
238 | 238 | $resp = $c->send($req, 10, 'http11'); |
239 | 239 | $response[] = $resp->value(); |
240 | 240 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | $c->keepalive = false; |
244 | 244 | begin_test($testName, 'http 11'); |
245 | 245 | $response = array(); |
246 | - for ($i = 0; $i < 25; $i++) { |
|
246 | + for ($i = 0; $i<25; $i++) { |
|
247 | 247 | $resp = $c->send($req, 10, 'http11'); |
248 | 248 | $response[] = $resp->value(); |
249 | 249 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | begin_test($testName, 'http 10 w. compression'); |
265 | 265 | $response = array(); |
266 | - for ($i = 0; $i < 25; $i++) { |
|
266 | + for ($i = 0; $i<25; $i++) { |
|
267 | 267 | $resp = $c->send($req); |
268 | 268 | $response[] = $resp->value(); |
269 | 269 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | if (function_exists('curl_init')) { |
273 | 273 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
274 | 274 | $response = array(); |
275 | - for ($i = 0; $i < 25; $i++) { |
|
275 | + for ($i = 0; $i<25; $i++) { |
|
276 | 276 | $resp = $c->send($req, 10, 'http11'); |
277 | 277 | $response[] = $resp->value(); |
278 | 278 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | $c->keepalive = false; |
282 | 282 | begin_test($testName, 'http 11 w. compression'); |
283 | 283 | $response = array(); |
284 | - for ($i = 0; $i < 25; $i++) { |
|
284 | + for ($i = 0; $i<25; $i++) { |
|
285 | 285 | $resp = $c->send($req, 10, 'http11'); |
286 | 286 | $response[] = $resp->value(); |
287 | 287 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | foreach ($test_results as $test => $results) { |
303 | 303 | echo "\nTEST: $test\n"; |
304 | 304 | foreach ($results as $case => $data) { |
305 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
305 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
306 | 306 | } |
307 | 307 | } |
308 | 308 |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | /** |
3 | 3 | * NB: do not let your IDE fool you. The correct encoding for this file is NOT UTF8. |
4 | 4 | */ |
5 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
6 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
5 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
6 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/parse_args.php'; |
|
8 | +include_once __DIR__.'/parse_args.php'; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * Tests involving parsing of xml and handling of xmlrpc values |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | public function testUnicodeInMemberName() |
63 | 63 | { |
64 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
64 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
65 | 65 | $v = array($str => new xmlrpcval(1)); |
66 | 66 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
67 | 67 | $r = $r->serialize(); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | <!-- $Id --> |
79 | 79 | <!-- found by G. giunta, covers what happens when lib receives |
80 | 80 | UTF8 chars in response text and comments --> |
81 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
81 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
82 | 82 | <methodResponse> |
83 | 83 | <fault> |
84 | 84 | <value> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | </member> |
90 | 90 | <member> |
91 | 91 | <name>faultString</name> |
92 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
92 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
93 | 93 | </member> |
94 | 94 | </struct> |
95 | 95 | </value> |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $m = $this->newMsg('dummy'); |
99 | 99 | $r = $m->parseResponse($response); |
100 | 100 | $v = $r->faultString(); |
101 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
101 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | public function testValidNumbers() |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | public function testI8() |
161 | 161 | { |
162 | - if (PHP_INT_SIZE == 4 ) { |
|
162 | + if (PHP_INT_SIZE == 4) { |
|
163 | 163 | $this->markTestSkipped('did not find a locale which sets decimal separator to comma'); |
164 | 164 | return; |
165 | 165 | } |
@@ -482,11 +482,11 @@ discard block |
||
482 | 482 | |
483 | 483 | public function testUTF8Response() |
484 | 484 | { |
485 | - $string = chr(224) . chr(252) . chr(232); |
|
485 | + $string = chr(224).chr(252).chr(232); |
|
486 | 486 | |
487 | 487 | $s = $this->newMsg('dummy'); |
488 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
489 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
488 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
489 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
490 | 490 | '; |
491 | 491 | $r = $s->parseResponse($f, false, 'phpvals'); |
492 | 492 | $v = $r->value(); |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | $this->assertEquals($string, $v); |
495 | 495 | |
496 | 496 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
497 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
497 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
498 | 498 | '; |
499 | 499 | $r = $s->parseResponse($f, false, 'phpvals'); |
500 | 500 | $v = $r->value(); |
@@ -509,11 +509,11 @@ discard block |
||
509 | 509 | |
510 | 510 | public function testLatin1Response() |
511 | 511 | { |
512 | - $string = chr(224) . chr(252) . chr(232); |
|
512 | + $string = chr(224).chr(252).chr(232); |
|
513 | 513 | |
514 | 514 | $s = $this->newMsg('dummy'); |
515 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
516 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
515 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
516 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
517 | 517 | '; |
518 | 518 | $r = $s->parseResponse($f, false, 'phpvals'); |
519 | 519 | $v = $r->value(); |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | $this->assertEquals($string, $v); |
522 | 522 | |
523 | 523 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
524 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
524 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
525 | 525 | '; |
526 | 526 | $r = $s->parseResponse($f, false, 'phpvals'); |
527 | 527 | $v = $r->value(); |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | $this->assertequals(1, count($v1)); |
617 | 617 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
618 | 618 | |
619 | - foreach($v1 as $key => $val) |
|
619 | + foreach ($v1 as $key => $val) |
|
620 | 620 | { |
621 | 621 | $this->assertArrayHasKey($key, $out); |
622 | 622 | $expected = $out[$key]; |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | $this->assertequals(2, count($v2)); |
632 | 632 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
633 | 633 | $i = 0; |
634 | - foreach($v2 as $key => $val) |
|
634 | + foreach ($v2 as $key => $val) |
|
635 | 635 | { |
636 | 636 | $expected = $out[$i]; |
637 | 637 | $this->assertequals($expected['key'], $key); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * @param string $message |
29 | 29 | * @param string $encoding |
30 | 30 | */ |
31 | - public function debugMessage($message, $encoding=null) |
|
31 | + public function debugMessage($message, $encoding = null) |
|
32 | 32 | { |
33 | 33 | // US-ASCII is a warning for PHP and a fatal for HHVM |
34 | 34 | if ($encoding == 'US-ASCII') { |
@@ -39,10 +39,10 @@ discard block |
||
39 | 39 | $flags = ENT_COMPAT; |
40 | 40 | // avoid warnings on php < 5.4... |
41 | 41 | if (defined('ENT_HTML401')) { |
42 | - $flags = $flags | ENT_HTML401; |
|
42 | + $flags = $flags | ENT_HTML401; |
|
43 | 43 | } |
44 | 44 | if (defined('ENT_SUBSTITUTE')) { |
45 | - $flags = $flags | ENT_SUBSTITUTE; |
|
45 | + $flags = $flags | ENT_SUBSTITUTE; |
|
46 | 46 | } |
47 | 47 | if ($encoding != null) { |
48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; |