gggeek / phpxmlrpc

src/Request.php

Spacing +17 added lines, -17 removed lines

@@ -92,9 +92,9 @@ 
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -116,16 +116,16 @@ 
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -253,7 +253,7 @@ 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -266,7 +266,7 @@ 
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         }
@@ -280,7 +280,7 @@ 
         // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -294,9 +294,9 @@ 
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
             }
         }
 
@@ -318,7 +318,7 @@ 
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -339,12 +339,12 @@ 
         $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
 
         // first error check: xml not well-formed
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
 
             // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -355,7 +355,7 @@ 
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -371,7 +371,7 @@ 
                 '', $this->httpResponse
             );
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debugMessage(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );

debugger/controller.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
@@ -33,24 +33,24 @@ 
     /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $editorurlpath = preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $editorurlpath = preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
 
         /// @todo for cases 3, 4 and 5 above, look at `parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH)` and check if the
         ///       web root is not pointing directly at this folder, as in that case the link to the visualeditor will not
@@ -228,7 +228,7 @@ 
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -265,9 +265,9 @@ 
         echo ' document.forms[2].submit();';
     } ?>">
 <h1>XMLRPC
-    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     /
-    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library)
 </h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
@@ -330,7 +330,7 @@ 
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>

src/Server.php

Spacing +50 added lines, -50 removed lines

@@ -202,7 +202,7 @@ 
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -213,7 +213,7 @@ 
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -234,10 +234,10 @@ 
         // user debug info should be encoded by the end user using the INTERNAL_ENCODING
         $out = '';
         if ($this->debug_info != '') {
-            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
+            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
         }
         if (static::$_xmlrpc_debuginfo != '') {
-            $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
+            $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
             // NB: a better solution MIGHT be to use CDATA, but we need to insert it
             // into return payload AFTER the beginning tag
             //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
@@ -266,8 +266,8 @@ 
         $this->debug_info = '';
 
         // Save what we received, before parsing it
-        if ($this->debug > 1) {
-            $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
+        if ($this->debug>1) {
+            $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
         }
 
         $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -281,21 +281,21 @@ 
             $r->raw_data = $rawData;
         }
 
-        if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
-            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
-                static::$_xmlrpcs_occurred_errors . "+++END+++");
+        if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
+            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
+                static::$_xmlrpcs_occurred_errors."+++END+++");
         }
 
         $payload = $this->xml_header($respCharset);
