@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | ); |
58 | 58 | } |
59 | 59 | |
60 | - public static function getOpts($args=array(), $cliOpts=array()) |
|
60 | + public static function getOpts($args = array(), $cliOpts = array()) |
|
61 | 61 | { |
62 | - if (count($args) > 0) |
|
62 | + if (count($args)>0) |
|
63 | 63 | // throw new \Exception('Missing library version argument'); |
64 | 64 | self::$libVersion = $args[0]; |
65 | 65 | |
@@ -157,17 +157,17 @@ discard block |
||
157 | 157 | $out = ''; |
158 | 158 | while (($start = strpos($content, $startTag, $last)) !== false) { |
159 | 159 | $end = strpos($content, $endTag, $start); |
160 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); |
|
161 | - if ($code[strlen($code) - 1] == "\n") { |
|
160 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); |
|
161 | + if ($code[strlen($code)-1] == "\n") { |
|
162 | 162 | $code = substr($code, 0, -1); |
163 | 163 | } |
164 | 164 | |
165 | 165 | $code = str_replace(array('>', '<'), array('>', '<'), $code); |
166 | - $code = highlight_string('<?php ' . $code, true); |
|
166 | + $code = highlight_string('<?php '.$code, true); |
|
167 | 167 | $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); |
168 | 168 | |
169 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; |
|
170 | - $last = $end + strlen($endTag); |
|
169 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; |
|
170 | + $last = $end+strlen($endTag); |
|
171 | 171 | } |
172 | 172 | $out .= substr($content, $last, strlen($content)); |
173 | 173 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | use PhpXmlRpc\Builder; |
183 | 183 | |
184 | -function run_default($task=null, $args=array(), $cliOpts=array()) |
|
184 | +function run_default($task = null, $args = array(), $cliOpts = array()) |
|
185 | 185 | { |
186 | 186 | echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; |
187 | 187 | echo "\n"; |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | echo " --zip=ZIP Location of the zip tool\n"; |
199 | 199 | } |
200 | 200 | |
201 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) |
|
201 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) |
|
202 | 202 | { |
203 | 203 | Builder::getOpts($args, $cliOpts); |
204 | 204 | } |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | /** |
207 | 207 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag |
208 | 208 | */ |
209 | -function run_init($task=null, $args=array(), $cliOpts=array()) |
|
209 | +function run_init($task = null, $args = array(), $cliOpts = array()) |
|
210 | 210 | { |
211 | 211 | // download the current version into the workspace |
212 | 212 | $targetDir = Builder::workspaceDir(); |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * |
235 | 235 | * (does nothing by itself, as all the steps are managed via task dependencies) |
236 | 236 | */ |
237 | -function run_build($task=null, $args=array(), $cliOpts=array()) |
|
237 | +function run_build($task = null, $args = array(), $cliOpts = array()) |
|
238 | 238 | { |
239 | 239 | } |
240 | 240 | |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | /** |
251 | 251 | * Generates documentation in all formats |
252 | 252 | */ |
253 | -function run_doc($task=null, $args=array(), $cliOpts=array()) |
|
253 | +function run_doc($task = null, $args = array(), $cliOpts = array()) |
|
254 | 254 | { |
255 | 255 | $docDir = Builder::workspaceDir().'/doc'; |
256 | 256 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | /** |
319 | 319 | * Creates the tarballs for a release |
320 | 320 | */ |
321 | -function run_dist($task=null, $args=array(), $cliOpts=array()) |
|
321 | +function run_dist($task = null, $args = array(), $cliOpts = array()) |
|
322 | 322 | { |
323 | 323 | // copy workspace dir into dist dir, without git |
324 | 324 | pake_mkdirs(Builder::distDir()); |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | // create tarballs |
333 | 333 | $cwd = getcwd(); |
334 | 334 | chdir(dirname(Builder::distDir())); |
335 | - foreach(Builder::distFiles() as $distFile) { |
|
335 | + foreach (Builder::distFiles() as $distFile) { |
|
336 | 336 | // php can not really create good zip files via phar: they are not compressed! |
337 | 337 | if (substr($distFile, -4) == '.zip') { |
338 | 338 | $cmd = Builder::tool('zip'); |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | chdir($cwd); |
351 | 351 | } |
352 | 352 | |
353 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) |
|
353 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) |
|
354 | 354 | { |
355 | 355 | pake_remove_dir(Builder::workspaceDir()); |
356 | 356 | } |
@@ -359,13 +359,13 @@ discard block |
||
359 | 359 | * Cleans up the whole build directory |
360 | 360 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources |
361 | 361 | */ |
362 | -function run_clean($task=null, $args=array(), $cliOpts=array()) |
|
362 | +function run_clean($task = null, $args = array(), $cliOpts = array()) |
|
363 | 363 | { |
364 | 364 | pake_remove_dir(Builder::buildDir()); |
365 | 365 | } |
366 | 366 | |
367 | 367 | // helper task: display help text |
368 | -pake_task( 'default' ); |
|
368 | +pake_task('default'); |
|
369 | 369 | // internal task: parse cli options |
370 | 370 | pake_task('getopts'); |
371 | 371 | pake_task('init', 'getopts'); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | // make sure we set the correct charset type for output, so that we can display all characters |
16 | 16 | header('Content-Type: text/html; charset=utf-8'); |
17 | 17 | |
18 | -include __DIR__ . '/common.php'; |
|
18 | +include __DIR__.'/common.php'; |
|
19 | 19 | if ($action == '') { |
20 | 20 | $action = 'list'; |
21 | 21 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | </select> |
285 | 285 | </td> |
286 | 286 | <td class="labelcell">Timeout:</td> |
287 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
287 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
288 | 288 | <td class="labelcell">Protocol:</td> |
289 | 289 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> |
290 | 290 | <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> |
@@ -15,8 +15,7 @@ discard block |
||
15 | 15 | function stripslashes_deep($value) |
16 | 16 | { |
17 | 17 | $value = is_array($value) ? |
18 | - array_map('stripslashes_deep', $value) : |
|
19 | - stripslashes($value); |
|
18 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
20 | 19 | |
21 | 20 | return $value; |
22 | 21 | } |
@@ -60,7 +59,7 @@ discard block |
||
60 | 59 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
61 | 60 | // in case user forgot initial '/' in xmlrpc server path, add it back |
62 | 61 | if ($path && ($path[0]) != '/') { |
63 | - $path = '/' . $path; |
|
62 | + $path = '/'.$path; |
|
64 | 63 | } |
65 | 64 | |
66 | 65 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -3,7 +3,7 @@ |
||
3 | 3 | if (isset($_GET['run'])) { |
4 | 4 | $path = parse_url($_GET['run']); |
5 | 5 | if (isset($path['query'])) { |
6 | - $query = '?' . $path['query']; |
|
6 | + $query = '?'.$path['query']; |
|
7 | 7 | } |
8 | 8 | } |
9 | 9 | ?> |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | // test for php version |
18 | 18 | $ver = phpversion(); |
19 | 19 | $tests['php_version'] = array(); |
20 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
21 | - if (version_compare($ver, '5.3.0') < 0) { |
|
20 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
21 | + if (version_compare($ver, '5.3.0')<0) { |
|
22 | 22 | $tests['php_version']['status'] = 0; |
23 | 23 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later'; |
24 | 24 | } else { |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | // test for php version |
52 | 52 | $ver = phpversion(); |
53 | 53 | $tests['php_version'] = array(); |
54 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
55 | - if (version_compare($ver, '5.3.0') < 0) { |
|
54 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
55 | + if (version_compare($ver, '5.3.0')<0) { |
|
56 | 56 | $tests['php_version']['status'] = 0; |
57 | 57 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later'; |
58 | 58 | } else { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $info = curl_version(); |
80 | 80 | $tests['curl']['status'] = 2; |
81 | 81 | $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols"; |
82 | - if (version_compare($ver, '4.3.8') < 0) { |
|
82 | + if (version_compare($ver, '4.3.8')<0) { |
|
83 | 83 | $tests['curl']['status'] = 1; |
84 | 84 | $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives"; |
85 | 85 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | <?php |
168 | 168 | $res = phpxmlrpc_verify_compat('server'); |
169 | 169 | foreach ($res as $test => $result) { |
170 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
170 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
171 | 171 | } |
172 | 172 | ?> |
173 | 173 | </tbody> |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | <?php |
185 | 185 | $res = phpxmlrpc_verify_compat('client'); |
186 | 186 | foreach ($res as $test => $result) { |
187 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
187 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
188 | 188 | } |
189 | 189 | ?> |
190 | 190 | </tbody> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LocalFileTestCase.php'; |
|
3 | +include_once __DIR__.'/LocalFileTestCase.php'; |
|
4 | 4 | |
5 | 5 | class DebuggerTest extends PhpXmlRpc_LocalFileTestCase |
6 | 6 | { |
@@ -8,9 +8,9 @@ discard block |
||
8 | 8 | { |
9 | 9 | $this->args = argParser::getArgs(); |
10 | 10 | |
11 | - $this->baseUrl = $this->args['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['URI'] ); |
|
11 | + $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['URI']); |
|
12 | 12 | |
13 | - $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); |
|
13 | + $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function testIndex() |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @license code licensed under the BSD License: see file license.txt |
7 | 7 | **/ |
8 | 8 | |
9 | -$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
9 | +$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
10 | 10 | |
11 | 11 | // has to be the same value as used in server.php |
12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LocalFileTestCase.php'; |
|
3 | +include_once __DIR__.'/LocalFileTestCase.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Tests for php files in the 'extras' directory |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | { |
12 | 12 | $this->args = argParser::getArgs(); |
13 | 13 | |
14 | - $this->baseUrl = $this->args['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/tests/', $this->args['URI'] ); |
|
14 | + $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/tests/', $this->args['URI']); |
|
15 | 15 | |
16 | - $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); |
|
16 | + $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function testVerifyCompat() |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LocalFileTestCase.php'; |
|
3 | +include_once __DIR__.'/LocalFileTestCase.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['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/demo/', $this->args['URI'] ); |
|
14 | + $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/demo/', $this->args['URI']); |
|
15 | 15 | |
16 | - $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); |
|
16 | + $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function testAgeSort() |