@@ -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,8 +12,8 @@ discard block |
||
12 | 12 | $this->args = argParser::getArgs(); |
13 | 13 | |
14 | 14 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
15 | - $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
16 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
15 | + $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
16 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function testBenchmark() |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * @author JoakimLofgren |
4 | 4 | */ |
5 | 5 | |
6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
7 | 7 | |
8 | 8 | use PhpXmlRpc\Helper\Charset; |
9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | { |
33 | 33 | // construct a latin string with all chars (except control ones) |
34 | 34 | $this->latinString = "\n\r\t"; |
35 | - for($i = 32; $i < 127; $i++) { |
|
35 | + for ($i = 32; $i<127; $i++) { |
|
36 | 36 | $this->latinString .= chr($i); |
37 | 37 | } |
38 | - for($i = 160; $i < 256; $i++) { |
|
38 | + for ($i = 160; $i<256; $i++) { |
|
39 | 39 | $this->latinString .= chr($i); |
40 | 40 | } |
41 | 41 | } |
@@ -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 | /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing. |
104 | 104 | /// We should fix that, then re-enable this test |
105 | 105 | if (version_compare(PHP_VERSION, '5.6.0', '>=')) { |
106 | - $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>'); |
|
106 | + $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>'); |
|
107 | 107 | $this->assertEquals($string, $i->scalarVal()); |
108 | 108 | } |
109 | 109 |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | 4 | |
5 | -include_once __DIR__ . '/parse_args.php'; |
|
5 | +include_once __DIR__.'/parse_args.php'; |
|
6 | 6 | |
7 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
7 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
8 | 8 | |
9 | 9 | use PHPUnit\Runner\BaseTestRunner; |
10 | 10 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $this->client->server .= 'XXX'; |
59 | 59 | $dnsinfo = @dns_get_record($this->client->server); |
60 | 60 | if ($dnsinfo) { |
61 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
61 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
62 | 62 | } else { |
63 | 63 | $r = $this->client->send($m, 5); |
64 | 64 | // make sure there's no freaking catchall DNS in effect |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | // now test a successful connection |
87 | 87 | $server = explode(':', $this->args['HTTPSERVER']); |
88 | - if (count($server) > 1) { |
|
88 | + if (count($server)>1) { |
|
89 | 89 | $this->client->port = $server[1]; |
90 | 90 | } |
91 | 91 | $this->client->server = $server[0]; |
@@ -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__ . '/PolyfillTestCase.php'; |
|
8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
9 | 9 | |
10 | 10 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
11 | 11 | use PHPUnit\Framework\TestResult; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | // (but only if not called from subclass objects / multitests) |
43 | 43 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
44 | 44 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
45 | - for ($i = 0; $i < count($trace); $i++) { |
|
45 | + for ($i = 0; $i<count($trace); $i++) { |
|
46 | 46 | if (strpos($trace[$i]['function'], 'test') === 0) { |
47 | 47 | self::$failed_tests[$trace[$i]['function']] = true; |
48 | 48 | break; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function _run($result = NULL) |
67 | 67 | { |
68 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
68 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
69 | 69 | |
70 | 70 | if ($result === NULL) { |
71 | 71 | $result = $this->createResult(); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $this->args = argParser::getArgs(); |
97 | 97 | |
98 | 98 | $server = explode(':', $this->args['HTTPSERVER']); |
99 | - if (count($server) > 1) { |
|
99 | + if (count($server)>1) { |
|
100 | 100 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
101 | 101 | } else { |
102 | 102 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $this->client->request_compression = $this->request_compression; |
107 | 107 | $this->client->accepted_compression = $this->accepted_compression; |
108 | 108 | |
109 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
109 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
110 | 110 | |
111 | 111 | if ($this->args['DEBUG'] == 1) |
112 | 112 | ob_start(); |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | } |
144 | 144 | $this->validateResponse($r); |
145 | 145 | if (is_array($errorCode)) { |
146 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
146 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
147 | 147 | } else { |
148 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
148 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
149 | 149 | } |
150 | 150 | if (!$r->faultCode()) { |
151 | 151 | if ($returnResponse) { |
@@ -172,20 +172,20 @@ discard block |
||
172 | 172 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
173 | 173 | parse_str($query, $vars); |
174 | 174 | $query = http_build_query(array_merge($vars, $data)); |
175 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
175 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | public function testString() |
179 | 179 | { |
180 | - $sendString = "here are 3 \"entities\": < > & " . |
|
181 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
182 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
183 | - " also don't want to miss out on \$item[0]. " . |
|
184 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
185 | - "a simple CR here" . chr(13) . |
|
186 | - "a simple LF here" . chr(10) . |
|
187 | - "and then LFCR" . chr(10) . chr(13) . |
|
188 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
180 | + $sendString = "here are 3 \"entities\": < > & ". |
|
181 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
182 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
183 | + " also don't want to miss out on \$item[0]. ". |
|
184 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
185 | + "a simple CR here".chr(13). |
|
186 | + "a simple LF here".chr(10). |
|
187 | + "and then LFCR".chr(10).chr(13). |
|
188 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
189 | 189 | $m = new xmlrpcmsg('examples.stringecho', array( |
190 | 190 | new xmlrpcval($sendString, 'string'), |
191 | 191 | )); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | public function testLatin1String() |
207 | 207 | { |
208 | 208 | $sendString = |
209 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
209 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
210 | 210 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
211 | 211 | $sendString. |
212 | 212 | '</value></param></params></methodCall>'; |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | public function testUtf8Method() |
316 | 316 | { |
317 | 317 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
318 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
318 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
319 | 319 | new xmlrpcval('hello') |
320 | 320 | )); |
321 | 321 | $v = $this->send($m); |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | )); |
338 | 338 | $v = $this->send($m); |
339 | 339 | if ($v) { |
340 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
340 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
341 | 341 | } |
342 | 342 | } |
343 | 343 | |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | )); |
350 | 350 | $v = $this->send($m); |
351 | 351 | if ($v) { |
352 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
352 | + $this->assertEquals(12-23, $v->scalarval()); |
|
353 | 353 | } |
354 | 354 | } |
355 | 355 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | if ($v) { |
384 | 384 | $sz = $v->arraysize(); |
385 | 385 | $got = ''; |
386 | - for ($i = 0; $i < $sz; $i++) { |
|
386 | + for ($i = 0; $i<$sz; $i++) { |
|
387 | 387 | $b = $v->arraymem($i); |
388 | 388 | if ($b->scalarval()) { |
389 | 389 | $got .= '1'; |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | $got = ''; |
447 | 447 | $expected = '37210'; |
448 | 448 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
449 | - foreach($expect_array as $val) { |
|
449 | + foreach ($expect_array as $val) { |
|
450 | 450 | $b = $v->structmem($val); |
451 | 451 | $got .= $b->me['int']; |
452 | 452 | } |
@@ -899,7 +899,7 @@ discard block |
||
899 | 899 | { |
900 | 900 | // make a 'deep client copy' as the original one might have many properties set |
901 | 901 | // also for speed only wrap one method of the whole server |
902 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
902 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
903 | 903 | if ($class == '') { |
904 | 904 | $this->fail('Registration of remote server failed'); |
905 | 905 | } else { |
@@ -938,9 +938,9 @@ discard block |
||
938 | 938 | $cookies = array( |
939 | 939 | //'c1' => array(), |
940 | 940 | 'c2' => array('value' => 'c2'), |
941 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
942 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
943 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
941 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
942 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
943 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
944 | 944 | ); |
945 | 945 | $cookiesval = php_xmlrpc_encode($cookies); |
946 | 946 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -988,10 +988,10 @@ discard block |
||
988 | 988 | $m = new xmlrpcmsg('tests.getcookies', array()); |
989 | 989 | foreach ($cookies as $cookie => $val) { |
990 | 990 | $this->client->setCookie($cookie, $val); |
991 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
991 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
992 | 992 | } |
993 | 993 | $r = $this->client->send($m, $this->timeout, $this->method); |
994 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
994 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
995 | 995 | if (!$r->faultCode()) { |
996 | 996 | $v = $r->value(); |
997 | 997 | $v = php_xmlrpc_decode($v); |
@@ -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 |
@@ -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 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | public function testI8() |
131 | 131 | { |
132 | - if (PHP_INT_SIZE == 4 ) { |
|
132 | + if (PHP_INT_SIZE == 4) { |
|
133 | 133 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
134 | 134 | return; |
135 | 135 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | public function testUnicodeInMemberName() |
206 | 206 | { |
207 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
207 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
208 | 208 | $v = array($str => new xmlrpcval(1)); |
209 | 209 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
210 | 210 | $r = $r->serialize(); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | $response = @utf8_encode( |
221 | 221 | '<?xml version="1.0"?> |
222 | 222 | <!-- covers what happens when lib receives UTF8 chars in response text and comments --> |
223 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
223 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
224 | 224 | <methodResponse> |
225 | 225 | <fault> |
226 | 226 | <value> |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | </member> |
232 | 232 | <member> |
233 | 233 | <name>faultString</name> |
234 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
234 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
235 | 235 | </member> |
236 | 236 | </struct> |
237 | 237 | </value> |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $m = $this->newRequest('dummy'); |
241 | 241 | $r = $m->parseResponse($response); |
242 | 242 | $v = $r->faultString(); |
243 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
243 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | public function testBrokenRequests() |
@@ -447,8 +447,8 @@ discard block |
||
447 | 447 | $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values; |
448 | 448 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true; |
449 | 449 | |
450 | - foreach($values as $value) { |
|
451 | - $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> '; |
|
450 | + foreach ($values as $value) { |
|
451 | + $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> '; |
|
452 | 452 | $r = $s->parseResponse($f); |
453 | 453 | $v = $r->faultCode(); |
454 | 454 | $this->assertEquals(2, $v, "Testing $value"); |
@@ -552,11 +552,11 @@ discard block |
||
552 | 552 | |
553 | 553 | public function testUTF8Response() |
554 | 554 | { |
555 | - $string = chr(224) . chr(252) . chr(232); |
|
555 | + $string = chr(224).chr(252).chr(232); |
|
556 | 556 | |
557 | 557 | $s = $this->newRequest('dummy'); |
558 | - $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> |
|
559 | -<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> |
|
558 | + $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> |
|
559 | +<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> |
|
560 | 560 | '; |
561 | 561 | $r = $s->parseResponse($f, false, 'phpvals'); |
562 | 562 | $v = $r->value(); |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | $this->assertEquals($string, $v); |
565 | 565 | |
566 | 566 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
567 | -<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> |
|
567 | +<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> |
|
568 | 568 | '; |
569 | 569 | $r = $s->parseResponse($f, false, 'phpvals'); |
570 | 570 | $v = $r->value(); |
@@ -580,11 +580,11 @@ discard block |
||
580 | 580 | |
581 | 581 | public function testLatin1Response() |
582 | 582 | { |
583 | - $string = chr(224) . chr(252) . chr(232); |
|
583 | + $string = chr(224).chr(252).chr(232); |
|
584 | 584 | |
585 | 585 | $s = $this->newRequest('dummy'); |
586 | - $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> |
|
587 | -<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> |
|
586 | + $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> |
|
587 | +<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> |
|
588 | 588 | '; |
589 | 589 | $r = $s->parseResponse($f, false, 'phpvals'); |
590 | 590 | $v = $r->value(); |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | $this->assertEquals($string, $v); |
593 | 593 | |
594 | 594 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
595 | -<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> |
|
595 | +<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> |
|
596 | 596 | '; |
597 | 597 | $r = $s->parseResponse($f, false, 'phpvals'); |
598 | 598 | $v = $r->value(); |
@@ -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__ . '/08ServerTest.php'; |
|
8 | +include_once __DIR__.'/08ServerTest.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 | { |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
305 | 305 | $ubuntuVersion = @$matches[1]; |
306 | 306 | } |
307 | - if ($ubuntuVersion >= 20) { |
|
307 | + if ($ubuntuVersion>=20) { |
|
308 | 308 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
309 | 309 | return; |
310 | 310 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | require_once __DIR__.'/methodProviders/CommentManager.php'; |
5 | 5 | |
@@ -25,33 +25,33 @@ discard block |
||
25 | 25 | // generate a file with a class definition |
26 | 26 | |
27 | 27 | // the generated code does not have an autoloader included - we need to add in one |
28 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
28 | +$autoloader = __DIR__."/_prepend.php"; |
|
29 | 29 | |
30 | 30 | file_put_contents($targetClassFile, |
31 | - "<?php\n\n" . |
|
32 | - "require_once '$autoloader';\n\n" . |
|
31 | + "<?php\n\n". |
|
32 | + "require_once '$autoloader';\n\n". |
|
33 | 33 | "class MyServerClass\n{\n\n" |
34 | 34 | ) || die('uh oh'); |
35 | 35 | |
36 | 36 | // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions |
37 | 37 | |
38 | -foreach($code as $methodName => $methodDef) { |
|
39 | - file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh'); |
|
40 | - $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function']; |
|
38 | +foreach ($code as $methodName => $methodDef) { |
|
39 | + file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh'); |
|
40 | + $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function']; |
|
41 | 41 | unset($code[$methodName]['source']); |
42 | 42 | } |
43 | 43 | file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh'); |
44 | 44 | |
45 | 45 | // generate separate files with the xml-rpc server instantiation and its dispatch map |
46 | 46 | |
47 | -file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n"); |
|
47 | +file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n"); |
|
48 | 48 | |
49 | 49 | file_put_contents($targetControllerFile, |
50 | - "<?php\n\n" . |
|
50 | + "<?php\n\n". |
|
51 | 51 | |
52 | - "require_once '$autoloader';\n\n" . |
|
52 | + "require_once '$autoloader';\n\n". |
|
53 | 53 | |
54 | - "require_once '$targetClassFile';\n\n" . |
|
54 | + "require_once '$targetClassFile';\n\n". |
|
55 | 55 | |
56 | 56 | // NB: since we are running the generated code within the same script, the existing CommentManager instance will be |
57 | 57 | // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder |
@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | // Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm); |
62 | 62 | // Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm); |
63 | 63 | |
64 | - "\$dm = require_once '$targetDispatchMapFile';\n" . |
|
65 | - '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" . |
|
66 | - '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" . |
|
67 | - '$s->setDebug(2);' . "\n" . |
|
68 | - '$s->exception_handling = 1;' . "\n" . |
|
69 | - '$s->service();' . "\n" |
|
64 | + "\$dm = require_once '$targetDispatchMapFile';\n". |
|
65 | + '$s = new \PhpXmlRpc\Server($dm, false);'."\n". |
|
66 | + '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n". |
|
67 | + '$s->setDebug(2);'."\n". |
|
68 | + '$s->exception_handling = 1;'."\n". |
|
69 | + '$s->service();'."\n" |
|
70 | 70 | ) || die('uh oh'); |
71 | 71 | |
72 | 72 | // test that everything worked by running it in realtime (note that this will return an xml-rpc error message if run |