-        if ($this->debug > 0) {
-            $payload = $payload . $this->serializeDebug($respCharset);
+        if ($this->debug>0) {
+            $payload = $payload.$this->serializeDebug($respCharset);
         }
 
         // Do not create response serialization if it has already happened. Helps building json magic
         if (empty($r->payload)) {
             $r->serialize($respCharset);
         }
-        $payload = $payload . $r->payload;
+        $payload = $payload.$r->payload;
 
         if ($returnPayload) {
             return $payload;
@@ -304,7 +304,7 @@ 
         // if we get a warning/error that has output some text before here, then we cannot
         // add a new header. We cannot say we are sending xml, either...
         if (!headers_sent()) {
-            header('Content-Type: ' . $r->content_type);
+            header('Content-Type: '.$r->content_type);
             // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
             header("Vary: Accept-Charset");
 
@@ -330,10 +330,10 @@ 
             // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
             // responses up to 8000 bytes
             if ($phpNoSelfCompress) {
-                header('Content-Length: ' . (int)strlen($payload));
+                header('Content-Length: '.(int) strlen($payload));
             }
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
         }
 
         print $payload;
@@ -388,9 +388,9 @@ 
             $numParams = count($in);
         }
         foreach ($sigs as $curSig) {
-            if (count($curSig) == $numParams + 1) {
+            if (count($curSig) == $numParams+1) {
                 $itsOK = 1;
-                for ($n = 0; $n < $numParams; $n++) {
+                for ($n = 0; $n<$numParams; $n++) {
                     if (is_object($in)) {
                         $p = $in->getParam($n);
                         if ($p->kindOf() == 'scalar') {
@@ -403,10 +403,10 @@ 
                     }
 
                     // param index is $n+1, as first member of sig is return type
-                    if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
+                    if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
                         $itsOK = 0;
-                        $pno = $n + 1;
-                        $wanted = $curSig[$n + 1];
+                        $pno = $n+1;
+                        $wanted = $curSig[$n+1];
                         $got = $pt;
                         break;
                     }
@@ -433,10 +433,10 @@ 
         // check if $_SERVER is populated: it might have been disabled via ini file
         // (this is true even when in CLI mode)
         if (count($_SERVER) == 0) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             if (function_exists('getallheaders')) {
                 $this->debugmsg(''); // empty line
                 foreach (getallheaders() as $name => $val) {
@@ -460,13 +460,13 @@ 
                 if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
                     if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } else {
                         $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
@@ -560,7 +560,7 @@ 
                     if ($reqEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
                     }
                 }
             }
@@ -579,18 +579,18 @@ 
 
         $xmlRpcParser = $this->getParser();
         $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options);
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
             // (BC) we return XML error as a faultCode
             preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
             $r = new Response(
                 0,
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
                 $xmlRpcParser->_xh['isf_reason']);
         } elseif ($xmlRpcParser->_xh['isf']) {
             $r = new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']);
         } else {
             // small layering violation in favor of speed and memory usage:
             // we should allow the 'execute' method handle this, but in the
@@ -601,20 +601,20 @@ 
                     ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
                 )
             ) {
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
                 }
                 $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
             } else {
                 // build a Request object with data parsed from xml
                 $req = new Request($xmlRpcParser->_xh['method']);
                 // now add parameters in
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
 
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
                 }
                 $r = $this->execute($req);
             }
@@ -667,7 +667,7 @@ 
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -680,7 +680,7 @@ 
 
         if (is_array($func)) {
             if (is_object($func[0])) {
-                $funcName = get_class($func[0]) . '->' . $func[1];
+                $funcName = get_class($func[0]).'->'.$func[1];
             } else {
                 $funcName = implode('::', $func);
             }
@@ -692,17 +692,17 @@ 
 
         // verify that function to be invoked is in fact callable
         if (!is_callable($func)) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
             return new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['server_error'],
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
             );
         }
 
         // If debug level is 3, we should catch all errors generated during
         // processing of user function, and log them as part of response
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
         }
 
@@ -715,14 +715,14 @@ 
                     $r = call_user_func($func, $req);
                 }
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
                     if (is_a($r, 'PhpXmlRpc\Value')) {
                         $r = new Response($r);
                     } else {
                         $r = new Response(
                             0,
                             PhpXmlRpc::$xmlrpcerr['server_error'],
-                            PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
+                            PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
                         );
                     }
                 }
