@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public static function libVersion() |
| 29 | 29 | { |
| 30 | - if (self::$libVersion == null) |
|
| 31 | - throw new \Exception('Missing library version argument'); |
|
| 30 | + if (self::$libVersion == null) { |
|
| 31 | + throw new \Exception('Missing library version argument'); |
|
| 32 | + } |
|
| 32 | 33 | return self::$libVersion; |
| 33 | 34 | } |
| 34 | 35 | |
@@ -59,9 +60,10 @@ discard block |
||
| 59 | 60 | |
| 60 | 61 | public static function getOpts($args=array(), $cliOpts=array()) |
| 61 | 62 | { |
| 62 | - if (count($args) > 0) |
|
| 63 | - // throw new \Exception('Missing library version argument'); |
|
| 63 | + if (count($args) > 0) { |
|
| 64 | + // throw new \Exception('Missing library version argument'); |
|
| 64 | 65 | self::$libVersion = $args[0]; |
| 66 | + } |
|
| 65 | 67 | |
| 66 | 68 | foreach (self::$tools as $name => $binary) { |
| 67 | 69 | if (isset($cliOpts[$name])) { |
@@ -338,8 +340,7 @@ discard block |
||
| 338 | 340 | $cmd = Builder::tool('zip'); |
| 339 | 341 | $extra = '-9 -r'; |
| 340 | 342 | pake_sh("$cmd $distFile $extra ".basename(Builder::distDir())); |
| 341 | - } |
|
| 342 | - else { |
|
| 343 | + } else { |
|
| 343 | 344 | $finder = pakeFinder::type('any')->pattern(basename(Builder::distDir()).'/**'); |
| 344 | 345 | // see https://bugs.php.net/bug.php?id=58852 |
| 345 | 346 | $pharFile = str_replace(Builder::libVersion(), '_LIBVERSION_', $distFile); |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public static function getOpts($args=array(), $cliOpts=array()) |
|
| 67 | + public static function getOpts($args = array(), $cliOpts = array()) |
|
| 68 | 68 | { |
| 69 | - if (count($args) > 0) |
|
| 69 | + if (count($args)>0) |
|
| 70 | 70 | // throw new \Exception('Missing library version argument'); |
| 71 | 71 | self::$libVersion = $args[0]; |
| 72 | 72 | |
@@ -174,17 +174,17 @@ discard block |
||
| 174 | 174 | $out = ''; |
| 175 | 175 | while (($start = strpos($content, $startTag, $last)) !== false) { |
| 176 | 176 | $end = strpos($content, $endTag, $start); |
| 177 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); |
|
| 178 | - if ($code[strlen($code) - 1] == "\n") { |
|
| 177 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); |
|
| 178 | + if ($code[strlen($code)-1] == "\n") { |
|
| 179 | 179 | $code = substr($code, 0, -1); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | $code = str_replace(array('>', '<'), array('>', '<'), $code); |
| 183 | - $code = highlight_string('<?php ' . $code, true); |
|
| 183 | + $code = highlight_string('<?php '.$code, true); |
|
| 184 | 184 | $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); |
| 185 | 185 | |
| 186 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; |
|
| 187 | - $last = $end + strlen($endTag); |
|
| 186 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; |
|
| 187 | + $last = $end+strlen($endTag); |
|
| 188 | 188 | } |
| 189 | 189 | $out .= substr($content, $last, strlen($content)); |
| 190 | 190 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | use PhpXmlRpc\Builder; |
| 200 | 200 | |
| 201 | -function run_default($task=null, $args=array(), $cliOpts=array()) |
|
| 201 | +function run_default($task = null, $args = array(), $cliOpts = array()) |
|
| 202 | 202 | { |
| 203 | 203 | echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; |
| 204 | 204 | echo "\n"; |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | echo " --zip=ZIP Location of the zip tool\n"; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) |
|
| 219 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) |
|
| 220 | 220 | { |
| 221 | 221 | Builder::getOpts($args, $cliOpts); |
| 222 | 222 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag |
| 226 | 226 | * @todo allow using current installation / dir as source, bypassing git clone in workspace - at least for doc generation |
| 227 | 227 | */ |
| 228 | -function run_init($task=null, $args=array(), $cliOpts=array()) |
|
| 228 | +function run_init($task = null, $args = array(), $cliOpts = array()) |
|
| 229 | 229 | { |
| 230 | 230 | // download the current version into the workspace |
| 231 | 231 | $targetDir = Builder::workspaceDir(); |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | * |
| 255 | 255 | * (does nothing by itself, as all the steps are managed via task dependencies) |
| 256 | 256 | */ |
| 257 | -function run_build($task=null, $args=array(), $cliOpts=array()) |
|
| 257 | +function run_build($task = null, $args = array(), $cliOpts = array()) |
|
| 258 | 258 | { |
| 259 | 259 | } |
| 260 | 260 | |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | /** |
| 271 | 271 | * Generates documentation in all formats |
| 272 | 272 | */ |
| 273 | -function run_doc($task=null, $args=array(), $cliOpts=array()) |
|
| 273 | +function run_doc($task = null, $args = array(), $cliOpts = array()) |
|
| 274 | 274 | { |
| 275 | 275 | // in |
| 276 | 276 | $srcDir = Builder::workspaceDir(); |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | // from phpdoc comments using phpdocumentor |
| 283 | 283 | $cmd = Builder::tool('php'); |
| 284 | - pake_sh("$cmd " . Builder::toolsDir(). "/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC --defaultpackagename PHPXMLRPC'); |
|
| 284 | + pake_sh("$cmd ".Builder::toolsDir()."/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC --defaultpackagename PHPXMLRPC'); |
|
| 285 | 285 | |
| 286 | 286 | // from phpdoc comments using Sami - deprecated on 2021/12, as Sami is abandonware |
| 287 | 287 | /*$samiConfig = <<<EOT |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | /** |
| 362 | 362 | * Creates the tarballs for a release |
| 363 | 363 | */ |
| 364 | -function run_dist($task=null, $args=array(), $cliOpts=array()) |
|
| 364 | +function run_dist($task = null, $args = array(), $cliOpts = array()) |
|
| 365 | 365 | { |
| 366 | 366 | // copy workspace dir into dist dir, without git |
| 367 | 367 | pake_mkdirs(Builder::distDir()); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | // create tarballs |
| 377 | 377 | $cwd = getcwd(); |
| 378 | 378 | chdir(dirname(Builder::distDir())); |
| 379 | - foreach(Builder::distFiles() as $distFile) { |
|
| 379 | + foreach (Builder::distFiles() as $distFile) { |
|
| 380 | 380 | // php can not really create good zip files via phar: they are not compressed! |
| 381 | 381 | if (substr($distFile, -4) == '.zip') { |
| 382 | 382 | $cmd = Builder::tool('zip'); |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | chdir($cwd); |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) |
|
| 397 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) |
|
| 398 | 398 | { |
| 399 | 399 | if (realpath(__DIR__) === realpath(Builder::workspaceDir())) { |
| 400 | 400 | throw new \Exception("Can not remove workspace dir, as it is where pakefile is located!"); |
@@ -406,13 +406,13 @@ discard block |
||
| 406 | 406 | * Cleans up the whole build directory |
| 407 | 407 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources |
| 408 | 408 | */ |
| 409 | -function run_clean($task=null, $args=array(), $cliOpts=array()) |
|
| 409 | +function run_clean($task = null, $args = array(), $cliOpts = array()) |
|
| 410 | 410 | { |
| 411 | 411 | pake_remove_dir(Builder::buildDir()); |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | // helper task: display help text |
| 415 | -pake_task( 'default' ); |
|
| 415 | +pake_task('default'); |
|
| 416 | 416 | // internal task: parse cli options |
| 417 | 417 | pake_task('getopts'); |
| 418 | 418 | pake_task('init', 'getopts'); |
@@ -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 | ?> |
@@ -12,7 +12,12 @@ |
||
| 12 | 12 | <html lang="en"> |
| 13 | 13 | <head> |
| 14 | 14 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 15 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 15 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 16 | + echo 'JSONRPC'; |
|
| 17 | +} else { |
|
| 18 | + echo 'XMLRPC'; |
|
| 19 | +} |
|
| 20 | +?> Debugger</title> |
|
| 16 | 21 | </head> |
| 17 | 22 | <frameset rows="360,*"> |
| 18 | 23 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |
@@ -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'; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | return; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 32 | + if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 33 | 33 | require $file; |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -39,10 +39,10 @@ |
||
| 39 | 39 | $flags = ENT_COMPAT; |
| 40 | 40 | // avoid warnings on php < 5.4... |
| 41 | 41 | if (defined('ENT_HTML401')) { |
| 42 | - $flags = $flags | ENT_HTML401; |
|
| 42 | + $flags = $flags | ENT_HTML401; |
|
| 43 | 43 | } |
| 44 | 44 | if (defined('ENT_SUBSTITUTE')) { |
| 45 | - $flags = $flags | ENT_SUBSTITUTE; |
|
| 45 | + $flags = $flags | ENT_SUBSTITUTE; |
|
| 46 | 46 | } |
| 47 | 47 | if ($encoding != null) { |
| 48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | // check for command line (env vars) vs. web page input params |
| 45 | 45 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
| 46 | - foreach($_SERVER as $key => $val) { |
|
| 46 | + foreach ($_SERVER as $key => $val) { |
|
| 47 | 47 | if (array_key_exists($key, $args)) { |
| 48 | 48 | $$key = $val; |
| 49 | 49 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | if ($HTTPURI[0] != '/') { |
| 90 | - $HTTPURI = '/' . $HTTPURI; |
|
| 90 | + $HTTPURI = '/'.$HTTPURI; |
|
| 91 | 91 | } |
| 92 | 92 | $args['HTTPURI'] = $HTTPURI; |
| 93 | 93 | |
@@ -101,21 +101,21 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if (isset($HTTPSIGNOREPEER)) { |
| 104 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
| 104 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if (isset($HTTPSVERIFYHOST)) { |
| 108 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
| 108 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if (isset($SSLVERSION)) { |
| 112 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
| 112 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if (isset($PROXYSERVER)) { |
| 116 | 116 | $arr = explode(':', $PROXYSERVER); |
| 117 | 117 | $args['PROXYSERVER'] = $arr[0]; |
| 118 | - if (count($arr) > 1) { |
|
| 118 | + if (count($arr)>1) { |
|
| 119 | 119 | $args['PROXYPORT'] = $arr[1]; |
| 120 | 120 | } else { |
| 121 | 121 | $args['PROXYPORT'] = 8080; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | // assume this is either a standalone install, or installed as Composer dependency |
| 20 | 20 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 21 | 21 | /// debugger include this one, taking care of autoloading ? |
| 22 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 22 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 23 | 23 | PhpXmlRpc\Autoloader::register(); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Variables that shouldn't be unset |
| 36 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 36 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | 37 | |
| 38 | 38 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 39 | 39 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -53,8 +53,7 @@ discard block |
||
| 53 | 53 | function stripslashes_deep($value) |
| 54 | 54 | { |
| 55 | 55 | $value = is_array($value) ? |
| 56 | - array_map('stripslashes_deep', $value) : |
|
| 57 | - stripslashes($value); |
|
| 56 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 58 | 57 | |
| 59 | 58 | return $value; |
| 60 | 59 | } |
@@ -99,7 +98,7 @@ discard block |
||
| 99 | 98 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 100 | 99 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 101 | 100 | if ($path && ($path[0]) != '/') { |
| 102 | - $path = '/' . $path; |
|
| 101 | + $path = '/'.$path; |
|
| 103 | 102 | } |
| 104 | 103 | |
| 105 | 104 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -1,10 +1,10 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/parse_args.php'; |
|
| 5 | +include_once __DIR__.'/parse_args.php'; |
|
| 6 | 6 | |
| 7 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 7 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 8 | 8 | |
| 9 | 9 | use PHPUnit\Runner\BaseTestRunner; |
| 10 | 10 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $this->client->server .= 'XXX'; |
| 59 | 59 | $dnsinfo = @dns_get_record($this->client->server); |
| 60 | 60 | if ($dnsinfo) { |
| 61 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 61 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 62 | 62 | } else { |
| 63 | 63 | $r = $this->client->send($m, 5); |
| 64 | 64 | // make sure there's no freaking catchall DNS in effect |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | // now test a successful connection |
| 87 | 87 | $server = explode(':', $this->args['HTTPSERVER']); |
| 88 | - if (count($server) > 1) { |
|
| 88 | + if (count($server)>1) { |
|
| 89 | 89 | $this->client->port = $server[1]; |
| 90 | 90 | } |
| 91 | 91 | $this->client->server = $server[0]; |
@@ -24,14 +24,16 @@ |
||
| 24 | 24 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80); |
| 25 | 25 | $this->client->setDebug($this->args['DEBUG']); |
| 26 | 26 | |
| 27 | - if ($this->args['DEBUG'] == 1) |
|
| 28 | - ob_start(); |
|
| 27 | + if ($this->args['DEBUG'] == 1) { |
|
| 28 | + ob_start(); |
|
| 29 | + } |
|
| 29 | 30 | } |
| 30 | 31 | |
| 31 | 32 | protected function tear_down() |
| 32 | 33 | { |
| 33 | - if ($this->args['DEBUG'] != 1) |
|
| 34 | - return; |
|
| 34 | + if ($this->args['DEBUG'] != 1) { |
|
| 35 | + return; |
|
| 36 | + } |
|
| 35 | 37 | $out = ob_get_clean(); |
| 36 | 38 | $status = $this->getStatus(); |
| 37 | 39 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // construct a latin string with all chars (except control ones) |
| 34 | 34 | $this->latinString = "\n\r\t"; |
| 35 | - for($i = 32; $i < 127; $i++) { |
|
| 35 | + for ($i = 32; $i<127; $i++) { |
|
| 36 | 36 | $this->latinString .= chr($i); |
| 37 | 37 | } |
| 38 | - for($i = 160; $i < 256; $i++) { |
|
| 38 | + for ($i = 160; $i<256; $i++) { |
|
| 39 | 39 | $this->latinString .= chr($i); |
| 40 | 40 | } |
| 41 | 41 | } |