@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
5 | 5 | |
6 | -include_once __DIR__ . '/parse_args.php'; |
|
6 | +include_once __DIR__.'/parse_args.php'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
9 | 9 | |
10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | public function testI8() |
105 | 105 | { |
106 | - if (PHP_INT_SIZE == 4 ) { |
|
106 | + if (PHP_INT_SIZE == 4) { |
|
107 | 107 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
108 | 108 | return; |
109 | 109 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | public function testUnicodeInMemberName() |
135 | 135 | { |
136 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
136 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
137 | 137 | $v = array($str => new xmlrpcval(1)); |
138 | 138 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
139 | 139 | $r = $r->serialize(); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | '<?xml version="1.0"?> |
150 | 150 | <!-- $Id --> |
151 | 151 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
152 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
152 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
153 | 153 | <methodResponse> |
154 | 154 | <fault> |
155 | 155 | <value> |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | </member> |
161 | 161 | <member> |
162 | 162 | <name>faultString</name> |
163 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
163 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
164 | 164 | </member> |
165 | 165 | </struct> |
166 | 166 | </value> |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $m = $this->newMsg('dummy'); |
170 | 170 | $r = $m->parseResponse($response); |
171 | 171 | $v = $r->faultString(); |
172 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
172 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | public function testBrokenRequests() |
@@ -409,11 +409,11 @@ discard block |
||
409 | 409 | |
410 | 410 | public function testUTF8Response() |
411 | 411 | { |
412 | - $string = chr(224) . chr(252) . chr(232); |
|
412 | + $string = chr(224).chr(252).chr(232); |
|
413 | 413 | |
414 | 414 | $s = $this->newMsg('dummy'); |
415 | - $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> |
|
416 | -<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> |
|
415 | + $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> |
|
416 | +<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> |
|
417 | 417 | '; |
418 | 418 | $r = $s->parseResponse($f, false, 'phpvals'); |
419 | 419 | $v = $r->value(); |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | $this->assertEquals($string, $v); |
422 | 422 | |
423 | 423 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
424 | -<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> |
|
424 | +<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> |
|
425 | 425 | '; |
426 | 426 | $r = $s->parseResponse($f, false, 'phpvals'); |
427 | 427 | $v = $r->value(); |
@@ -437,11 +437,11 @@ discard block |
||
437 | 437 | |
438 | 438 | public function testLatin1Response() |
439 | 439 | { |
440 | - $string = chr(224) . chr(252) . chr(232); |
|
440 | + $string = chr(224).chr(252).chr(232); |
|
441 | 441 | |
442 | 442 | $s = $this->newMsg('dummy'); |
443 | - $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> |
|
444 | -<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> |
|
443 | + $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> |
|
444 | +<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> |
|
445 | 445 | '; |
446 | 446 | $r = $s->parseResponse($f, false, 'phpvals'); |
447 | 447 | $v = $r->value(); |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | $this->assertEquals($string, $v); |
450 | 450 | |
451 | 451 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
452 | -<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> |
|
452 | +<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> |
|
453 | 453 | '; |
454 | 454 | $r = $s->parseResponse($f, false, 'phpvals'); |
455 | 455 | $v = $r->value(); |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -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. |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | ); |
28 | 28 | |
29 | 29 | $methods = array(); |
30 | - foreach(get_class_methods('ServerTest') as $method) |
|
30 | + foreach (get_class_methods('ServerTest') as $method) |
|
31 | 31 | { |
32 | 32 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
33 | 33 | { |
@@ -201,8 +201,7 @@ discard block |
||
201 | 201 | { |
202 | 202 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
203 | 203 | return; |
204 | - } |
|
205 | - else if ($this->args['PROXYSERVER'] == '') |
|
204 | + } else if ($this->args['PROXYSERVER'] == '') |
|
206 | 205 | { |
207 | 206 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
208 | 207 | return; |
@@ -226,8 +225,7 @@ discard block |
||
226 | 225 | { |
227 | 226 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
228 | 227 | return; |
229 | - } |
|
230 | - else if ($this->args['HTTPSSERVER'] == '') |
|
228 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
231 | 229 | { |
232 | 230 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
233 | 231 | return; |
@@ -278,13 +276,11 @@ discard block |
||
278 | 276 | { |
279 | 277 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
280 | 278 | return; |
281 | - } |
|
282 | - else if ($this->args['PROXYSERVER'] == '') |
|
279 | + } else if ($this->args['PROXYSERVER'] == '') |
|
283 | 280 | { |
284 | 281 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
285 | 282 | return; |
286 | - } |
|
287 | - else if ($this->args['HTTPSSERVER'] == '') |
|
283 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
288 | 284 | { |
289 | 285 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
290 | 286 | return; |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
5 | 5 | |
6 | -include_once __DIR__ . '/parse_args.php'; |
|
6 | +include_once __DIR__.'/parse_args.php'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
9 | 9 | |
10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
11 | 11 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $this->assertequals(1, count($v1)); |
129 | 129 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
130 | 130 | |
131 | - foreach($v1 as $key => $val) |
|
131 | + foreach ($v1 as $key => $val) |
|
132 | 132 | { |
133 | 133 | $this->assertArrayHasKey($key, $out); |
134 | 134 | $expected = $out[$key]; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $this->assertequals(2, count($v2)); |
144 | 144 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
145 | 145 | $i = 0; |
146 | - foreach($v2 as $key => $val) |
|
146 | + foreach ($v2 as $key => $val) |
|
147 | 147 | { |
148 | 148 | $expected = $out[$i]; |
149 | 149 | $this->assertequals($expected['key'], $key); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | { |
158 | 158 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
159 | 159 | $data = array(); |
160 | - for ($i = 0; $i < 500000; $i++ ) { |
|
160 | + for ($i = 0; $i<500000; $i++) { |
|
161 | 161 | $data[] = 'hello world'; |
162 | 162 | } |
163 | 163 |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | // test for php version |
18 | 18 | $ver = phpversion(); |
19 | 19 | $tests['php_version'] = array(); |
20 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
21 | - if (version_compare($ver, '5.3.0') < 0) { |
|
20 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
21 | + if (version_compare($ver, '5.3.0')<0) { |
|
22 | 22 | $tests['php_version']['status'] = 0; |
23 | 23 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later'; |
24 | 24 | } else { |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | // test for php version |
52 | 52 | $ver = phpversion(); |
53 | 53 | $tests['php_version'] = array(); |
54 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
55 | - if (version_compare($ver, '5.3.0') < 0) { |
|
54 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
55 | + if (version_compare($ver, '5.3.0')<0) { |
|
56 | 56 | $tests['php_version']['status'] = 0; |
57 | 57 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later'; |
58 | 58 | } else { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $info = curl_version(); |
80 | 80 | $tests['curl']['status'] = 2; |
81 | 81 | $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols"; |
82 | - if (version_compare($ver, '4.3.8') < 0) { |
|
82 | + if (version_compare($ver, '4.3.8')<0) { |
|
83 | 83 | $tests['curl']['status'] = 1; |
84 | 84 | $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives"; |
85 | 85 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | <?php |
168 | 168 | $res = phpxmlrpc_verify_compat('server'); |
169 | 169 | foreach ($res as $test => $result) { |
170 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
170 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
171 | 171 | } |
172 | 172 | ?> |
173 | 173 | </tbody> |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | <?php |
185 | 185 | $res = phpxmlrpc_verify_compat('client'); |
186 | 186 | foreach ($res as $test => $result) { |
187 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
187 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
188 | 188 | } |
189 | 189 | ?> |
190 | 190 | </tbody> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for php files in the 'demo' directory |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | { |
12 | 12 | $this->args = argParser::getArgs(); |
13 | 13 | |
14 | - $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/demo/', $this->args['HTTPURI'] ); |
|
14 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/demo/', $this->args['HTTPURI']); |
|
15 | 15 | |
16 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
|
16 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function testAgeSort() |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | class DebuggerTest extends PhpXmlRpc_WebTestCase |
6 | 6 | { |
@@ -8,9 +8,9 @@ discard block |
||
8 | 8 | { |
9 | 9 | $this->args = argParser::getArgs(); |
10 | 10 | |
11 | - $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['HTTPURI'] ); |
|
11 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['HTTPURI']); |
|
12 | 12 | |
13 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
|
13 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function testIndex() |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/WebTestCase.php'; |
|
3 | +include_once __DIR__.'/WebTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for php files in the 'extras' directory |
@@ -12,9 +12,9 @@ discard block |
||
12 | 12 | { |
13 | 13 | $this->args = argParser::getArgs(); |
14 | 14 | |
15 | - $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/extras/', $this->args['HTTPURI'] ); |
|
15 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/extras/', $this->args['HTTPURI']); |
|
16 | 16 | |
17 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
|
17 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/parse_args.php'; |
|
3 | +include_once __DIR__.'/parse_args.php'; |
|
4 | 4 | |
5 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
5 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
6 | 6 | |
7 | 7 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
8 | 8 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public function _run($result = NULL) |
27 | 27 | { |
28 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
28 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
29 | 29 | |
30 | 30 | if ($result === NULL) { |
31 | 31 | $result = $this->createResult(); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
62 | 62 | { |
63 | - $url = $this->baseUrl . $path; |
|
63 | + $url = $this->baseUrl.$path; |
|
64 | 64 | |
65 | 65 | $ch = curl_init($url); |
66 | 66 | curl_setopt_array($ch, array( |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
80 | 80 | } |
81 | - if ($this->args['DEBUG'] > 0) { |
|
81 | + if ($this->args['DEBUG']>0) { |
|
82 | 82 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
83 | 83 | } |
84 | 84 | $page = curl_exec($ch); |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | use PhpXmlRpc\Encoder; |
21 | 21 | |
22 | 22 | /// @todo allow autoloading when the library is installed as dependency |
23 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
23 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
24 | 24 | |
25 | -include __DIR__ . '/../tests/parse_args.php'; |
|
25 | +include __DIR__.'/../tests/parse_args.php'; |
|
26 | 26 | $args = argParser::getArgs(); |
27 | 27 | |
28 | 28 | function begin_test($test_name, $test_case) |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | if (!isset($test_results[$test_name][$test_case])) { |
43 | 43 | trigger_error('ending test that was not started'); |
44 | 44 | } |
45 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
45 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
46 | 46 | $test_results[$test_name][$test_case]['result'] = $test_result; |
47 | 47 | echo '.'; |
48 | 48 | flush(); |
@@ -76,24 +76,24 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | if ($is_web) { |
79 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
79 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
80 | 80 | if ($xd) { |
81 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
81 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
82 | 82 | } |
83 | 83 | flush(); |
84 | 84 | ob_flush(); |
85 | 85 | } else { |
86 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
86 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
87 | 87 | if ($xd) { |
88 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
88 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | 92 | // test 'manual style' data encoding vs. 'automatic style' encoding |
93 | 93 | begin_test('Data encoding (large array)', 'manual encoding'); |
94 | -for ($i = 0; $i < $num_tests; $i++) { |
|
94 | +for ($i = 0; $i<$num_tests; $i++) { |
|
95 | 95 | $vals = array(); |
96 | - for ($j = 0; $j < 10; $j++) { |
|
96 | + for ($j = 0; $j<10; $j++) { |
|
97 | 97 | $valarray = array(); |
98 | 98 | foreach ($data[$j] as $key => $val) { |
99 | 99 | $values = array(); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | begin_test('Data encoding (large array)', 'automatic encoding'); |
120 | 120 | $encoder = new Encoder(); |
121 | -for ($i = 0; $i < $num_tests; $i++) { |
|
121 | +for ($i = 0; $i<$num_tests; $i++) { |
|
122 | 122 | $value = $encoder->encode($data, array('auto_dates')); |
123 | 123 | $out = $value->serialize(); |
124 | 124 | } |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | |
127 | 127 | if (function_exists('xmlrpc_set_type')) { |
128 | 128 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
129 | - for ($i = 0; $i < $num_tests; $i++) { |
|
130 | - for ($j = 0; $j < 10; $j++) { |
|
129 | + for ($i = 0; $i<$num_tests; $i++) { |
|
130 | + for ($j = 0; $j<10; $j++) { |
|
131 | 131 | foreach ($keys as $k) { |
132 | 132 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
133 | 133 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -141,18 +141,18 @@ discard block |
||
141 | 141 | // test 'old style' data decoding vs. 'automatic style' decoding |
142 | 142 | $dummy = new Request(''); |
143 | 143 | $out = new Response($value); |
144 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
144 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
145 | 145 | |
146 | 146 | begin_test('Data decoding (large array)', 'manual decoding'); |
147 | -for ($i = 0; $i < $num_tests; $i++) { |
|
147 | +for ($i = 0; $i<$num_tests; $i++) { |
|
148 | 148 | $response = $dummy->ParseResponse($in, true); |
149 | 149 | $value = $response->value(); |
150 | 150 | $result = array(); |
151 | - foreach($value as $val1) { |
|
151 | + foreach ($value as $val1) { |
|
152 | 152 | $out = array(); |
153 | - foreach($val1 as $name => $val) { |
|
153 | + foreach ($val1 as $name => $val) { |
|
154 | 154 | $out[$name] = array(); |
155 | - foreach($val as $data) { |
|
155 | + foreach ($val as $data) { |
|
156 | 156 | $out[$name][] = $data->scalarval(); |
157 | 157 | } |
158 | 158 | } |
@@ -162,18 +162,18 @@ discard block |
||
162 | 162 | end_test('Data decoding (large array)', 'manual decoding', $result); |
163 | 163 | |
164 | 164 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
165 | -for ($i = 0; $i < $num_tests; $i++) { |
|
165 | +for ($i = 0; $i<$num_tests; $i++) { |
|
166 | 166 | $response = $dummy->ParseResponse($in, true); |
167 | 167 | $value = $response->value(); |
168 | 168 | $result = array(); |
169 | 169 | $l = $value->arraysize(); |
170 | - for ($k = 0; $k < $l; $k++) { |
|
170 | + for ($k = 0; $k<$l; $k++) { |
|
171 | 171 | $val1 = $value->arraymem($k); |
172 | 172 | $out = array(); |
173 | - foreach($val1 as $name => $val) { |
|
173 | + foreach ($val1 as $name => $val) { |
|
174 | 174 | $out[$name] = array(); |
175 | 175 | $m = $val->arraysize(); |
176 | - for ($j = 0; $j < $m; $j++) { |
|
176 | + for ($j = 0; $j<$m; $j++) { |
|
177 | 177 | $data = $val->arraymem($j); |
178 | 178 | $out[$name][] = $data->scalarval(); |
179 | 179 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
185 | 185 | |
186 | 186 | begin_test('Data decoding (large array)', 'automatic decoding'); |
187 | -for ($i = 0; $i < $num_tests; $i++) { |
|
187 | +for ($i = 0; $i<$num_tests; $i++) { |
|
188 | 188 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
189 | 189 | $value = $response->value(); |
190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | if (function_exists('xmlrpc_decode')) { |
194 | 194 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
195 | - for ($i = 0; $i < $num_tests; $i++) { |
|
195 | + for ($i = 0; $i<$num_tests; $i++) { |
|
196 | 196 | $response = $dummy->ParseResponse($in, true, 'xml'); |
197 | 197 | $value = xmlrpc_decode($response->value()); |
198 | 198 | } |
@@ -208,15 +208,15 @@ 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 | $server = explode(':', $args['HTTPSERVER']); |
215 | - if (count($server) > 1) { |
|
216 | - $srv = $server[1] . '://' . $server[0] . $args['HTTPURI']; |
|
215 | + if (count($server)>1) { |
|
216 | + $srv = $server[1].'://'.$server[0].$args['HTTPURI']; |
|
217 | 217 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
218 | 218 | } else { |
219 | - $srv = $args['HTTPSERVER'] . $args['HTTPURI']; |
|
219 | + $srv = $args['HTTPSERVER'].$args['HTTPURI']; |
|
220 | 220 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
221 | 221 | } |
222 | 222 | // do not interfere with http compression |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | } |
231 | 231 | begin_test($testName, 'http 10'); |
232 | 232 | $response = array(); |
233 | - for ($i = 0; $i < $num_tests; $i++) { |
|
233 | + for ($i = 0; $i<$num_tests; $i++) { |
|
234 | 234 | $resp = $c->send($req); |
235 | 235 | $response[] = $resp->value(); |
236 | 236 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | if (function_exists('curl_init')) { |
240 | 240 | begin_test($testName, 'http 11 w. keep-alive'); |
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 | } |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | $c->keepalive = false; |
249 | 249 | begin_test($testName, 'http 11'); |
250 | 250 | $response = array(); |
251 | - for ($i = 0; $i < $num_tests; $i++) { |
|
251 | + for ($i = 0; $i<$num_tests; $i++) { |
|
252 | 252 | $resp = $c->send($req, 10, 'http11'); |
253 | 253 | $response[] = $resp->value(); |
254 | 254 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | |
269 | 269 | begin_test($testName, 'http 10 w. compression'); |
270 | 270 | $response = array(); |
271 | - for ($i = 0; $i < $num_tests; $i++) { |
|
271 | + for ($i = 0; $i<$num_tests; $i++) { |
|
272 | 272 | $resp = $c->send($req); |
273 | 273 | $response[] = $resp->value(); |
274 | 274 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | if (function_exists('curl_init')) { |
278 | 278 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
279 | 279 | $response = array(); |
280 | - for ($i = 0; $i < $num_tests; $i++) { |
|
280 | + for ($i = 0; $i<$num_tests; $i++) { |
|
281 | 281 | $resp = $c->send($req, 10, 'http11'); |
282 | 282 | $response[] = $resp->value(); |
283 | 283 | } |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | $c->keepalive = false; |
287 | 287 | begin_test($testName, 'http 11 w. compression'); |
288 | 288 | $response = array(); |
289 | - for ($i = 0; $i < $num_tests; $i++) { |
|
289 | + for ($i = 0; $i<$num_tests; $i++) { |
|
290 | 290 | $resp = $c->send($req, 10, 'http11'); |
291 | 291 | $response[] = $resp->value(); |
292 | 292 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | foreach ($test_results as $test => $results) { |
308 | 308 | echo "\nTEST: $test\n"; |
309 | 309 | foreach ($results as $case => $data) { |
310 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
310 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
311 | 311 | } |
312 | 312 | } |
313 | 313 |