@@ -738,7 +738,7 @@ 
                         // mimic EPI behaviour: if we get an array that looks like an error, make it
                         // an error response
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
-                            $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
+                            $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
                         } else {
                             // functions using EPI api should NOT return resp objects,
                             // so make sure we encode the return type correctly
@@ -761,7 +761,7 @@ 
             // proper error-response
             switch ($this->exception_handling) {
                 case 2:
-                    if ($this->debug > 2) {
+                    if ($this->debug>2) {
                         if (self::$_xmlrpcs_prev_ehandler) {
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
                         } else {
@@ -776,7 +776,7 @@ 
                     $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']);
             }
         }
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             // note: restore the error handler we found before calling the
             // user func, even if it has been changed inside the func itself
             if (self::$_xmlrpcs_prev_ehandler) {
@@ -796,7 +796,7 @@ 
      */
     protected function debugmsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -807,9 +807,9 @@ 
     protected function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n";
+            return "<?xml version=\"1.0\"?".">\n";
         }
     }
 
@@ -1087,7 +1087,7 @@ 
                 $i++; // for error message, we count params from 1
                 return static::_xmlrpcs_multicall_error(new Response(0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
             }
         }
 
@@ -1170,7 +1170,7 @@ 
             }
         } else {
             $numCalls = count($req);
-            for ($i = 0; $i < $numCalls; $i++) {
+            for ($i = 0; $i<$numCalls; $i++) {
                 $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
             }
         }

src/Value.php

Spacing +16 added lines, -16 removed lines

@@ -119,7 +119,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -144,7 +144,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -161,10 +161,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -206,7 +206,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -237,7 +237,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -280,19 +280,19 @@ 
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
+                        $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
+                        $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
+                        $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs .= "<{$typ}>" . (int)$val . "</{$typ}>";
+                        $rs .= "<{$typ}>".(int) $val."</{$typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -300,16 +300,16 @@ 
                         // sprintf('%F') could be most likely ok, but it fails eg. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs .= "<{$typ}>{$val}</{$typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
+                            $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
                         } elseif (is_int($val)) {
-                            $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
+                            $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs .= "<{$typ}>{$val}</{$typ}>";
@@ -331,14 +331,14 @@ 
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs .= '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs .= "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -374,7 +374,7 @@ 
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**

demo/server/proxy.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE ***
 // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!!
@@ -35,7 +35,7 @@ 
     // NB: here we should validate the received url, using f.e. a whitelist...
     $client = new PhpXmlRpc\Client($url);
 
-    if ($req->getNumParams() > 3) {
+    if ($req->getNumParams()>3) {
         // we have to set some options onto the client.
         // Note that if we do not untaint the received values, warnings might be generated...
         $options = $encoder->decode($req->getParam(3));
@@ -57,7 +57,7 @@ 
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -75,7 +75,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }

src/Helper/Charset.php

Spacing +19 added lines, -19 removed lines

@@ -71,14 +71,14 @@ 
                 if (count($this->xml_iso88591_Entities['in'])) {
                     return;
                 }
-                for ($i = 0; $i < 32; $i++) {
+                for ($i = 0; $i<32; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
 
                 /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
 
-                for ($i = 160; $i < 256; $i++) {
+                for ($i = 160; $i<256; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
@@ -106,7 +106,7 @@ 
                 break;*/
 
             default:
-                throw new \Exception('Unsupported table: ' . $tableName);
+                throw new \Exception('Unsupported table: '.$tableName);
         }
     }
 
@@ -149,7 +149,7 @@ 
             $destEncoding = 'US-ASCII';
         }
 
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
 
         // list ordered with (expected) most common scenarios first
         switch ($conversion) {
@@ -167,20 +167,20 @@ 
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
                 $escapedData = '';
                 // be kind to users creating string xmlrpc values out of different php types
-                $data = (string)$data;
+                $data = (string) $data;
                 $ns = strlen($data);
-                for ($nn = 0; $nn < $ns; $nn++) {
+                for ($nn = 0; $nn<$ns; $nn++) {
                     $ch = $data[$nn];
                     $ii = ord($ch);
                     // 7 bits in 1 byte: 0bbbbbbb (127)
-                    if ($ii < 32) {
+                    if ($ii<32) {
                         if ($conversion == 'UTF-8_US-ASCII') {
                             $escapedData .= sprintf('&#%d;', $ii);
                         } else {
                             $escapedData .= $ch;
                         }
                     }
-                    else if ($ii < 128) {
+                    else if ($ii<128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {
@@ -205,25 +205,25 @@ 
                     } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
                     elseif ($ii >> 5 == 6) {
                         $b1 = ($ii & 31);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $ii = ($b1 * 64) + $b2;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $ii = ($b1 * 64)+$b2;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 1;
                     } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 4 == 14) {
                         $b1 = ($ii & 15);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 2;
                     } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 3 == 30) {
                         $b1 = ($ii & 7);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $b4 = (ord($data[$nn + 3]) & 63);
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $b4 = (ord($data[$nn+3]) & 63);
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 3;
                     }
@@ -273,7 +273,7 @@ 
             default:
                 $escapedData = '';
                 /// @todo allow usage of a custom Logger via the DIC(ish) pattern we use in other classes
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
         }
 
         return $escapedData;
@@ -326,7 +326,7 @@ 
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new \Exception('Unsupported charset: ' . $charset);
+                throw new \Exception('Unsupported charset: '.$charset);
         }
     }
 }

src/Wrapper.php

Spacing +71 added lines, -71 removed lines

@@ -182,20 +182,20 @@ 
             $callable = explode('::', $callable);
         }
         if (is_array($callable)) {
-            if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong');
+            if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong');
                 return false;
             }
             if (is_string($callable[0])) {
                 $plainFuncName = implode('::', $callable);
             } elseif (is_object($callable[0])) {
-                $plainFuncName = get_class($callable[0]) . '->' . $callable[1];
+                $plainFuncName = get_class($callable[0]).'->'.$callable[1];
             }
             $exists = method_exists($callable[0], $callable[1]);
         } else if ($callable instanceof \Closure) {
             // we do not support creating code which wraps closures, as php does not allow to serialize them
             if (!$buildIt) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code');
                 return false;
             }
 
@@ -207,7 +207,7 @@ 
         }
 
         if (!$exists) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName);
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName);
             return false;
         }
 
