@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * @param array $extraOptions |
42 | 42 | * @return array|false |
43 | 43 | */ |
44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
45 | 45 | { |
46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
47 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
47 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
48 | 48 | // backwards compat: return string instead of callable |
49 | 49 | $extraOptions['return_source'] = true; |
50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | * @param array $extraOptions |
65 | 65 | * @return array|false |
66 | 66 | */ |
67 | -function wrap_php_class($className, $extraOptions=array()) |
|
67 | +function wrap_php_class($className, $extraOptions = array()) |
|
68 | 68 | { |
69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
70 | 70 | $fix = false; |
71 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
71 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
72 | 72 | // backwards compat: return string instead of callable |
73 | 73 | $extraOptions['return_source'] = true; |
74 | 74 | $fix = true; |
75 | 75 | } |
76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
77 | - foreach($wrapped as $name => $value) { |
|
77 | + foreach ($wrapped as $name => $value) { |
|
78 | 78 | if ($fix) { |
79 | 79 | eval($value['source']); |
80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
94 | 94 | * @return array|callable|false |
95 | 95 | */ |
96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
97 | 97 | { |
98 | 98 | if (!is_array($extraOptions)) |
99 | 99 | { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | $wrapper = new PhpXmlRpc\Wrapper(); |
110 | 110 | |
111 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
111 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
112 | 112 | // backwards compat: return string instead of callable |
113 | 113 | $extraOptions['return_source'] = true; |
114 | 114 | $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param array $extraOptions |
129 | 129 | * @return mixed |
130 | 130 | */ |
131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
132 | 132 | { |
133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
149 | 149 | { |
150 | 150 | $code = "function $xmlrpcFuncName ("; |
151 | - if ($clientCopyMode < 2) { |
|
151 | + if ($clientCopyMode<2) { |
|
152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | if ($mDesc != '') { |
164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
166 | 166 | } else { |
167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
172 | 172 | $plist = array(); |
173 | 173 | $pCount = count($mSig); |
174 | - for ($i = 1; $i < $pCount; $i++) { |
|
174 | + for ($i = 1; $i<$pCount; $i++) { |
|
175 | 175 | $plist[] = "\$p$i"; |
176 | 176 | $pType = $mSig[$i]; |
177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
187 | 187 | } |
188 | 188 | } |
189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
191 | 191 | } |
192 | - if ($clientCopyMode < 2) { |
|
192 | + if ($clientCopyMode<2) { |
|
193 | 193 | $plist[] = '$debug=0'; |
194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
195 | 195 | } |
196 | 196 | $plist = implode(', ', $plist); |
197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
198 | 198 | |
199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
200 | 200 | if ($decodeFault) { |
201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
203 | 203 | } else { |
204 | 204 | $respCode = var_export($faultResponse, true); |
205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
213 | 213 | } |
214 | 214 | |
215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
216 | 216 | |
217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * @deprecated |
222 | 222 | */ |
223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
224 | 224 | { |
225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
227 | 227 | |
228 | 228 | // copy all client fields to the client that will be generated runtime |
229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -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', '/tests/index.php', $this->args['HTTPURI'] ); |
|
14 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $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,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(); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | $uri = str_replace('/demo/server/server.php', '/tests/index.php?demo=server/server.php', $this->args['HTTPURI']); |
99 | 99 | $server = explode(':', $this->args['HTTPSERVER']); |
100 | - if (count($server) > 1) { |
|
100 | + if (count($server)>1) { |
|
101 | 101 | $this->client = new xmlrpc_client($uri, $server[0], $server[1]); |
102 | 102 | } else { |
103 | 103 | $this->client = new xmlrpc_client($uri, $this->args['HTTPSERVER']); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $this->client->request_compression = $this->request_compression; |
108 | 108 | $this->client->accepted_compression = $this->accepted_compression; |
109 | 109 | |
110 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
110 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
111 | 111 | |
112 | 112 | if ($this->args['DEBUG'] == 1) |
113 | 113 | ob_start(); |
@@ -144,9 +144,9 @@ discard block |
||
144 | 144 | } |
145 | 145 | $this->validateResponse($r); |
146 | 146 | if (is_array($errorCode)) { |
147 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
147 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
148 | 148 | } else { |
149 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
149 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
150 | 150 | } |
151 | 151 | if (!$r->faultCode()) { |
152 | 152 | if ($returnResponse) { |
@@ -173,20 +173,20 @@ discard block |
||
173 | 173 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
174 | 174 | parse_str($query, $vars); |
175 | 175 | $query = http_build_query(array_merge($vars, $data)); |
176 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
176 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | public function testString() |
180 | 180 | { |
181 | - $sendString = "here are 3 \"entities\": < > & " . |
|
182 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
183 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
184 | - " also don't want to miss out on \$item[0]. " . |
|
185 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
186 | - "a simple CR here" . chr(13) . |
|
187 | - "a simple LF here" . chr(10) . |
|
188 | - "and then LFCR" . chr(10) . chr(13) . |
|
189 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
181 | + $sendString = "here are 3 \"entities\": < > & ". |
|
182 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
183 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
184 | + " also don't want to miss out on \$item[0]. ". |
|
185 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
186 | + "a simple CR here".chr(13). |
|
187 | + "a simple LF here".chr(10). |
|
188 | + "and then LFCR".chr(10).chr(13). |
|
189 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
190 | 190 | $m = new xmlrpcmsg('examples.stringecho', array( |
191 | 191 | new xmlrpcval($sendString, 'string'), |
192 | 192 | )); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | public function testLatin1String() |
208 | 208 | { |
209 | 209 | $sendString = |
210 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
210 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
211 | 211 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
212 | 212 | $sendString. |
213 | 213 | '</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('examples.setcookies', array($cookiesval)); |
@@ -988,10 +988,10 @@ discard block |
||
988 | 988 | $m = new xmlrpcmsg('examples.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,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', '/tests/index.php', $this->args['HTTPURI'] ); |
|
15 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $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 | public function testBenchmark() |
@@ -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', '/tests/index.php', $this->args['HTTPURI'] ); |
|
11 | + $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $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,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
2 | +require_once __DIR__."/client/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('html lang="en"> |
5 | 5 | <head><title>xmlrpc</title></head> |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | output("<h3>Testing value serialization</h3>\n"); |
12 | 12 | |
13 | 13 | $v = new PhpXmlRpc\Value(23, "int"); |
14 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
14 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
15 | 15 | $v = new PhpXmlRpc\Value("What are you saying? >> << &&"); |
16 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
16 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
17 | 17 | |
18 | 18 | $v = new PhpXmlRpc\Value( |
19 | 19 | array( |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | "array" |
25 | 25 | ); |
26 | 26 | |
27 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
27 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
28 | 28 | |
29 | 29 | $v = new PhpXmlRpc\Value( |
30 | 30 | array( |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | "struct" |
53 | 53 | ); |
54 | 54 | |
55 | -output("<PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
55 | +output("<PRE>".htmlentities($v->serialize())."</PRE>"); |
|
56 | 56 | |
57 | 57 | $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array"); |
58 | 58 | |
59 | -output("<PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
59 | +output("<PRE>".htmlentities($w->serialize())."</PRE>"); |
|
60 | 60 | |
61 | 61 | $w = new PhpXmlRpc\Value("Mary had a little lamb, |
62 | 62 | Whose fleece was white as snow, |
@@ -68,26 +68,26 @@ discard block |
||
68 | 68 | Ten thousand volts went down its back |
69 | 69 | And turned it into nylon", "base64" |
70 | 70 | ); |
71 | -output("<PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
72 | -output("<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>"); |
|
71 | +output("<PRE>".htmlentities($w->serialize())."</PRE>"); |
|
72 | +output("<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>"); |
|
73 | 73 | |
74 | 74 | $req->method(''); |
75 | 75 | $req->addParam(new PhpXmlRpc\Value("41", "int")); |
76 | 76 | |
77 | 77 | output("<h3>Testing request serialization</h3>\n"); |
78 | 78 | $op = $req->serialize(); |
79 | -output("<PRE>" . htmlentities($op) . "</PRE>"); |
|
79 | +output("<PRE>".htmlentities($op)."</PRE>"); |
|
80 | 80 | |
81 | 81 | output("<h3>Testing ISO date format</h3><pre>\n"); |
82 | 82 | |
83 | 83 | $t = time(); |
84 | 84 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
85 | 85 | output("Now is $t --> $date\n"); |
86 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
86 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
87 | 87 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
88 | 88 | output("That is to say $date --> $tb\n"); |
89 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
90 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
89 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
90 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
91 | 91 | |
92 | 92 | output("</pre>\n"); |
93 | 93 |
@@ -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, |
@@ -14,5 +14,5 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
18 | 18 | PhpXmlRpc\Autoloader::register(); |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | * @license code licensed under the BSD License: see file license.txt |
11 | 11 | */ |
12 | 12 | |
13 | -require_once __DIR__ . "/_prepend.php"; |
|
13 | +require_once __DIR__."/_prepend.php"; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Forward an xmlrpc request to another server, and return to client the response received. |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | // NB: here we should validate the received url, using f.e. a whitelist... |
32 | 32 | $client = new PhpXmlRpc\Client($url); |
33 | 33 | |
34 | - if ($req->getNumParams() > 3) { |
|
34 | + if ($req->getNumParams()>3) { |
|
35 | 35 | // we have to set some options onto the client. |
36 | 36 | // Note that if we do not untaint the received values, warnings might be generated... |
37 | 37 | $options = $encoder->decode($req->getParam(3)); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $client->setSSLVerifyPeer($val); |
52 | 52 | break; |
53 | 53 | case 'Timeout': |
54 | - $timeout = (integer)$val; |
|
54 | + $timeout = (integer) $val; |
|
55 | 55 | break; |
56 | 56 | } // switch |
57 | 57 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | // add debug info into response we give back to caller |
72 | - PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
72 | + PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
73 | 73 | |
74 | 74 | return $client->send($req, $timeout); |
75 | 75 | } |