@@ -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/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(); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | '<?xml version="1.0"?> |
151 | 151 | <!-- $Id --> |
152 | 152 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
153 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
153 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
154 | 154 | <methodResponse> |
155 | 155 | <fault> |
156 | 156 | <value> |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | </member> |
162 | 162 | <member> |
163 | 163 | <name>faultString</name> |
164 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
164 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
165 | 165 | </member> |
166 | 166 | </struct> |
167 | 167 | </value> |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $m = $this->newMsg('dummy'); |
171 | 171 | $r = $m->parseResponse($response); |
172 | 172 | $v = $r->faultString(); |
173 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
173 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | public function testBrokenRequests() |
@@ -410,11 +410,11 @@ discard block |
||
410 | 410 | |
411 | 411 | public function testUTF8Response() |
412 | 412 | { |
413 | - $string = chr(224) . chr(252) . chr(232); |
|
413 | + $string = chr(224).chr(252).chr(232); |
|
414 | 414 | |
415 | 415 | $s = $this->newMsg('dummy'); |
416 | - $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> |
|
417 | -<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> |
|
416 | + $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> |
|
417 | +<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> |
|
418 | 418 | '; |
419 | 419 | $r = $s->parseResponse($f, false, 'phpvals'); |
420 | 420 | $v = $r->value(); |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $this->assertEquals($string, $v); |
423 | 423 | |
424 | 424 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
425 | -<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 | +<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> |
|
426 | 426 | '; |
427 | 427 | $r = $s->parseResponse($f, false, 'phpvals'); |
428 | 428 | $v = $r->value(); |
@@ -438,11 +438,11 @@ discard block |
||
438 | 438 | |
439 | 439 | public function testLatin1Response() |
440 | 440 | { |
441 | - $string = chr(224) . chr(252) . chr(232); |
|
441 | + $string = chr(224).chr(252).chr(232); |
|
442 | 442 | |
443 | 443 | $s = $this->newMsg('dummy'); |
444 | - $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> |
|
445 | -<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> |
|
444 | + $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> |
|
445 | +<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> |
|
446 | 446 | '; |
447 | 447 | $r = $s->parseResponse($f, false, 'phpvals'); |
448 | 448 | $v = $r->value(); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $this->assertEquals($string, $v); |
451 | 451 | |
452 | 452 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
453 | -<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 | +<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> |
|
454 | 454 | '; |
455 | 455 | $r = $s->parseResponse($f, false, 'phpvals'); |
456 | 456 | $v = $r->value(); |
@@ -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/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 | } |
@@ -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,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); |
@@ -40,11 +40,12 @@ |
||
40 | 40 | $a = $req->getParam(0); |
41 | 41 | $b = $req->getParam(1); |
42 | 42 | |
43 | - if ($a->scalartyp() == Value::$xmlrpcNull) |
|
44 | - return new Response(new Value(plain_findstate($b->scalarval()))); |
|
45 | - else |
|
46 | - return new Response(new Value(plain_findstate($a->scalarval()))); |
|
47 | -} |
|
43 | + if ($a->scalartyp() == Value::$xmlrpcNull) { |
|
44 | + return new Response(new Value(plain_findstate($b->scalarval()))); |
|
45 | + } else { |
|
46 | + return new Response(new Value(plain_findstate($a->scalarval()))); |
|
47 | + } |
|
48 | + } |
|
48 | 49 | |
49 | 50 | $object = new xmlrpcServerMethodsContainer(); |
50 | 51 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Please _do not_ copy this file verbatim into your production server. |
10 | 10 | */ |
11 | 11 | |
12 | -require_once __DIR__ . "/_prepend.php"; |
|
12 | +require_once __DIR__."/_prepend.php"; |
|
13 | 13 | |
14 | 14 | use PhpXmlRpc\PhpXmlRpc; |
15 | 15 | use PhpXmlRpc\Response; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | ), |
62 | 62 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
63 | 63 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
64 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
64 | + "tests.utf8methodname.".'κόσμε' => array( |
|
65 | 65 | "function" => "stringEcho", |
66 | 66 | "signature" => $stringecho_sig, |
67 | 67 | "docstring" => $stringecho_doc, |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | ); |
30 | 30 | |
31 | 31 | $findstate_sig = array(array(Value::$xmlrpcString, Value::$xmlrpcInt)); |
32 | -$findstate_doc = 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
32 | +$findstate_doc = 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
33 | 33 | 'index of that state name in an alphabetic order.'; |
34 | 34 | function findState($req) |
35 | 35 | { |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | // extract the value of the state number |
43 | 43 | $snv = $sno->scalarval(); |
44 | 44 | // look it up in our array (zero-based) |
45 | - if (isset($GLOBALS['stateNames'][$snv - 1])) { |
|
46 | - $stateName = $GLOBALS['stateNames'][$snv - 1]; |
|
45 | + if (isset($GLOBALS['stateNames'][$snv-1])) { |
|
46 | + $stateName = $GLOBALS['stateNames'][$snv-1]; |
|
47 | 47 | } else { |
48 | 48 | // not there, so complain |
49 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
49 | + $err = "I don't have a state for the index '".$snv."'"; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | // if we generated an error, create an error return response |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | return 0; |
83 | 83 | } |
84 | 84 | |
85 | - return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1; |
|
85 | + return ($agesorter_arr[$a]>$agesorter_arr[$b]) ? -1 : 1; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | $agesorter_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcArray)); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | // hack, must make global as uksort() won't |
129 | 129 | // allow us to pass any other auxiliary information |
130 | 130 | uksort($agesorter_arr, 'agesorter_compare'); |
131 | - foreach($agesorter_arr as $key => $val) { |
|
131 | + foreach ($agesorter_arr as $key => $val) { |
|
132 | 132 | // recreate each struct element |
133 | 133 | $v[] = new Value( |
134 | 134 | array( |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $s = $req->getParam(0); |
154 | 154 | $t = $req->getParam(1); |
155 | 155 | |
156 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt)); |
|
156 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt)); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | $addtwodouble_sig = array(array(Value::$xmlrpcDouble, Value::$xmlrpcDouble, Value::$xmlrpcDouble)); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $s = $req->getParam(0); |
164 | 164 | $t = $req->getParam(1); |
165 | 165 | |
166 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble)); |
|
166 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble)); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | $stringecho_sig = array(array(Value::$xmlrpcString, Value::$xmlrpcString)); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | function echoBack($req) |
180 | 180 | { |
181 | 181 | // just sends back a string with what i got sent to me, just escaped, that's all |
182 | - $s = "I got the following message:\n" . $req->serialize(); |
|
182 | + $s = "I got the following message:\n".$req->serialize(); |
|
183 | 183 | |
184 | 184 | return new Response(new Value($s)); |
185 | 185 | } |
@@ -293,17 +293,17 @@ discard block |
||
293 | 293 | $err = "Error, no 'From' field specified"; |
294 | 294 | } |
295 | 295 | |
296 | - $msgHdr = "From: " . $mFrom->scalarval() . "\n"; |
|
297 | - $msgHdr .= "To: " . $mTo->scalarval() . "\n"; |
|
296 | + $msgHdr = "From: ".$mFrom->scalarval()."\n"; |
|
297 | + $msgHdr .= "To: ".$mTo->scalarval()."\n"; |
|
298 | 298 | |
299 | 299 | if ($mCc->scalarval() != "") { |
300 | - $msgHdr .= "Cc: " . $mCc->scalarval() . "\n"; |
|
300 | + $msgHdr .= "Cc: ".$mCc->scalarval()."\n"; |
|
301 | 301 | } |
302 | 302 | if ($mBcc->scalarval() != "") { |
303 | - $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n"; |
|
303 | + $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n"; |
|
304 | 304 | } |
305 | 305 | if ($mMime->scalarval() != "") { |
306 | - $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n"; |
|
306 | + $msgHdr .= "Content-type: ".$mMime->scalarval()."\n"; |
|
307 | 307 | } |
308 | 308 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
309 | 309 |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $moe = $sno["moe"]; |
37 | 37 | $larry = $sno["larry"]; |
38 | 38 | $curly = $sno["curly"]; |
39 | - $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval(); |
|
39 | + $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval(); |
|
40 | 40 | |
41 | 41 | return new Response(new Value($num, Value::$xmlrpcInt)); |
42 | 42 | } |
@@ -78,9 +78,9 @@ discard block |
||
78 | 78 | $ar = $req->getParam(0); |
79 | 79 | $sz = $ar->count(); |
80 | 80 | $first = $ar[0]; |
81 | - $last = $ar[$sz - 1]; |
|
81 | + $last = $ar[$sz-1]; |
|
82 | 82 | |
83 | - return new Response(new Value($first->scalarval() . |
|
83 | + return new Response(new Value($first->scalarval(). |
|
84 | 84 | $last->scalarval(), Value::$xmlrpcString)); |
85 | 85 | } |
86 | 86 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $larry = $fools["larry"]; |
115 | 115 | $moe = $fools["moe"]; |
116 | 116 | |
117 | - return new Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt)); |
|
117 | + return new Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt)); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | $v1_countTheEntities_sig = array(array(Value::$xmlrpcStruct, Value::$xmlrpcString)); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $ap = 0; |
129 | 129 | $qu = 0; |
130 | 130 | $amp = 0; |
131 | - for ($i = 0; $i < strlen($str); $i++) { |
|
131 | + for ($i = 0; $i<strlen($str); $i++) { |
|
132 | 132 | $c = substr($str, $i, 1); |
133 | 133 | switch ($c) { |
134 | 134 | case ">": |
@@ -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 | } |