@@ -251,23 +251,23 @@ 
         if (is_array($callable)) {
             $func = new \ReflectionMethod($callable[0], $callable[1]);
             if ($func->isPrivate()) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName);
                 return false;
             }
             if ($func->isProtected()) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName);
                 return false;
             }
             if ($func->isConstructor()) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isDestructor()) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isAbstract()) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName);
                 return false;
             }
             /// @todo add more checks for static vs. nonstatic?
@@ -277,7 +277,7 @@ 
         if ($func->isInternal()) {
             /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully
             ///       reflect internal php functions
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName);
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName);
             return false;
         }
 
@@ -329,7 +329,7 @@ 
         $i = 0;
         foreach ($func->getParameters() as $paramObj) {
             $params[$i] = array();
-            $params[$i]['name'] = '$' . $paramObj->getName();
+            $params[$i]['name'] = '$'.$paramObj->getName();
             $params[$i]['isoptional'] = $paramObj->isOptional();
             $i++;
         }
@@ -393,7 +393,7 @@ 
             // build a signature
             $sig = array($this->php2XmlrpcType($funcDesc['returns']));
             $pSig = array($funcDesc['returnsDocs']);
-            for ($i = 0; $i < count($pars); $i++) {
+            for ($i = 0; $i<count($pars); $i++) {
                 $name = strtolower($funcDesc['params'][$i]['name']);
                 if (isset($funcDesc['paramDocs'][$name]['type'])) {
                     $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']);
@@ -450,7 +450,7 @@ 
                 }
             }
             $numPars = $req->getNumParams();
-            if ($numPars < $minPars || $numPars > $maxPars) {
+            if ($numPars<$minPars || $numPars>$maxPars) {
                 return new $responseClass(0, 3, 'Incorrect parameters passed to method');
             }
 
@@ -463,7 +463,7 @@ 
 
             $result = call_user_func_array($callable, $params);
 
-            if (! is_a($result, $responseClass)) {
+            if (!is_a($result, $responseClass)) {
                 if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) {
                     $result = new $valueClass($result, $funcDesc['returns']);
                 } else {
@@ -498,9 +498,9 @@ 
         if ($newFuncName == '') {
             if (is_array($callable)) {
                 if (is_string($callable[0])) {
-                    $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable);
+                    $xmlrpcFuncName = "{$prefix}_".implode('_', $callable);
                 } else {
-                    $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1];
+                    $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1];
                 }
             } else {
                 if ($callable instanceof \Closure) {
@@ -536,8 +536,8 @@ 
     {
         $namespace = '\\PhpXmlRpc\\';
 
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : '';
 
         $i = 0;
@@ -572,7 +572,7 @@ 
         // build body of new function
 
         $innerCode = "\$paramCount = \$req->getNumParams();\n";
-        $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n";
+        $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n";
 
         $innerCode .= "\$encoder = new {$namespace}Encoder();\n";
         if ($decodePhpObjects) {
@@ -586,13 +586,13 @@ 
         if (is_array($callable) && is_object($callable[0])) {
             self::$objHolder[$newFuncName] = $callable[0];
             $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n";
-            $realFuncName = '$obj->' . $callable[1];
+            $realFuncName = '$obj->'.$callable[1];
         } else {
             $realFuncName = $plainFuncName;
         }
         foreach ($parsVariations as $i => $pars) {
-            $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
-            if ($i < (count($parsVariations) - 1))
+            $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n";
+            if ($i<(count($parsVariations)-1))
                 $innerCode .= "else\n";
         }
         $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n";
@@ -609,7 +609,7 @@ 
         // if ($func->returnsReference())
         //     return false;
 
-        $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}";
+        $code = "function $newFuncName(\$req) {\n".$innerCode."\n}";
 
         return $code;
     }
@@ -663,7 +663,7 @@ 
     protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array())
     {
         if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) {
-            return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . $classMethod;
+            return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod;
         }
 
         if (is_object($className)) {
@@ -671,7 +671,7 @@ 
         } else {
             $realClassName = $className;
         }
-        return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . "$realClassName.$classMethod";
+        return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod";
     }
 
     /**
@@ -752,21 +752,21 @@ 
     protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array())
     {
         $namespace = '\\PhpXmlRpc\\';
-        $reqClass = $namespace . 'Request';
-        $valClass = $namespace . 'Value';
-        $decoderClass = $namespace . 'Encoder';
+        $reqClass = $namespace.'Request';
+        $valClass = $namespace.'Value';
+        $decoderClass = $namespace.'Encoder';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0;
+        $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0;
 
         $req = new $reqClass('system.methodSignature');
         $req->addparam(new $valClass($methodName));
         $client->setDebug($debug);
         $response = $client->send($req, $timeout, $protocol);
         if ($response->faultCode()) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName);
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName);
             return false;
         }
 
@@ -777,8 +777,8 @@ 
             $mSig = $decoder->decode($mSig);
         }
 
-        if (!is_array($mSig) || count($mSig) <= $sigNum) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName);
+        if (!is_array($mSig) || count($mSig)<=$sigNum) {
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName);
             return false;
         }
 
@@ -794,11 +794,11 @@ 
     protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array())
     {
         $namespace = '\\PhpXmlRpc\\';
-        $reqClass = $namespace . 'Request';
-        $valClass = $namespace . 'Value';
+        $reqClass = $namespace.'Request';
+        $valClass = $namespace.'Value';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
 
         $mDesc = '';
@@ -832,10 +832,10 @@ 
         $clientClone = clone $client;
         $function = function() use($clientClone, $methodName, $extraOptions, $mSig)
         {
-            $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+            $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
             $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
             if (isset($extraOptions['return_on_fault'])) {
                 $decodeFault = true;
                 $faultResponse = $extraOptions['return_on_fault'];
@@ -844,9 +844,9 @@ 
             }
 
             $namespace = '\\PhpXmlRpc\\';
-            $reqClass = $namespace . 'Request';
-            $encoderClass = $namespace . 'Encoder';
-            $valueClass = $namespace . 'Value';
+            $reqClass = $namespace.'Request';
+            $encoderClass = $namespace.'Encoder';
+            $valueClass = $namespace.'Value';
 
             $encoder = new $encoderClass();
             $encodeOptions = array();
@@ -919,13 +919,13 @@ 
      * @param string $mDesc
      * @return string[] keys: source, docstring
      */
-    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='')
+    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '')
     {
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
-        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
+        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
         if (isset($extraOptions['return_on_fault'])) {
             $decodeFault = true;
@@ -938,7 +938,7 @@ 
         $namespace = '\\PhpXmlRpc\\';
 
         $code = "function $newFuncName (";
-        if ($clientCopyMode < 2) {
+        if ($clientCopyMode<2) {
             // client copy mode 0 or 1 == full / partial client copy in emitted code
             $verbatimClientCopy = !$clientCopyMode;
             $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace);
@@ -953,7 +953,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 $newFuncName\n";
         }
@@ -962,7 +962,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' ||
@@ -978,19 +978,19 @@ 
                 }
             }
             $innerCode .= "\$req->addparam(\$p$i);\n";
