@@ -1,6 +1,6 @@ |
||
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. |
@@ -1,6 +1,6 @@ |
||
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. |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
4 | 4 | |
5 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
5 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Tests which involve interaction with the server - carried out via the client. |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | // (but only if not called from subclass objects / multitests) |
30 | 30 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
31 | 31 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
32 | - for ($i = 0; $i < count($trace); $i++) { |
|
32 | + for ($i = 0; $i<count($trace); $i++) { |
|
33 | 33 | if (strpos($trace[$i]['function'], 'test') === 0) { |
34 | 34 | self::$failed_tests[$trace[$i]['function']] = true; |
35 | 35 | break; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | parent::set_up(); |
46 | 46 | |
47 | 47 | $server = explode(':', $this->args['HTTPSERVER']); |
48 | - if (count($server) > 1) { |
|
48 | + if (count($server)>1) { |
|
49 | 49 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
50 | 50 | } else { |
51 | 51 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | } |
76 | 76 | $this->validateResponse($r); |
77 | 77 | if (is_array($errorCode)) { |
78 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
78 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
79 | 79 | } else { |
80 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
80 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
81 | 81 | } |
82 | 82 | if (!$r->faultCode()) { |
83 | 83 | if ($returnResponse) { |
@@ -104,20 +104,20 @@ discard block |
||
104 | 104 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
105 | 105 | parse_str($query, $vars); |
106 | 106 | $query = http_build_query(array_merge($vars, $data)); |
107 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
107 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | public function testString() |
111 | 111 | { |
112 | - $sendString = "here are 3 \"entities\": < > & " . |
|
113 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
114 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
115 | - " also don't want to miss out on \$item[0]. " . |
|
116 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
117 | - "a simple CR here" . chr(13) . |
|
118 | - "a simple LF here" . chr(10) . |
|
119 | - "and then LFCR" . chr(10) . chr(13) . |
|
120 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
112 | + $sendString = "here are 3 \"entities\": < > & ". |
|
113 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
114 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
115 | + " also don't want to miss out on \$item[0]. ". |
|
116 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
117 | + "a simple CR here".chr(13). |
|
118 | + "a simple LF here".chr(10). |
|
119 | + "and then LFCR".chr(10).chr(13). |
|
120 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
121 | 121 | $m = new xmlrpcmsg('examples.stringecho', array( |
122 | 122 | new xmlrpcval($sendString, 'string'), |
123 | 123 | )); |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | public function testLatin1String() |
139 | 139 | { |
140 | 140 | $sendString = |
141 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
141 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
142 | 142 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
143 | 143 | $sendString. |
144 | 144 | '</value></param></params></methodCall>'; |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | public function testUtf8Method() |
248 | 248 | { |
249 | 249 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
250 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
250 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
251 | 251 | new xmlrpcval('hello') |
252 | 252 | )); |
253 | 253 | $v = $this->send($m); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | )); |
269 | 269 | $v = $this->send($m); |
270 | 270 | if ($v) { |
271 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
271 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | )); |
281 | 281 | $v = $this->send($m); |
282 | 282 | if ($v) { |
283 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
283 | + $this->assertEquals(12-23, $v->scalarval()); |
|
284 | 284 | } |
285 | 285 | } |
286 | 286 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | if ($v) { |
320 | 320 | $sz = $v->arraysize(); |
321 | 321 | $got = ''; |
322 | - for ($i = 0; $i < $sz; $i++) { |
|
322 | + for ($i = 0; $i<$sz; $i++) { |
|
323 | 323 | $b = $v->arraymem($i); |
324 | 324 | if ($b->scalarval()) { |
325 | 325 | $got .= '1'; |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | $got = ''; |
367 | 367 | $expected = '37210'; |
368 | 368 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
369 | - foreach($expect_array as $val) { |
|
369 | + foreach ($expect_array as $val) { |
|
370 | 370 | $b = $v->structmem($val); |
371 | 371 | $got .= $b->me['int']; |
372 | 372 | } |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | { |
869 | 869 | // make a 'deep client copy' as the original one might have many properties set |
870 | 870 | // also for speed only wrap one method of the whole server |
871 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
871 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
872 | 872 | if ($class == '') { |
873 | 873 | $this->fail('Registration of remote server failed'); |
874 | 874 | } else { |
@@ -907,9 +907,9 @@ discard block |
||
907 | 907 | $cookies = array( |
908 | 908 | //'c1' => array(), |
909 | 909 | 'c2' => array('value' => 'c2'), |
910 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
911 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
912 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
910 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
911 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
912 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
913 | 913 | ); |
914 | 914 | $cookiesval = php_xmlrpc_encode($cookies); |
915 | 915 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -957,10 +957,10 @@ discard block |
||
957 | 957 | $m = new xmlrpcmsg('tests.getcookies', array()); |
958 | 958 | foreach ($cookies as $cookie => $val) { |
959 | 959 | $this->client->setCookie($cookie, $val); |
960 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
960 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
961 | 961 | } |
962 | 962 | $r = $this->client->send($m, $this->timeout, $this->method); |
963 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
963 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
964 | 964 | if (!$r->faultCode()) { |
965 | 965 | $v = $r->value(); |
966 | 966 | $v = php_xmlrpc_decode($v); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase |
6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
17 | 17 | { |
18 | - $url = $this->baseUrl . $path; |
|
18 | + $url = $this->baseUrl.$path; |
|
19 | 19 | |
20 | 20 | $ch = curl_init($url); |
21 | 21 | curl_setopt_array($ch, array( |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId); |
35 | 35 | } |
36 | - if ($this->args['DEBUG'] > 0) { |
|
36 | + if ($this->args['DEBUG']>0) { |
|
37 | 37 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
38 | 38 | } |
39 | 39 | $page = curl_exec($ch); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | protected function newClient($path) |
59 | 59 | { |
60 | - $client = new \PhpXmlRpc\Client($this->baseUrl . $path); |
|
60 | + $client = new \PhpXmlRpc\Client($this->baseUrl.$path); |
|
61 | 61 | if ($this->collectCodeCoverageInformation) { |
62 | 62 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
63 | 63 | } |
@@ -1,6 +1,6 @@ |
||
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 the bundled debugger. |
@@ -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 | |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | public function testUtf8ToLatin1All() |
49 | 49 | { |
50 | 50 | $latinString = "\n\r\t"; |
51 | - for($i = 32; $i < 127; $i++) { |
|
51 | + for ($i = 32; $i<127; $i++) { |
|
52 | 52 | $latinString .= chr($i); |
53 | 53 | } |
54 | - for($i = 160; $i < 256; $i++) { |
|
54 | + for ($i = 160; $i<256; $i++) { |
|
55 | 55 | $latinString .= chr($i); |
56 | 56 | } |
57 | 57 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/08ServerTest.php'; |
|
3 | +include_once __DIR__.'/08ServerTest.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests which stress http features of the library. |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | ); |
26 | 26 | |
27 | 27 | $methods = array(); |
28 | - foreach(get_class_methods('ServerTest') as $method) |
|
28 | + foreach (get_class_methods('ServerTest') as $method) |
|
29 | 29 | { |
30 | 30 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
31 | 31 | { |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
318 | 318 | $ubuntuVersion = @$matches[1]; |
319 | 319 | } |
320 | - if ($ubuntuVersion >= 20) { |
|
320 | + if ($ubuntuVersion>=20) { |
|
321 | 321 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
322 | 322 | return; |
323 | 323 | } |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | |
27 | 27 | // read chunk-size, chunk-extension (if any) and crlf |
28 | 28 | // get the position of the linebreak |
29 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
29 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
30 | 30 | $temp = substr($buffer, 0, $chunkEnd); |
31 | 31 | $chunkSize = hexdec(trim($temp)); |
32 | 32 | $chunkStart = $chunkEnd; |
33 | - while ($chunkSize > 0) { |
|
34 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
33 | + while ($chunkSize>0) { |
|
34 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
35 | 35 | |
36 | 36 | // just in case we got a broken connection |
37 | 37 | if ($chunkEnd == false) { |
@@ -43,19 +43,19 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | // read chunk-data and crlf |
46 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
46 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
47 | 47 | // append chunk-data to entity-body |
48 | 48 | $new .= $chunk; |
49 | 49 | // length := length + chunk-size |
50 | 50 | $length += strlen($chunk); |
51 | 51 | // read chunk-size and crlf |
52 | - $chunkStart = $chunkEnd + 2; |
|
52 | + $chunkStart = $chunkEnd+2; |
|
53 | 53 | |
54 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
54 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
55 | 55 | if ($chunkEnd == false) { |
56 | 56 | break; // just in case we got a broken connection |
57 | 57 | } |
58 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
58 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
59 | 59 | $chunkSize = hexdec(trim($temp)); |
60 | 60 | $chunkStart = $chunkEnd; |
61 | 61 | } |
@@ -84,11 +84,11 @@ discard block |
||
84 | 84 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
85 | 85 | $pos = strpos($data, "\r\n\r\n"); |
86 | 86 | if ($pos || is_int($pos)) { |
87 | - $bd = $pos + 4; |
|
87 | + $bd = $pos+4; |
|
88 | 88 | } else { |
89 | 89 | $pos = strpos($data, "\n\n"); |
90 | 90 | if ($pos || is_int($pos)) { |
91 | - $bd = $pos + 2; |
|
91 | + $bd = $pos+2; |
|
92 | 92 | } else { |
93 | 93 | // No separation between response headers and body: fault? |
94 | 94 | $bd = 0; |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
99 | 99 | $data = substr($data, $bd); |
100 | 100 | } else { |
101 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
102 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
101 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
102 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -132,19 +132,19 @@ discard block |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | if ($httpResponse['status_code'] !== '200') { |
135 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
136 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
137 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
135 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
136 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
137 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
141 | 141 | $pos = strpos($data, "\r\n\r\n"); |
142 | 142 | if ($pos || is_int($pos)) { |
143 | - $bd = $pos + 4; |
|
143 | + $bd = $pos+4; |
|
144 | 144 | } else { |
145 | 145 | $pos = strpos($data, "\n\n"); |
146 | 146 | if ($pos || is_int($pos)) { |
147 | - $bd = $pos + 2; |
|
147 | + $bd = $pos+2; |
|
148 | 148 | } else { |
149 | 149 | // No separation between response headers and body: fault? |
150 | 150 | // we could take some action here instead of going on... |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | foreach ($ar as $line) { |
159 | 159 | // take care of (multi-line) headers and cookies |
160 | 160 | $arr = explode(':', $line, 2); |
161 | - if (count($arr) > 1) { |
|
161 | + if (count($arr)>1) { |
|
162 | 162 | /// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error |
163 | 163 | /// 400 any messages where a space is present between the header name and colon |
164 | 164 | $headerName = strtolower(trim($arr[0])); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $cookie = $arr[1]; |
167 | 167 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
168 | 168 | if (isset($httpResponse['headers'][$headerName])) { |
169 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
169 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
170 | 170 | } else { |
171 | 171 | $httpResponse['headers'][$headerName] = trim($cookie); |
172 | 172 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | } elseif (isset($headerName)) { |
198 | 198 | /// @todo improve this: 1. check that the line starts with a space or tab; 2. according to |
199 | 199 | /// https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages |
200 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
200 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
201 | 201 | } |
202 | 202 | } |
203 | 203 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | // Decode chunked encoding sent by http 1.1 servers |
221 | 221 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
222 | 222 | if (!$data = static::decodeChunked($data)) { |
223 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
223 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
224 | 224 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
225 | 225 | } |
226 | 226 | } |
@@ -235,19 +235,19 @@ discard block |
||
235 | 235 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
236 | 236 | $data = $degzdata; |
237 | 237 | if ($debug) { |
238 | - $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
238 | + $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
239 | 239 | } |
240 | 240 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
241 | 241 | $data = $degzdata; |
242 | 242 | if ($debug) { |
243 | - $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
243 | + $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
244 | 244 | } |
245 | 245 | } else { |
246 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
246 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
247 | 247 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
248 | 248 | } |
249 | 249 | } else { |
250 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
250 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
251 | 251 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
252 | 252 | } |
253 | 253 | } |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | public function parseAcceptHeader($header) |
268 | 268 | { |
269 | 269 | $accepted = array(); |
270 | - foreach(explode(',', $header) as $c) { |
|
270 | + foreach (explode(',', $header) as $c) { |
|
271 | 271 | if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) { |
272 | 272 | $c = $matches[1]; |
273 | 273 | $w = $matches[2]; |
@@ -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 | { |
@@ -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) |