@@ -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 | } |
@@ -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 | |
@@ -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 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/5ServerTest.php'; |
|
| 8 | +include_once __DIR__.'/5ServerTest.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests which stress http features of the library. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | $methods = array(); |
| 33 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 33 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 34 | 34 | { |
| 35 | 35 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
| 36 | 36 | { |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
| 272 | 272 | $ubuntuVersion = @$matches[1]; |
| 273 | 273 | } |
| 274 | - if ($ubuntuVersion >= 20) { |
|
| 274 | + if ($ubuntuVersion>=20) { |
|
| 275 | 275 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
| 276 | 276 | return; |
| 277 | 277 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function echoInput() |
| 56 | 56 | { |
| 57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
| 57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
| 58 | 58 | print $r->serialize(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function __get($name) |
| 67 | 67 | { |
| 68 | - switch($name) { |
|
| 68 | + switch ($name) { |
|
| 69 | 69 | case 'dmap': |
| 70 | 70 | return $this->dmap; |
| 71 | 71 | default: |
| 72 | 72 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 73 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . |
|
| 73 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '. |
|
| 74 | 74 | $trace[0]['line'], E_USER_NOTICE); |
| 75 | 75 | return null; |
| 76 | 76 | } |
@@ -97,30 +97,30 @@ discard block |
||
| 97 | 97 | Server::xmlrpc_debugmsg($m); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
| 100 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
| 101 | 101 | { |
| 102 | 102 | return Server::_xmlrpcs_getCapabilities($server, $m); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
| 108 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
| 105 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
| 108 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
| 109 | 109 | { |
| 110 | 110 | return Server::_xmlrpcs_listMethods($server, $m); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 113 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 116 | 116 | function _xmlrpcs_methodSignature($server, $m) |
| 117 | 117 | { |
| 118 | 118 | return Server::_xmlrpcs_methodSignature($server, $m); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
| 121 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
| 124 | 124 | function _xmlrpcs_methodHelp($server, $m) |
| 125 | 125 | { |
| 126 | 126 | return Server::_xmlrpcs_methodHelp($server, $m); |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | * @param array $extraOptions |
| 42 | 42 | * @return array|false |
| 43 | 43 | */ |
| 44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
| 44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
| 45 | 45 | { |
| 46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 47 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 47 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 48 | 48 | // backwards compat: return string instead of callable |
| 49 | 49 | $extraOptions['return_source'] = true; |
| 50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); |
@@ -64,17 +64,17 @@ discard block |
||
| 64 | 64 | * @param array $extraOptions |
| 65 | 65 | * @return array|false |
| 66 | 66 | */ |
| 67 | -function wrap_php_class($className, $extraOptions=array()) |
|
| 67 | +function wrap_php_class($className, $extraOptions = array()) |
|
| 68 | 68 | { |
| 69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 70 | 70 | $fix = false; |
| 71 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 71 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 72 | 72 | // backwards compat: return string instead of callable |
| 73 | 73 | $extraOptions['return_source'] = true; |
| 74 | 74 | $fix = true; |
| 75 | 75 | } |
| 76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
| 77 | - foreach($wrapped as $name => $value) { |
|
| 77 | + foreach ($wrapped as $name => $value) { |
|
| 78 | 78 | if ($fix) { |
| 79 | 79 | eval($value['source']); |
| 80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
| 94 | 94 | * @return array|callable|false |
| 95 | 95 | */ |
| 96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
| 96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
| 97 | 97 | { |
| 98 | 98 | if (!is_array($extraOptions)) |
| 99 | 99 | { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 110 | 110 | |
| 111 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 111 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
| 112 | 112 | // backwards compat: return string instead of callable |
| 113 | 113 | $extraOptions['return_source'] = true; |
| 114 | 114 | $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param array $extraOptions |
| 129 | 129 | * @return mixed |
| 130 | 130 | */ |
| 131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
| 131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
| 132 | 132 | { |
| 133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
| 149 | 149 | { |
| 150 | 150 | $code = "function $xmlrpcFuncName ("; |
| 151 | - if ($clientCopyMode < 2) { |
|
| 151 | + if ($clientCopyMode<2) { |
|
| 152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
| 153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
| 154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | if ($mDesc != '') { |
| 164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
| 165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 166 | 166 | } else { |
| 167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
| 168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 172 | 172 | $plist = array(); |
| 173 | 173 | $pCount = count($mSig); |
| 174 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 174 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 175 | 175 | $plist[] = "\$p$i"; |
| 176 | 176 | $pType = $mSig[$i]; |
| 177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
| 190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
| 191 | 191 | } |
| 192 | - if ($clientCopyMode < 2) { |
|
| 192 | + if ($clientCopyMode<2) { |
|
| 193 | 193 | $plist[] = '$debug=0'; |
| 194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 195 | 195 | } |
| 196 | 196 | $plist = implode(', ', $plist); |
| 197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 198 | 198 | |
| 199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 200 | 200 | if ($decodeFault) { |
| 201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 203 | 203 | } else { |
| 204 | 204 | $respCode = var_export($faultResponse, true); |
| 205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 216 | 216 | |
| 217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
| 218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * @deprecated |
| 222 | 222 | */ |
| 223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
| 223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
| 224 | 224 | { |
| 225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
| 226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 227 | 227 | |
| 228 | 228 | // copy all client fields to the client that will be generated runtime |
| 229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -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(); |
@@ -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 |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 18 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $targetFile = null; |
@@ -38,5 +38,5 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 41 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 41 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 42 | 42 | } |