-            $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n";
+            $mDesc .= '* @param '.$this->xmlrpc2PhpType($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 {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n";
+        $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (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);
             }
@@ -1003,7 +1003,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);
     }
@@ -1030,24 +1030,24 @@ 
     public function wrapXmlrpcServer($client, $extraOptions = array())
     {
         $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : '';
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
         $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : '';
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true;
         $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
         $namespace = '\\PhpXmlRpc\\';
 
-        $reqClass = $namespace . 'Request';
-        $decoderClass = $namespace . 'Encoder';
+        $reqClass = $namespace.'Request';
+        $decoderClass = $namespace.'Encoder';
 
         // retrieve the list of methods
         $req = new $reqClass('system.listMethods');
         $response = $client->send($req, $timeout, $protocol);
         if ($response->faultCode()) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server');
 
             return false;
         }
@@ -1058,7 +1058,7 @@ 
             $mList = $decoder->decode($mList);
         }
         if (!is_array($mList) || !count($mList)) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server');
 
             return false;
         }
@@ -1067,8 +1067,8 @@ 
         if ($newClassName != '') {
             $xmlrpcClassName = $newClassName;
         } else {
-            $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
-                    array('_', ''), $client->server) . '_client';
+            $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
+                    array('_', ''), $client->server).'_client';
         }
         while ($buildIt && class_exists($xmlrpcClassName)) {
             $xmlrpcClassName .= 'x';
@@ -1099,20 +1099,20 @@ 
                     if (!$buildIt) {
                         $source .= $methodWrap['docstring'];
                     }
-                    $source .= $methodWrap['source'] . "\n";
+                    $source .= $methodWrap['source']."\n";
                 } else {
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName);
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName);
                 }
             }
         }
         $source .= "}\n";
         if ($buildIt) {
             $allOK = 0;
-            eval($source . '$allOK=1;');
+            eval($source.'$allOK=1;');
             if ($allOK) {
                 return $xmlrpcClassName;
             } else {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server);
                 return false;
             }
         } else {
@@ -1131,8 +1131,8 @@ 
      */
     protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\')
     {
-        $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) .
-            "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n";
+        $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path).
+            "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $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)

