gggeek / phpxmlrpc

pakefile.php

Spacing +17 added lines, -17 removed lines

@@ -57,9 +57,9 @@ 
         );
     }
 
-    public static function getOpts($args=array(), $cliOpts=array())
+    public static function getOpts($args = array(), $cliOpts = array())
     {
-        if (count($args) > 0)
+        if (count($args)>0)
         //    throw new \Exception('Missing library version argument');
             self::$libVersion = $args[0];
 
@@ -157,17 +157,17 @@ 
         $out = '';
         while (($start = strpos($content, $startTag, $last)) !== false) {
             $end = strpos($content, $endTag, $start);
-            $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag));
-            if ($code[strlen($code) - 1] == "\n") {
+            $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag));
+            if ($code[strlen($code)-1] == "\n") {
                 $code = substr($code, 0, -1);
             }
 
             $code = str_replace(array('&gt;', '&lt;'), array('>', '<'), $code);
-            $code = highlight_string('<?php ' . $code, true);
+            $code = highlight_string('<?php '.$code, true);
             $code = str_replace('<span style="color: #0000BB">&lt;?php&nbsp;<br />', '<span style="color: #0000BB">', $code);
 
-            $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag;
-            $last = $end + strlen($endTag);
+            $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag;
+            $last = $end+strlen($endTag);
         }
         $out .= substr($content, $last, strlen($content));
 
@@ -181,7 +181,7 @@ 
 
 use PhpXmlRpc\Builder;
 
-function run_default($task=null, $args=array(), $cliOpts=array())
+function run_default($task = null, $args = array(), $cliOpts = array())
 {
     echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n";
     echo "\n";
@@ -198,7 +198,7 @@ 
     echo "      --zip=ZIP        Location of the zip tool\n";
 }
 
-function run_getopts($task=null, $args=array(), $cliOpts=array())
+function run_getopts($task = null, $args = array(), $cliOpts = array())
 {
     Builder::getOpts($args, $cliOpts);
 }
@@ -206,7 +206,7 @@ 
 /**
  * Downloads source code in the build workspace directory, optionally checking out the given branch/tag
  */