src/Client.php

Spacing +63 added lines, -63 removed lines

@@ -184,10 +184,10 @@ 
             $server = $parts['host'];
             $path = isset($parts['path']) ? $parts['path'] : '';
             if (isset($parts['query'])) {
-                $path .= '?' . $parts['query'];
+                $path .= '?'.$parts['query'];
             }
             if (isset($parts['fragment'])) {
-                $path .= '#' . $parts['fragment'];
+                $path .= '#'.$parts['fragment'];
             }
             if (isset($parts['port'])) {
                 $port = $parts['port'];
@@ -203,7 +203,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -241,7 +241,7 @@ 
         }*/
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -633,7 +633,7 @@ 
      */
     protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
-        $method='http')
+        $method = 'http')
     {
         //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
 
@@ -665,7 +665,7 @@ 
      * @param int $sslVersion
      * @return Response
      */
-    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '',  $password = '',
+    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
         $sslVersion = 0)
@@ -704,7 +704,7 @@ 
      */
     protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '',
+        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '',
         $sslVersion = 0)
     {
         /// @todo log a warning if passed an unsupported method
@@ -740,16 +740,16 @@ 
         // thanks to Grant Rauscher <grant7@firstworld.net> for this
         $credentials = '';
         if ($username != '') {
-            $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
             if ($authType != 1) {
                 /// @todo make this a proper error, ie. return a failure
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
             }
         }
 
         $acceptedEncoding = '';
         if (is_array($this->accepted_compression) && count($this->accepted_compression)) {
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";
         }
 
         $proxyCredentials = '';
@@ -761,13 +761,13 @@ 
             $connectPort = $proxyPort;
             $transport = 'tcp';
             /// @todo check: should we not use https in some cases?
-            $uri = 'http://' . $server . ':' . $port . $this->path;
+            $uri = 'http://'.$server.':'.$port.$this->path;
             if ($proxyUsername != '') {
                 if ($proxyAuthType != 1) {
                     /// @todo make this a proper error, ie. return a failure
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n";
             }
         } else {
             $connectServer = $server;
@@ -782,45 +782,45 @@ 
             $version = '';
             foreach ($this->cookies as $name => $cookie) {
                 if ($cookie['version']) {
-                    $version = ' $Version="' . $cookie['version'] . '";';
-                    $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";';
+                    $version = ' $Version="'.$cookie['version'].'";';
+                    $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";';
                     if ($cookie['path']) {
-                        $cookieHeader .= ' $Path="' . $cookie['path'] . '";';
+                        $cookieHeader .= ' $Path="'.$cookie['path'].'";';
                     }
                     if ($cookie['domain']) {
-                        $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";';
+                        $cookieHeader .= ' $Domain="'.$cookie['domain'].'";';
                     }
                     if ($cookie['port']) {
-                        $cookieHeader .= ' $Port="' . $cookie['port'] . '";';
+                        $cookieHeader .= ' $Port="'.$cookie['port'].'";';
                     }
                 } else {
-                    $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
+                    $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
                 }
             }
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
-            $port =  '';
+            $port = '';
         } else {
-            $port = ':' . $port;
+            $port = ':'.$port;
         }
 
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $this->user_agent . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
-            $cookieHeader .
-            'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$this->user_agent."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
+            $cookieHeader.
+            'Content-Type: '.$req->content_type."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---");
         }
 
@@ -847,7 +847,7 @@ 
 
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -859,7 +859,7 @@ 
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($timeout > 0) {
+            if ($timeout>0) {
                 stream_set_timeout($fp, $timeout, 0);
             }
         } else {
@@ -868,8 +868,8 @@ 
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -957,18 +957,18 @@ 
             $keyPass, $sslVersion);
 
         if (!$curl) {
-            return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details');
+            return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details');
         }
 
         $result = curl_exec($curl);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $message = "---CURL INFO---\n";
             foreach (curl_getinfo($curl) as $name => $val) {
                 if (is_array($val)) {
                     $val = implode("\n", $val);
                 }
-                $message .= $name . ': ' . $val . "\n";
+                $message .= $name.': '.$val."\n";
             }
             $message .= '---END---';
             $this->getLogger()->debugMessage($message);
@@ -978,7 +978,7 @@ 
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             curl_close($curl);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = null;
@@ -1048,12 +1048,12 @@ 
                     // http, https
                     $protocol = $method;
                     if (strpos($protocol, ':') !== false) {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
                         return false;
                     }
                 }
             }
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path);
             if (!$curl) {
                 return false;
             }
@@ -1067,7 +1067,7 @@ 
         // results into variable
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             curl_setopt($curl, CURLOPT_VERBOSE, true);
             /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered
         }
@@ -1092,7 +1092,7 @@ 
             }
         }
         // extra headers
-        $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+        $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));
         // if no keepalive is wanted, let the server know it in advance
         if (!$keepAlive) {
             $headers[] = 'Connection: close';
@@ -1109,7 +1109,7 @@ 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($timeout) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);
         }
 
         switch ($method) {
@@ -1124,7 +1124,7 @@ 
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
                     /// @todo make this a proper error, ie. return a failure
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
                 }
                 break;
             case 'h2':
@@ -1133,12 +1133,12 @@ 
         }
 
         if ($username && $password) {
-            curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password);
+            curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
             if (defined('CURLOPT_HTTPAUTH')) {
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $authType);
             } elseif ($authType != 1) {
                 /// @todo make this a proper error, ie. return a failure
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
             }
         }
 
@@ -1181,14 +1181,14 @@ 
             if ($proxyPort == 0) {
                 $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080
             }
-            curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort);
+            curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort);
             if ($proxyUsername) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword);
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword);
                 if (defined('CURLOPT_PROXYAUTH')) {
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType);
                 } elseif ($proxyAuthType != 1) {
                     /// @todo make this a proper error, ie. return a failure
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                 }
             }
         }
@@ -1198,7 +1198,7 @@ 
         if (count($this->cookies)) {
             $cookieHeader = '';
             foreach ($this->cookies as $name => $cookie) {
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
             }
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
         }
@@ -1207,7 +1207,7 @@ 
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
@@ -1305,7 +1305,7 @@ 
             $call['methodName'] = new Value($req->method(), 'string');
             $numParams = $req->getNumParams();
             $params = array();
-            for ($i = 0; $i < $numParams; $i++) {
+            for ($i = 0; $i<$numParams; $i++) {
                 $params[$i] = $req->getParam($i);
             }
             $call['params'] = new Value($params, 'array');
@@ -1330,15 +1330,15 @@ 
         } elseif ($this->return_type == 'phpvals') {
             /// @todo test this code branch...
             if (!is_array($rets)) {
-                return false;       // bad return type from system.multicall
+                return false; // bad return type from system.multicall
             }
             $numRets = count($rets);
             if ($numRets != count($reqs)) {
-                return false;       // wrong number of return values.
+                return false; // wrong number of return values.
             }
 
             $response = array();
-            for ($i = 0; $i < $numRets; $i++) {
+            for ($i = 0; $i<$numRets; $i++) {
                 $val = $rets[$i];
                 if (!is_array($val)) {
                     return false;
@@ -1346,7 +1346,7 @@ 
                 switch (count($val)) {
                     case 1:
                         if (!isset($val[0])) {
-                            return false;       // Bad value
+                            return false; // Bad value
                         }
                         // Normal return value
                         $response[$i] = new Response($val[0], 0, '', 'phpvals');
@@ -1372,11 +1372,11 @@ 
         } else {
             // return type == 'xmlrpcvals'
             if ($rets->kindOf() != 'array') {
-                return false;       // bad return type from system.multicall
+                return false; // bad return type from system.multicall
             }
             $numRets = $rets->count();
             if ($numRets != count($reqs)) {
-                return false;       // wrong number of return values.
+                return false; // wrong number of return values.
             }
 
             $response = array();
@@ -1384,7 +1384,7 @@ 
                 switch ($val->kindOf()) {
                     case 'array':
                         if ($val->count() != 1) {
-                            return false;       // Bad value
+                            return false; // Bad value
                         }
                         // Normal return value
                         $response[] = new Response($val[0]);

demo/client/parallel.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Encoder;
 use PhpXmlRpc\Client;
@@ -24,7 +24,7 @@ 
         $handles = array();
         $curl = curl_multi_init();
 
-        foreach($requests as $k => $req) {
+        foreach ($requests as $k => $req) {
             $req->setDebug($this->debug);
 
             $handle = $this->prepareCurlHandle(
@@ -57,19 +57,19 @@ 
         $running = 0;
         do {
             curl_multi_exec($curl, $running);
-        } while($running > 0);
+        } while ($running>0);
 
         $responses = array();
-        foreach($handles as $k => $h) {
+        foreach ($handles as $k => $h) {
             $responses[$k] = curl_multi_getcontent($handles[$k]);
 
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $message = "---CURL INFO---\n";
                 foreach (curl_getinfo($h) as $name => $val) {
                     if (is_array($val)) {
                         $val = implode("\n", $val);
                     }
-                    $message .= $name . ': ' . $val . "\n";
+                    $message .= $name.': '.$val."\n";
                 }
                 $message .= '---END---';
                 $this->getLogger()->debugMessage($message);
@@ -80,9 +80,9 @@ 
         }
         curl_multi_close($curl);
 
-        foreach($responses as $k => $resp) {
+        foreach ($responses as $k => $resp) {
             if (!$resp) {
-                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             } else {
                 $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type);
             }
@@ -99,7 +99,7 @@ 
 $value = $encoder->encode($data, array('auto_dates'));
 $req = new Request('interopEchoTests.echoValue', array($value));
 $reqs = array();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $reqs[] = $req;
 }
 
@@ -114,18 +114,18 @@ 
 
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
-echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n";
+$t = microtime(true)-$t;
+echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n";
 flush();
 
 $t = microtime(true);
 $resp = $client->sendParallel($reqs);
-$t = microtime(true) - $t;
-echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n";
+$t = microtime(true)-$t;
+echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n";
 flush();
 
 $client->no_multicall = false;
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
-echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n";
+$t = microtime(true)-$t;
+echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n";