-function run_init($task=null, $args=array(), $cliOpts=array())
+function run_init($task = null, $args = array(), $cliOpts = array())
 {
     // download the current version into the workspace
     $targetDir = Builder::workspaceDir();
@@ -234,7 +234,7 @@ 
  *
  * (does nothing by itself, as all the steps are managed via task dependencies)
  */
-function run_build($task=null, $args=array(), $cliOpts=array())
+function run_build($task = null, $args = array(), $cliOpts = array())
 {
 }
 
@@ -250,7 +250,7 @@ 
 /**
  * Generates documentation in all formats
  */
-function run_doc($task=null, $args=array(), $cliOpts=array())
+function run_doc($task = null, $args = array(), $cliOpts = array())
 {
     $docDir = Builder::workspaceDir().'/doc';
 
@@ -318,7 +318,7 @@ 
 /**
  * Creates the tarballs for a release
  */
-function run_dist($task=null, $args=array(), $cliOpts=array())
+function run_dist($task = null, $args = array(), $cliOpts = array())
 {
     // copy workspace dir into dist dir, without git
     pake_mkdirs(Builder::distDir());
@@ -332,7 +332,7 @@ 
     // create tarballs
     $cwd = getcwd();
     chdir(dirname(Builder::distDir()));
-    foreach(Builder::distFiles() as $distFile) {
+    foreach (Builder::distFiles() as $distFile) {
         // php can not really create good zip files via phar: they are not compressed!
         if (substr($distFile, -4) == '.zip') {
             $cmd = Builder::tool('zip');
@@ -350,7 +350,7 @@ 
     chdir($cwd);
 }
 
-function run_clean_workspace($task=null, $args=array(), $cliOpts=array())
+function run_clean_workspace($task = null, $args = array(), $cliOpts = array())
 {
     pake_remove_dir(Builder::workspaceDir());
 }
@@ -359,13 +359,13 @@ 
  * Cleans up the whole build directory
  * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources
  */
-function run_clean($task=null, $args=array(), $cliOpts=array())
+function run_clean($task = null, $args = array(), $cliOpts = array())
 {
     pake_remove_dir(Builder::buildDir());
 }
 
 // helper task: display help text
-pake_task( 'default' );
+pake_task('default');
 // internal task: parse cli options
 pake_task('getopts');
 pake_task('init', 'getopts');

Braces +7 added lines, -6 removed lines

@@ -27,8 +27,9 @@ 
 
     public static function libVersion()
     {
-        if (self::$libVersion == null)
-            throw new \Exception('Missing library version argument');
+        if (self::$libVersion == null) {
+                    throw new \Exception('Missing library version argument');
+        }
         return self::$libVersion;
     }
 
@@ -59,9 +60,10 @@ 
 
     public static function getOpts($args=array(), $cliOpts=array())
     {
-        if (count($args) > 0)
-        //    throw new \Exception('Missing library version argument');
+        if (count($args) > 0) {
+                //    throw new \Exception('Missing library version argument');
             self::$libVersion = $args[0];
+        }
 
         foreach (self::$tools as $name => $binary) {
             if (isset($cliOpts[$name])) {
@@ -338,8 +340,7 @@ 
             $cmd = Builder::tool('zip');
             $extra = '-9 -r';
             pake_sh("$cmd $distFile $extra ".basename(Builder::distDir()));
-        }
-        else {
+        } else {
             $finder = pakeFinder::type('any')->pattern(basename(Builder::distDir()).'/**');
             // see https://bugs.php.net/bug.php?id=58852
             $pharFile = str_replace(Builder::libVersion(), '_LIBVERSION_', $distFile);

debugger/index.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 if (isset($_GET['run'])) {
     $path = parse_url($_GET['run']);
     if (isset($path['query'])) {
-        $query = '?' . $path['query'];
+        $query = '?'.$path['query'];
     }
 }
 ?>

Braces +6 added lines, -1 removed lines

@@ -12,7 +12,12 @@
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSONRPC';
+} else {
+    echo 'XMLRPC';
+}
+?> Debugger</title>
 </head>
 <frameset rows="360,*">
     <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0"

tests/phpunit_coverage.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @license code licensed under the BSD License: see file license.txt
  **/
 
-$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
+$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
 
 // has to be the same value as used in server.php
 $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage';

src/Autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             return;
         }
 
-        if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
+        if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
             require $file;
         }
     }

lib/xmlrpc_wrappers.inc

Indentation +3 added lines, -3 removed lines

@@ -141,9 +141,9 @@
  * @deprecated
  */
 function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName,
-     $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
-     $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
-     $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
+        $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
+        $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
+        $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
     if ($clientCopyMode < 2) {

Spacing +20 added lines, -20 removed lines

@@ -41,10 +41,10 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_function($funcName, $newFuncName='', $extraOptions=array())
+function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions);
@@ -64,17 +64,17 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_class($className, $extraOptions=array())
+function wrap_php_class($className, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     $fix = false;
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $fix = true;
     }
     $wrapped = $wrapper->wrapPhpClass($className, $extraOptions);
-    foreach($wrapped as $name => $value) {
+    foreach ($wrapped as $name => $value) {
         if ($fix) {
             eval($value['source']);
         }
@@ -93,7 +93,7 @@ 
  * @param string $newFuncName     deprecated, use an option in $extraOptions
  * @return array|callable|false
  */
-function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='')
+function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '')
 {
     if (!is_array($extraOptions))
     {
@@ -108,7 +108,7 @@ 
 
     $wrapper = new PhpXmlRpc\Wrapper();
 
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions);
@@ -126,7 +126,7 @@ 
  * @param array $extraOptions
  * @return mixed
  */
-function wrap_xmlrpc_server($client, $extraOptions=array())
+function wrap_xmlrpc_server($client, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     return $wrapper->wrapXmlrpcServer($client, $extraOptions);
@@ -146,7 +146,7 @@ 
      $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         // client copy mode 0 or 1 == partial / full client copy in emitted code
         $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix, $namespace);
         $innerCode .= "\$client->setDebug(\$debug);\n";
@@ -160,7 +160,7 @@ 
 
     if ($mDesc != '') {
         // take care that PHP comment is not terminated unwillingly by method description
-        $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n";
+        $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n";
     } else {
         $mDesc = "/**\nFunction $xmlrpcFuncName\n";
     }
@@ -169,7 +169,7 @@ 
     $innerCode .= "\$encoder = new {$namespace}Encoder();\n";
     $plist = array();
     $pCount = count($mSig);
-    for ($i = 1; $i < $pCount; $i++) {
+    for ($i = 1; $i<$pCount; $i++) {
         $plist[] = "\$p$i";
         $pType = $mSig[$i];
         if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' ||
@@ -185,19 +185,19 @@ 
             }
         }
         $innerCode .= "\$req->addparam(\$p$i);\n";
-        $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n";
+        $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n";
     }
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         $plist[] = '$debug=0';
         $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";
     }
     $plist = implode(', ', $plist);
-    $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n";
+    $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n";
 
     $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n";
     if ($decodeFault) {
         if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
         } else {
             $respCode = var_export($faultResponse, true);
         }
@@ -210,7 +210,7 @@ 
         $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());";
     }
 
-    $code = $code . $plist . ") {\n" . $innerCode . "\n}\n";
+    $code = $code.$plist.") {\n".$innerCode."\n}\n";
 
     return array('source' => $code, 'docstring' => $mDesc);
 }
@@ -218,18 +218,18 @@ 
 /**
  * @deprecated
  */
-function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
+function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')
 {
     $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).
-        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";
+        "', '".str_replace("'", "\'", $client->server)."', $client->port);\n";
 
     // copy all client fields to the client that will be generated runtime
     // (this provides for future expansion or subclassing of client obj)
     if ($verbatim_client_copy)
     {
-        foreach($client as $fld => $val)
+        foreach ($client as $fld => $val)
         {
-            if($fld != 'debug' && $fld != 'return_type')
+            if ($fld != 'debug' && $fld != 'return_type')
             {
                 $val = var_export($val, true);
                 $code .= "\$client->$fld = $val;\n";

src/Helper/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
             $flags = ENT_COMPAT;
             // avoid warnings on php < 5.4...
             if (defined('ENT_HTML401')) {
-                $flags =  $flags | ENT_HTML401;
+                $flags = $flags | ENT_HTML401;
             }
             if (defined('ENT_SUBSTITUTE')) {
-                $flags =  $flags | ENT_SUBSTITUTE;
+                $flags = $flags | ENT_SUBSTITUTE;
             }
             if ($encoding != null) {
                 print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";

tests/parse_args.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
 
         // check for command line (env vars) vs. web page input params
         if (!isset($_SERVER['REQUEST_METHOD'])) {
-            foreach($_SERVER as $key => $val) {
+            foreach ($_SERVER as $key => $val) {
                 if (array_key_exists($key, $args)) {
                     $$key = $val;
                 }
@@ -87,7 +87,7 @@ 
             }
         }
         if ($HTTPURI[0] != '/') {
-            $HTTPURI = '/' . $HTTPURI;
+            $HTTPURI = '/'.$HTTPURI;
         }
         $args['HTTPURI'] = $HTTPURI;
 
@@ -101,21 +101,21 @@ 
         }
 
         if (isset($HTTPSIGNOREPEER)) {
-            $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER;
+            $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER;
         }
 
         if (isset($HTTPSVERIFYHOST)) {
-            $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST;
+            $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST;
         }
 
         if (isset($SSLVERSION)) {
-            $args['SSLVERSION'] = (int)$SSLVERSION;
+            $args['SSLVERSION'] = (int) $SSLVERSION;
         }
 
         if (isset($PROXYSERVER)) {
             $arr = explode(':', $PROXYSERVER);
             $args['PROXYSERVER'] = $arr[0];
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $args['PROXYPORT'] = $arr[1];
             } else {
                 $args['PROXYPORT'] = 8080;

demo/server/discuss.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Value;
 
@@ -31,8 +31,8 @@ 
             $count = 0;
         }
         // add the new comment in
-        dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-        dba_insert($msgID . "_name_${count}", $name, $dbh);
+        dba_insert($msgID."_comment_${count}", $comment, $dbh);
+        dba_insert($msgID."_name_${count}", $name, $dbh);
         $count++;
         dba_replace($countID, $count, $dbh);
         dba_close($dbh);
@@ -65,7 +65,7 @@ 
         $countID = "${msgID}_count";
         if (dba_exists($countID, $dbh)) {
             $count = dba_fetch($countID, $dbh);
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i<$count; $i++) {
                 $name = dba_fetch("${msgID}_name_${i}", $dbh);
                 $comment = dba_fetch("${msgID}_comment_${i}", $dbh);
                 // push a new struct onto the return array
@@ -101,4 +101,4 @@ 
     ),
 ));
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/server/_append.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 // Out-of-band information: let the client manipulate the server operations.
 // We do this to help the testsuite script: do not reproduce in production!
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }