Inspection of "more WIP on the manual and php comments" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( c32e95...287ad6 )

by Gaetano

created 2023-01-02 16:52 UTC

Status

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Webservice wrapper demo</title></head>
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
 $resp = $client->send(new PhpXmlRpc\Request('system.listMethods'));
 if ($resp->faultCode()) {
-    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n");
+    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n");
 } else {
     output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n");
     flush();
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
         if ($methodName == 'examples.getStateName') {
             $callable = $wrapper->wrapXmlrpcMethod($client, $methodName);
             if ($callable) {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n");
             } else {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n");
             }
             break;
         }

Please login to merge, or discard this patch.

demo/client/agesort.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Agesort demo</title></head>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 
 output("This is the input data:<br/><pre>");
 foreach ($inAr as $key => $val) {
-    output($key . ", " . $val . "\n");
+    output($key.", ".$val."\n");
 }
 output("</pre>");
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
     );
 }
 $v = new PhpXmlRpc\Value($p, "array");
-output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n");
+output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n");
 
 // create client and message objects
 $req = new PhpXmlRpc\Request('examples.sortByAge', array($v));
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
     foreach ($value as $struct) {
         $name = $struct["name"];
         $age = $struct["age"];
-        output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n");
+        output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n");
     }
 
-    output("<hr/>For nerds: I got this value back<br/><pre>" .
-        htmlentities($resp->serialize()) . "</pre><hr/>\n");
+    output("<hr/>For nerds: I got this value back<br/><pre>".
+        htmlentities($resp->serialize())."</pre><hr/>\n");
 } else {
     output("An error occurred:<pre>");
-    output("Code: " . htmlspecialchars($resp->faultCode()) .
-        "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>');
+    output("Code: ".htmlspecialchars($resp->faultCode()).
+        "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>');
 }
 
 output("</body></html>\n");

Please login to merge, or discard this patch.

src/Client.php 1 patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -156,10 +156,10 @@  discard block
 block discarded – undo
             $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'];
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
         }*/
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
      */
     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);
 
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
      *
      * @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)
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
      */
     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
@@ -702,15 +702,15 @@  discard block
 block discarded – undo
         // thanks to Grant Rauscher <[email protected]> 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) {
-                $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 = '';
@@ -721,12 +721,12 @@  discard block
 block discarded – undo
             $connectServer = $proxyHost;
             $connectPort = $proxyPort;
             $transport = 'tcp';
-            $uri = 'http://' . $server . ':' . $port . $this->path;
+            $uri = 'http://'.$server.':'.$port.$this->path;
             if ($proxyUsername != '') {
                 if ($proxyAuthType != 1) {
-                    $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;
@@ -741,45 +741,45 @@  discard block
 block discarded – undo
             $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---");
         }
 
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
 
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
         $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);
             }
         } else {
@@ -827,8 +827,8 @@  discard block
 block discarded – undo
                 $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;
         }
@@ -917,18 +917,18 @@  discard block
 block discarded – undo
             $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);
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
             /// @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;
@@ -1008,12 +1008,12 @@  discard block
 block discarded – undo
                     // 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;
             }
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
         // 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
         }
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
             }
         }
         // 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';
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
         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) {
@@ -1088,11 +1088,11 @@  discard block
 block discarded – undo
         }
 
         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) {
-                $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');
             }
         }
 
@@ -1134,13 +1134,13 @@  discard block
 block discarded – undo
             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) {
-                    $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');
                 }
             }
         }
@@ -1150,7 +1150,7 @@  discard block
 block discarded – undo
         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));
         }
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
             $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');
@@ -1284,15 +1284,15 @@  discard block
 block discarded – undo
             /// @todo test this code branch...
             $rets = $result->value();
             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;
@@ -1300,7 +1300,7 @@  discard block
 block discarded – undo
                 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');
@@ -1328,11 +1328,11 @@  discard block
 block discarded – undo
 
             $rets = $result->value();
             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();
@@ -1340,7 +1340,7 @@  discard block
 block discarded – undo
                 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]);

Please login to merge, or discard this patch.

src/Server.php 1 patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

@@ -203,7 +203,7 @@  discard block
 block discarded – undo
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
         // 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";
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
         $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);
@@ -282,21 +282,21 @@  discard block
 block discarded – undo
             $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;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
         // 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 he did
             // we have to tell him what we did
             header("Vary: Accept-Charset");
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
             // 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;
@@ -392,9 +392,9 @@  discard block
 block discarded – undo
             $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') {
@@ -407,10 +407,10 @@  discard block
 block discarded – undo
                     }
 
                     // 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;
                     }
@@ -437,10 +437,10 @@  discard block
 block discarded – undo
         // 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) {
@@ -464,13 +464,13 @@  discard block
 block discarded – undo
                 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'],
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
                     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);
                     }
                 }
             }
@@ -582,18 +582,18 @@  discard block
 block discarded – undo
 
         $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
@@ -604,20 +604,20 @@  discard block
 block discarded – undo
                     ($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);
             }
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
 
         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);
             }
@@ -695,17 +695,17 @@  discard block
 block discarded – undo
 
         // 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'));
         }
 
@@ -718,14 +718,14 @@  discard block
 block discarded – undo
                     $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"
                         );
                     }
                 }
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
                         // 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
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
             // 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 {
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
                     $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) {
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
      */
     protected function debugmsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -810,9 +810,9 @@  discard block
 block discarded – undo
     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";
         }
     }
 
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
                 $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));
             }
         }
 
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
             }
         } 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]);
             }
         }

Please login to merge, or discard this patch.

src/Helper/Http.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -24,12 +24,12 @@  discard block
 block discarded – undo
 
         // read chunk-size, chunk-extension (if any) and crlf
         // get the position of the linebreak
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
+        $chunkEnd = strpos($buffer, "\r\n")+2;
         $temp = substr($buffer, 0, $chunkEnd);
         $chunkSize = hexdec(trim($temp));
         $chunkStart = $chunkEnd;
-        while ($chunkSize > 0) {
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
+        while ($chunkSize>0) {
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
 
             // just in case we got a broken connection
             if ($chunkEnd == false) {
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
             }
 
             // read chunk-data and crlf
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             // append chunk-data to entity-body
             $new .= $chunk;
             // length := length + chunk-size
             $length += strlen($chunk);
             // read chunk-size and crlf
-            $chunkStart = $chunkEnd + 2;
+            $chunkStart = $chunkEnd+2;
 
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
             if ($chunkEnd == false) {
                 break; // just in case we got a broken connection
             }
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             $chunkSize = hexdec(trim($temp));
             $chunkStart = $chunkEnd;
         }
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -131,19 +131,19 @@  discard block
 block discarded – undo
         }
 
         if ($httpResponse['status_code'] !== '200') {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
         foreach ($ar as $line) {
             // take care of multi-line headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $headerName = strtolower(trim($arr[0]));
                 /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
                 ///       passed using multiple header lines.
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
                     foreach ($cookies as $cookie) {
                         // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
                         if (isset($httpResponse['headers'][$headerName])) {
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                         } else {
                             $httpResponse['headers'][$headerName] = trim($cookie);
                         }
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
                 }
             } elseif (isset($headerName)) {
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -241,19 +241,19 @@  discard block
 block discarded – undo
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }

Please login to merge, or discard this patch.

src/Wrapper.php 1 patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -183,20 +183,20 @@  discard block
 block discarded – undo
             $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;
             }
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
         }
 
         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;
         }
 
@@ -253,23 +253,23 @@  discard block
 block discarded – undo
         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?
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
         if ($func->isInternal()) {
             // Note: from PHP 5.1.0 onward, we will possibly 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;
         }
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
         $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++;
         }
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
             // 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']);
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
                 }
             }
             $numPars = $req->getNumParams();
-            if ($numPars < $minPars || $numPars > $maxPars) {
+            if ($numPars<$minPars || $numPars>$maxPars) {
                 return new $responseClass(0, 3, 'Incorrect parameters passed to method');
             }
 
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
 
             $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 {
@@ -503,9 +503,9 @@  discard block
 block discarded – undo
         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) {
@@ -542,8 +542,8 @@  discard block
 block discarded – undo
     {
         $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;
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
         // 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) {
@@ -592,13 +592,13 @@  discard block
 block discarded – undo
         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";
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
         // if ($func->returnsReference())
         //     return false;
 
-        $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}";
+        $code = "function $newFuncName(\$req) {\n".$innerCode."\n}";
 
         return $code;
     }
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
     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)) {
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
         } else {
             $realClassName = $className;
         }
-        return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . "$realClassName.$classMethod";
+        return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod";
     }
 
     /**
@@ -770,21 +770,21 @@  discard block
 block discarded – undo
     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;
         }
 
@@ -794,8 +794,8 @@  discard block
 block discarded – undo
             $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;
         }
 
@@ -812,11 +812,11 @@  discard block
 block discarded – undo
     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 = '';
@@ -851,10 +851,10 @@  discard block
 block discarded – undo
         $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'];
@@ -863,9 +863,9 @@  discard block
 block discarded – undo
             }
 
             $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();
@@ -937,13 +937,13 @@  discard block
 block discarded – undo
      *
      * @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;
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
         $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);
@@ -971,7 +971,7 @@  discard block
 block discarded – undo
 
         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";
         }
@@ -980,7 +980,7 @@  discard block
 block discarded – undo
         $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' ||
@@ -996,19 +996,19 @@  discard block
 block discarded – undo
                 }
             }
             $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);
             }
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
             $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);
     }
@@ -1047,23 +1047,23 @@  discard block
 block discarded – undo
     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';
 
         $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;
         } else {
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
                 $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;
             } else {
@@ -1081,8 +1081,8 @@  discard block
 block discarded – undo
                 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';
@@ -1113,20 +1113,20 @@  discard block
 block discarded – undo
                             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 {
@@ -1148,8 +1148,8 @@  discard block
 block discarded – undo
      */
     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)

Please login to merge, or discard this patch.

src/Request.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -92,9 +92,9 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                 // 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 @@  discard block
 block discarded – undo
         // idea from Luca Mariano <[email protected]> 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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         // 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 @@  discard block
 block discarded – undo
                 '', $this->httpResponse
             );
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debugMessage(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>xmlrpc - Webservice wrapper demo</title></head>
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	$client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
21	21	$resp = $client->send(new PhpXmlRpc\Request('system.listMethods'));
22	22	if ($resp->faultCode()) {
23		- output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n");
	23	+ output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n");
24	24	} else {
25	25	output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n");
26	26	flush();
		@@ -32,9 +32,9 @@ discard block
		block discarded – undo
32	32	if ($methodName == 'examples.getStateName') {
33	33	$callable = $wrapper->wrapXmlrpcMethod($client, $methodName);
34	34	if ($callable) {
35		- output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n");
	35	+ output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n");
36	36	} else {
37		- output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n");
	37	+ output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n");
38	38	}
39	39	break;
40	40	}

		@@ -156,10 +156,10 @@ discard block
		block discarded – undo
156	156	$server = $parts['host'];
157	157	$path = isset($parts['path']) ? $parts['path'] : '';
158	158	if (isset($parts['query'])) {
159		- $path .= '?' . $parts['query'];
	159	+ $path .= '?'.$parts['query'];
160	160	}
161	161	if (isset($parts['fragment'])) {
162		- $path .= '#' . $parts['fragment'];
	162	+ $path .= '#'.$parts['fragment'];
163	163	}
164	164	if (isset($parts['port'])) {
165	165	$port = $parts['port'];
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	}
176	176	}
177	177	if ($path == '' \|\| $path[0] != '/') {
178		- $this->path = '/' . $path;
	178	+ $this->path = '/'.$path;
179	179	} else {
180	180	$this->path = $path;
181	181	}
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	}*/
214	214
215	215	// initialize user_agent string
216		- $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
	216	+ $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
217	217	}
218	218
219	219	/**
		@@ -593,7 +593,7 @@ discard block
		block discarded – undo
593	593	*/
594	594	protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '',
595	595	$authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
596		- $method='http')
	596	+ $method = 'http')
597	597	{
598	598	//trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
599	599
		@@ -626,7 +626,7 @@ discard block
		block discarded – undo
626	626	*
627	627	* @return Response
628	628	*/
629		- protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '',
	629	+ protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '',
630	630	$authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
631	631	$proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
632	632	$sslVersion = 0)
		@@ -666,7 +666,7 @@ discard block
		block discarded – undo
666	666	*/
667	667	protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '',
668	668	$authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
669		- $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '',
	669	+ $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '',
670	670	$sslVersion = 0)
671	671	{
672	672	/// @todo log a warning if passed an unsupported method
		@@ -702,15 +702,15 @@ discard block
		block discarded – undo
702	702	// thanks to Grant Rauscher <[email protected]> for this
703	703	$credentials = '';
704	704	if ($username != '') {
705		- $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
	705	+ $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
706	706	if ($authType != 1) {
707		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
	707	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
708	708	}
709	709	}
710	710
711	711	$acceptedEncoding = '';
712	712	if (is_array($this->accepted_compression) && count($this->accepted_compression)) {
713		- $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
	713	+ $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";
714	714	}
715	715
716	716	$proxyCredentials = '';
		@@ -721,12 +721,12 @@ discard block
		block discarded – undo
721	721	$connectServer = $proxyHost;
722	722	$connectPort = $proxyPort;
723	723	$transport = 'tcp';
724		- $uri = 'http://' . $server . ':' . $port . $this->path;
	724	+ $uri = 'http://'.$server.':'.$port.$this->path;
725	725	if ($proxyUsername != '') {
726	726	if ($proxyAuthType != 1) {
727		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
	727	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
728	728	}
729		- $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n";
	729	+ $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n";
730	730	}
731	731	} else {
732	732	$connectServer = $server;
		@@ -741,45 +741,45 @@ discard block
		block discarded – undo
741	741	$version = '';
742	742	foreach ($this->cookies as $name => $cookie) {
743	743	if ($cookie['version']) {
744		- $version = ' $Version="' . $cookie['version'] . '";';
745		- $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";';
	744	+ $version = ' $Version="'.$cookie['version'].'";';
	745	+ $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";';
746	746	if ($cookie['path']) {
747		- $cookieHeader .= ' $Path="' . $cookie['path'] . '";';
	747	+ $cookieHeader .= ' $Path="'.$cookie['path'].'";';
748	748	}
749	749	if ($cookie['domain']) {
750		- $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";';
	750	+ $cookieHeader .= ' $Domain="'.$cookie['domain'].'";';
751	751	}
752	752	if ($cookie['port']) {
753		- $cookieHeader .= ' $Port="' . $cookie['port'] . '";';
	753	+ $cookieHeader .= ' $Port="'.$cookie['port'].'";';
754	754	}
755	755	} else {
756		- $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
	756	+ $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
757	757	}
758	758	}
759		- $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
	759	+ $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
760	760	}
761	761
762	762	// omit port if default
763	763	if (($port == 80 && in_array($method, array('http', 'http10'))) \|\| ($port == 443 && $method == 'https')) {
764		- $port = '';
	764	+ $port = '';
765	765	} else {
766		- $port = ':' . $port;
	766	+ $port = ':'.$port;
767	767	}
768	768
769		- $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
770		- 'User-Agent: ' . $this->user_agent . "\r\n" .
771		- 'Host: ' . $server . $port . "\r\n" .
772		- $credentials .
773		- $proxyCredentials .
774		- $acceptedEncoding .
775		- $encodingHdr .
776		- 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
777		- $cookieHeader .
778		- 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
779		- strlen($payload) . "\r\n\r\n" .
	769	+ $op = 'POST '.$uri." HTTP/1.0\r\n".
	770	+ 'User-Agent: '.$this->user_agent."\r\n".
	771	+ 'Host: '.$server.$port."\r\n".
	772	+ $credentials.
	773	+ $proxyCredentials.
	774	+ $acceptedEncoding.
	775	+ $encodingHdr.
	776	+ 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
	777	+ $cookieHeader.
	778	+ 'Content-Type: '.$req->content_type."\r\nContent-Length: ".
	779	+ strlen($payload)."\r\n\r\n".
780	780	$payload;
781	781
782		- if ($this->debug > 1) {
	782	+ if ($this->debug>1) {
783	783	$this->getLogger()->debugMessage("---SENDING---\n$op\n---END---");
784	784	}
785	785
		@@ -806,7 +806,7 @@ discard block
		block discarded – undo
806	806
807	807	$context = stream_context_create($contextOptions);
808	808
809		- if ($timeout <= 0) {
	809	+ if ($timeout<=0) {
810	810	$connectTimeout = ini_get('default_socket_timeout');
811	811	} else {
812	812	$connectTimeout = $timeout;
		@@ -818,7 +818,7 @@ discard block
		block discarded – undo
818	818	$fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
819	819	STREAM_CLIENT_CONNECT, $context);
820	820	if ($fp) {
821		- if ($timeout > 0) {
	821	+ if ($timeout>0) {
822	822	stream_set_timeout($fp, $timeout);
823	823	}
824	824	} else {
		@@ -827,8 +827,8 @@ discard block
		block discarded – undo
827	827	$this->errstr = $err['message'];
828	828	}
829	829
830		- $this->errstr = 'Connect error: ' . $this->errstr;
831		- $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
	830	+ $this->errstr = 'Connect error: '.$this->errstr;
	831	+ $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
832	832
833	833	return $r;
834	834	}
		@@ -917,18 +917,18 @@ discard block
		block discarded – undo
917	917	$keyPass, $sslVersion);
918	918
919	919	if (!$curl) {
920		- return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details');
	920	+ return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details');
921	921	}
922	922
923	923	$result = curl_exec($curl);
924	924
925		- if ($this->debug > 1) {
	925	+ if ($this->debug>1) {
926	926	$message = "---CURL INFO---\n";
927	927	foreach (curl_getinfo($curl) as $name => $val) {
928	928	if (is_array($val)) {
929	929	$val = implode("\n", $val);
930	930	}
931		- $message .= $name . ': ' . $val . "\n";
	931	+ $message .= $name.': '.$val."\n";
932	932	}
933	933	$message .= '---END---';
934	934	$this->getLogger()->debugMessage($message);
		@@ -938,7 +938,7 @@ discard block
		block discarded – undo
938	938	/// @todo we should use a better check here - what if we get back '' or '0'?
939	939
940	940	$this->errstr = 'no response';
941		- $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
	941	+ $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
942	942	curl_close($curl);
943	943	if ($keepAlive) {
944	944	$this->xmlrpc_curl_handle = null;
		@@ -1008,12 +1008,12 @@ discard block
		block discarded – undo
1008	1008	// http, https
1009	1009	$protocol = $method;
1010	1010	if (strpos($protocol, ':') !== false) {
1011		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
	1011	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
1012	1012	return false;
1013	1013	}
1014	1014	}
1015	1015	}
1016		- $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path);
	1016	+ $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path);
1017	1017	if (!$curl) {
1018	1018	return false;
1019	1019	}
		@@ -1027,7 +1027,7 @@ discard block
		block discarded – undo
1027	1027	// results into variable
1028	1028	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
1029	1029
1030		- if ($this->debug > 1) {
	1030	+ if ($this->debug>1) {
1031	1031	curl_setopt($curl, CURLOPT_VERBOSE, true);
1032	1032	/// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered
1033	1033	}
		@@ -1052,7 +1052,7 @@ discard block
		block discarded – undo
1052	1052	}
1053	1053	}
1054	1054	// extra headers
1055		- $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
	1055	+ $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));
1056	1056	// if no keepalive is wanted, let the server know it in advance
1057	1057	if (!$keepAlive) {
1058	1058	$headers[] = 'Connection: close';
		@@ -1069,7 +1069,7 @@ discard block
		block discarded – undo
1069	1069	curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
1070	1070	// timeout is borked
1071	1071	if ($timeout) {
1072		- curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
	1072	+ curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);
1073	1073	}
1074	1074
1075	1075	switch ($method) {
		@@ -1088,11 +1088,11 @@ discard block
		block discarded – undo
1088	1088	}
1089	1089
1090	1090	if ($username && $password) {
1091		- curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password);
	1091	+ curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
1092	1092	if (defined('CURLOPT_HTTPAUTH')) {
1093	1093	curl_setopt($curl, CURLOPT_HTTPAUTH, $authType);
1094	1094	} elseif ($authType != 1) {
1095		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
	1095	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
1096	1096	}
1097	1097	}
1098	1098
		@@ -1134,13 +1134,13 @@ discard block
		block discarded – undo
1134	1134	if ($proxyPort == 0) {
1135	1135	$proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080
1136	1136	}
1137		- curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort);
	1137	+ curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort);
1138	1138	if ($proxyUsername) {
1139		- curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword);
	1139	+ curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword);
1140	1140	if (defined('CURLOPT_PROXYAUTH')) {
1141	1141	curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType);
1142	1142	} elseif ($proxyAuthType != 1) {
1143		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
	1143	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1144	1144	}
1145	1145	}
1146	1146	}
		@@ -1150,7 +1150,7 @@ discard block
		block discarded – undo
1150	1150	if (count($this->cookies)) {
1151	1151	$cookieHeader = '';
1152	1152	foreach ($this->cookies as $name => $cookie) {
1153		- $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
	1153	+ $cookieHeader .= $name.'='.$cookie['value'].'; ';
1154	1154	}
1155	1155	curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
1156	1156	}
		@@ -1159,7 +1159,7 @@ discard block
		block discarded – undo
1159	1159	curl_setopt($curl, $opt, $val);
1160	1160	}
1161	1161
1162		- if ($this->debug > 1) {
	1162	+ if ($this->debug>1) {
1163	1163	$this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---");
1164	1164	}
1165	1165
		@@ -1258,7 +1258,7 @@ discard block
		block discarded – undo
1258	1258	$call['methodName'] = new Value($req->method(), 'string');
1259	1259	$numParams = $req->getNumParams();
1260	1260	$params = array();
1261		- for ($i = 0; $i < $numParams; $i++) {
	1261	+ for ($i = 0; $i<$numParams; $i++) {
1262	1262	$params[$i] = $req->getParam($i);
1263	1263	}
1264	1264	$call['params'] = new Value($params, 'array');
		@@ -1284,15 +1284,15 @@ discard block
		block discarded – undo
1284	1284	/// @todo test this code branch...
1285	1285	$rets = $result->value();
1286	1286	if (!is_array($rets)) {
1287		- return false; // bad return type from system.multicall
	1287	+ return false; // bad return type from system.multicall
1288	1288	}
1289	1289	$numRets = count($rets);
1290	1290	if ($numRets != count($reqs)) {
1291		- return false; // wrong number of return values.
	1291	+ return false; // wrong number of return values.
1292	1292	}
1293	1293
1294	1294	$response = array();
1295		- for ($i = 0; $i < $numRets; $i++) {
	1295	+ for ($i = 0; $i<$numRets; $i++) {
1296	1296	$val = $rets[$i];
1297	1297	if (!is_array($val)) {
1298	1298	return false;
		@@ -1300,7 +1300,7 @@ discard block
		block discarded – undo
1300	1300	switch (count($val)) {
1301	1301	case 1:
1302	1302	if (!isset($val[0])) {
1303		- return false; // Bad value
	1303	+ return false; // Bad value
1304	1304	}
1305	1305	// Normal return value
1306	1306	$response[$i] = new Response($val[0], 0, '', 'phpvals');
		@@ -1328,11 +1328,11 @@ discard block
		block discarded – undo
1328	1328
1329	1329	$rets = $result->value();
1330	1330	if ($rets->kindOf() != 'array') {
1331		- return false; // bad return type from system.multicall
	1331	+ return false; // bad return type from system.multicall
1332	1332	}
1333	1333	$numRets = $rets->count();
1334	1334	if ($numRets != count($reqs)) {
1335		- return false; // wrong number of return values.
	1335	+ return false; // wrong number of return values.
1336	1336	}
1337	1337
1338	1338	$response = array();
		@@ -1340,7 +1340,7 @@ discard block
		block discarded – undo
1340	1340	switch ($val->kindOf()) {
1341	1341	case 'array':
1342	1342	if ($val->count() != 1) {
1343		- return false; // Bad value
	1343	+ return false; // Bad value
1344	1344	}
1345	1345	// Normal return value
1346	1346	$response[] = new Response($val[0]);

		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	*/
204	204	public static function xmlrpc_debugmsg($msg)
205	205	{
206		- static::$_xmlrpc_debuginfo .= $msg . "\n";
	206	+ static::$_xmlrpc_debuginfo .= $msg."\n";
207	207	}
208	208
209	209	/**
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	*/
215	215	public static function error_occurred($msg)
216	216	{
217		- static::$_xmlrpcs_occurred_errors .= $msg . "\n";
	217	+ static::$_xmlrpcs_occurred_errors .= $msg."\n";
218	218	}
219	219
220	220	/**
		@@ -235,10 +235,10 @@ discard block
		block discarded – undo
235	235	// user debug info should be encoded by the end user using the INTERNAL_ENCODING
236	236	$out = '';
237	237	if ($this->debug_info != '') {
238		- $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
	238	+ $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
239	239	}
240	240	if (static::$_xmlrpc_debuginfo != '') {
241		- $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
	241	+ $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
242	242	// NB: a better solution MIGHT be to use CDATA, but we need to insert it
243	243	// into return payload AFTER the beginning tag
244	244	//$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
		@@ -267,8 +267,8 @@ discard block
		block discarded – undo
267	267	$this->debug_info = '';
268	268
269	269	// Save what we received, before parsing it
270		- if ($this->debug > 1) {
271		- $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
	270	+ if ($this->debug>1) {
	271	+ $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
272	272	}
273	273
274	274	$r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
		@@ -282,21 +282,21 @@ discard block
		block discarded – undo
282	282	$r->raw_data = $rawData;
283	283	}
284	284
285		- if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
286		- $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
287		- static::$_xmlrpcs_occurred_errors . "+++END+++");
	285	+ if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
	286	+ $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
	287	+ static::$_xmlrpcs_occurred_errors."+++END+++");
288	288	}
289	289
290	290	$payload = $this->xml_header($respCharset);
291		- if ($this->debug > 0) {
292		- $payload = $payload . $this->serializeDebug($respCharset);
	291	+ if ($this->debug>0) {
	292	+ $payload = $payload.$this->serializeDebug($respCharset);
293	293	}
294	294
295	295	// Do not create response serialization if it has already happened. Helps building json magic
296	296	if (empty($r->payload)) {
297	297	$r->serialize($respCharset);
298	298	}
299		- $payload = $payload . $r->payload;
	299	+ $payload = $payload.$r->payload;
300	300
301	301	if ($returnPayload) {
302	302	return $payload;
		@@ -305,7 +305,7 @@ discard block
		block discarded – undo
305	305	// if we get a warning/error that has output some text before here, then we cannot
306	306	// add a new header. We cannot say we are sending xml, either...
307	307	if (!headers_sent()) {
308		- header('Content-Type: ' . $r->content_type);
	308	+ header('Content-Type: '.$r->content_type);
309	309	// we do not know if client actually told us an accepted charset, but if he did
310	310	// we have to tell him what we did
311	311	header("Vary: Accept-Charset");
		@@ -334,10 +334,10 @@ discard block
		block discarded – undo
334	334	// Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
335	335	// responses up to 8000 bytes
336	336	if ($phpNoSelfCompress) {
337		- header('Content-Length: ' . (int)strlen($payload));
	337	+ header('Content-Length: '.(int) strlen($payload));
338	338	}
339	339	} else {
340		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
	340	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
341	341	}
342	342
343	343	print $payload;
		@@ -392,9 +392,9 @@ discard block
		block discarded – undo
392	392	$numParams = count($in);
393	393	}
394	394	foreach ($sigs as $curSig) {
395		- if (count($curSig) == $numParams + 1) {
	395	+ if (count($curSig) == $numParams+1) {
396	396	$itsOK = 1;
397		- for ($n = 0; $n < $numParams; $n++) {
	397	+ for ($n = 0; $n<$numParams; $n++) {
398	398	if (is_object($in)) {
399	399	$p = $in->getParam($n);
400	400	if ($p->kindOf() == 'scalar') {
		@@ -407,10 +407,10 @@ discard block
		block discarded – undo
407	407	}
408	408
409	409	// param index is $n+1, as first member of sig is return type
410		- if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
	410	+ if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
411	411	$itsOK = 0;
412		- $pno = $n + 1;
413		- $wanted = $curSig[$n + 1];
	412	+ $pno = $n+1;
	413	+ $wanted = $curSig[$n+1];
414	414	$got = $pt;
415	415	break;
416	416	}
		@@ -437,10 +437,10 @@ discard block
		block discarded – undo
437	437	// check if $_SERVER is populated: it might have been disabled via ini file
438	438	// (this is true even when in CLI mode)
439	439	if (count($_SERVER) == 0) {
440		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
	440	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
441	441	}
442	442
443		- if ($this->debug > 1) {
	443	+ if ($this->debug>1) {
444	444	if (function_exists('getallheaders')) {
445	445	$this->debugmsg(''); // empty line
446	446	foreach (getallheaders() as $name => $val) {
		@@ -464,13 +464,13 @@ discard block
		block discarded – undo
464	464	if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
465	465	if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
466	466	$data = $degzdata;
467		- if ($this->debug > 1) {
468		- $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	467	+ if ($this->debug>1) {
	468	+ $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
469	469	}
470	470	} elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
471	471	$data = $degzdata;
472		- if ($this->debug > 1) {
473		- $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	472	+ if ($this->debug>1) {
	473	+ $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
474	474	}
475	475	} else {
476	476	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
		@@ -563,7 +563,7 @@ discard block
		block discarded – undo
563	563	if ($reqEncoding == 'ISO-8859-1') {
564	564	$data = utf8_encode($data);
565	565	} else {
566		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
	566	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
567	567	}
568	568	}
569	569	}
		@@ -582,18 +582,18 @@ discard block
		block discarded – undo
582	582
583	583	$xmlRpcParser = $this->getParser();
584	584	$xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options);
585		- if ($xmlRpcParser->_xh['isf'] > 2) {
	585	+ if ($xmlRpcParser->_xh['isf']>2) {
586	586	// (BC) we return XML error as a faultCode
587	587	preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
588	588	$r = new Response(
589	589	0,
590		- PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
	590	+ PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
591	591	$xmlRpcParser->_xh['isf_reason']);
592	592	} elseif ($xmlRpcParser->_xh['isf']) {
593	593	$r = new Response(
594	594	0,
595	595	PhpXmlRpc::$xmlrpcerr['invalid_request'],
596		- PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
	596	+ PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']);
597	597	} else {
598	598	// small layering violation in favor of speed and memory usage:
599	599	// we should allow the 'execute' method handle this, but in the
		@@ -604,20 +604,20 @@ discard block
		block discarded – undo
604	604	($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
605	605	)
606	606	) {
607		- if ($this->debug > 1) {
608		- $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
	607	+ if ($this->debug>1) {
	608	+ $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
609	609	}
610	610	$r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
611	611	} else {
612	612	// build a Request object with data parsed from xml
613	613	$req = new Request($xmlRpcParser->_xh['method']);
614	614	// now add parameters in
615		- for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
	615	+ for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
616	616	$req->addParam($xmlRpcParser->_xh['params'][$i]);
617	617	}
618	618
619		- if ($this->debug > 1) {
620		- $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
	619	+ if ($this->debug>1) {
	620	+ $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
621	621	}
622	622	$r = $this->execute($req);
623	623	}
		@@ -670,7 +670,7 @@ discard block
		block discarded – undo
670	670	return new Response(
671	671	0,
672	672	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
673		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
	673	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
674	674	);
675	675	}
676	676	}
		@@ -683,7 +683,7 @@ discard block
		block discarded – undo
683	683
684	684	if (is_array($func)) {
685	685	if (is_object($func[0])) {
686		- $funcName = get_class($func[0]) . '->' . $func[1];
	686	+ $funcName = get_class($func[0]).'->'.$func[1];
687	687	} else {
688	688	$funcName = implode('::', $func);
689	689	}
		@@ -695,17 +695,17 @@ discard block
		block discarded – undo
695	695
696	696	// verify that function to be invoked is in fact callable
697	697	if (!is_callable($func)) {
698		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
	698	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
699	699	return new Response(
700	700	0,
701	701	PhpXmlRpc::$xmlrpcerr['server_error'],
702		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
	702	+ PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
703	703	);
704	704	}
705	705
706	706	// If debug level is 3, we should catch all errors generated during
707	707	// processing of user function, and log them as part of response
708		- if ($this->debug > 2) {
	708	+ if ($this->debug>2) {
709	709	self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
710	710	}
711	711
		@@ -718,14 +718,14 @@ discard block
		block discarded – undo
718	718	$r = call_user_func($func, $req);
719	719	}
720	720	if (!is_a($r, 'PhpXmlRpc\Response')) {
721		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
	721	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
722	722	if (is_a($r, 'PhpXmlRpc\Value')) {
723	723	$r = new Response($r);
724	724	} else {
725	725	$r = new Response(
726	726	0,
727	727	PhpXmlRpc::$xmlrpcerr['server_error'],
728		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
	728	+ PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
729	729	);
730	730	}
731	731	}
		@@ -741,7 +741,7 @@ discard block
		block discarded – undo
741	741	// mimic EPI behaviour: if we get an array that looks like an error, make it
742	742	// an error response
743	743	if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
744		- $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
	744	+ $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
745	745	} else {
746	746	// functions using EPI api should NOT return resp objects,
747	747	// so make sure we encode the return type correctly
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	// proper error-response
765	765	switch ($this->exception_handling) {
766	766	case 2:
767		- if ($this->debug > 2) {
	767	+ if ($this->debug>2) {
768	768	if (self::$_xmlrpcs_prev_ehandler) {
769	769	set_error_handler(self::$_xmlrpcs_prev_ehandler);
770	770	} else {
		@@ -779,7 +779,7 @@ discard block
		block discarded – undo
779	779	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']);
780	780	}
781	781	}
782		- if ($this->debug > 2) {
	782	+ if ($this->debug>2) {
783	783	// note: restore the error handler we found before calling the
784	784	// user func, even if it has been changed inside the func itself
785	785	if (self::$_xmlrpcs_prev_ehandler) {
		@@ -799,7 +799,7 @@ discard block
		block discarded – undo
799	799	*/
800	800	protected function debugmsg($string)
801	801	{
802		- $this->debug_info .= $string . "\n";
	802	+ $this->debug_info .= $string."\n";
803	803	}
804	804
805	805	/**
		@@ -810,9 +810,9 @@ discard block
		block discarded – undo
810	810	protected function xml_header($charsetEncoding = '')
811	811	{
812	812	if ($charsetEncoding != '') {
813		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
	813	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
814	814	} else {
815		- return "<?xml version=\"1.0\"?" . ">\n";
	815	+ return "<?xml version=\"1.0\"?".">\n";
816	816	}
817	817	}
818	818
		@@ -1090,7 +1090,7 @@ discard block
		block discarded – undo
1090	1090	$i++; // for error message, we count params from 1
1091	1091	return static::_xmlrpcs_multicall_error(new Response(0,
1092	1092	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1093		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
	1093	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1094	1094	}
1095	1095	}
1096	1096
		@@ -1173,7 +1173,7 @@ discard block
		block discarded – undo
1173	1173	}
1174	1174	} else {
1175	1175	$numCalls = count($req);
1176		- for ($i = 0; $i < $numCalls; $i++) {
	1176	+ for ($i = 0; $i<$numCalls; $i++) {
1177	1177	$result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1178	1178	}
1179	1179	}

		@@ -24,12 +24,12 @@ discard block
		block discarded – undo
24	24
25	25	// read chunk-size, chunk-extension (if any) and crlf
26	26	// get the position of the linebreak
27		- $chunkEnd = strpos($buffer, "\r\n") + 2;
	27	+ $chunkEnd = strpos($buffer, "\r\n")+2;
28	28	$temp = substr($buffer, 0, $chunkEnd);
29	29	$chunkSize = hexdec(trim($temp));
30	30	$chunkStart = $chunkEnd;
31		- while ($chunkSize > 0) {
32		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
	31	+ while ($chunkSize>0) {
	32	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
33	33
34	34	// just in case we got a broken connection
35	35	if ($chunkEnd == false) {
		@@ -41,19 +41,19 @@ discard block
		block discarded – undo
41	41	}
42	42
43	43	// read chunk-data and crlf
44		- $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	44	+ $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
45	45	// append chunk-data to entity-body
46	46	$new .= $chunk;
47	47	// length := length + chunk-size
48	48	$length += strlen($chunk);
49	49	// read chunk-size and crlf
50		- $chunkStart = $chunkEnd + 2;
	50	+ $chunkStart = $chunkEnd+2;
51	51
52		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
	52	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
53	53	if ($chunkEnd == false) {
54	54	break; // just in case we got a broken connection
55	55	}
56		- $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	56	+ $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
57	57	$chunkSize = hexdec(trim($temp));
58	58	$chunkStart = $chunkEnd;
59	59	}
		@@ -83,11 +83,11 @@ discard block
		block discarded – undo
83	83	// Look for CR/LF or simple LF as line separator (even though it is not valid http)
84	84	$pos = strpos($data, "\r\n\r\n");
85	85	if ($pos \|\| is_int($pos)) {
86		- $bd = $pos + 4;
	86	+ $bd = $pos+4;
87	87	} else {
88	88	$pos = strpos($data, "\n\n");
89	89	if ($pos \|\| is_int($pos)) {
90		- $bd = $pos + 2;
	90	+ $bd = $pos+2;
91	91	} else {
92	92	// No separation between response headers and body: fault?
93	93	$bd = 0;
		@@ -97,8 +97,8 @@ discard block
		block discarded – undo
97	97	// this filters out all http headers from proxy. maybe we could take them into account, too?
98	98	$data = substr($data, $bd);
99	99	} else {
100		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
101		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
	100	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
	101	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
102	102	}
103	103	}
104	104
		@@ -131,19 +131,19 @@ discard block
		block discarded – undo
131	131	}
132	132
133	133	if ($httpResponse['status_code'] !== '200') {
134		- $errstr = substr($data, 0, strpos($data, "\n") - 1);
135		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
136		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
	134	+ $errstr = substr($data, 0, strpos($data, "\n")-1);
	135	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
	136	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
137	137	}
138	138
139	139	// be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
140	140	$pos = strpos($data, "\r\n\r\n");
141	141	if ($pos \|\| is_int($pos)) {
142		- $bd = $pos + 4;
	142	+ $bd = $pos+4;
143	143	} else {
144	144	$pos = strpos($data, "\n\n");
145	145	if ($pos \|\| is_int($pos)) {
146		- $bd = $pos + 2;
	146	+ $bd = $pos+2;
147	147	} else {
148	148	// No separation between response headers and body: fault?
149	149	// we could take some action here instead of going on...
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	foreach ($ar as $line) {
158	158	// take care of multi-line headers and cookies
159	159	$arr = explode(':', $line, 2);
160		- if (count($arr) > 1) {
	160	+ if (count($arr)>1) {
161	161	$headerName = strtolower(trim($arr[0]));
162	162	/// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
163	163	/// passed using multiple header lines.
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	foreach ($cookies as $cookie) {
175	175	// glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
176	176	if (isset($httpResponse['headers'][$headerName])) {
177		- $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
	177	+ $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
178	178	} else {
179	179	$httpResponse['headers'][$headerName] = trim($cookie);
180	180	}
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	}
204	204	} elseif (isset($headerName)) {
205	205	/// @todo version1 cookies might span multiple lines, thus breaking the parsing above
206		- $httpResponse['headers'][$headerName] .= ' ' . trim($line);
	206	+ $httpResponse['headers'][$headerName] .= ' '.trim($line);
207	207	}
208	208	}
209	209
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	// Decode chunked encoding sent by http 1.1 servers
227	227	if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
228	228	if (!$data = static::decodeChunked($data)) {
229		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
	229	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
230	230	throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
231	231	}
232	232	}
		@@ -241,19 +241,19 @@ discard block
		block discarded – undo
241	241	if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
242	242	$data = $degzdata;
243	243	if ($debug) {
244		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	244	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
245	245	}
246	246	} elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
247	247	$data = $degzdata;
248	248	if ($debug) {
249		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	249	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
250	250	}
251	251	} else {
252		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
	252	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
253	253	throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
254	254	}
255	255	} else {
256		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
	256	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
257	257	throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
258	258	}
259	259	}

		@@ -92,9 +92,9 @@ discard block
		block discarded – undo
92	92	public function xml_header($charsetEncoding = '')
93	93	{
94	94	if ($charsetEncoding != '') {
95		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
	95	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
96	96	} else {
97		- return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
	97	+ return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
98	98	}
99	99	}
100	100
		@@ -116,16 +116,16 @@ discard block
		block discarded – undo
116	116	public function createPayload($charsetEncoding = '')
117	117	{
118	118	if ($charsetEncoding != '') {
119		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	119	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
120	120	} else {
121	121	$this->content_type = 'text/xml';
122	122	}
123	123	$this->payload = $this->xml_header($charsetEncoding);
124		- $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
125		- $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
	124	+ $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
	125	+ $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
126	126	$this->payload .= "<params>\n";
127	127	foreach ($this->params as $p) {
128		- $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
	128	+ $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
129	129	"</param>\n";
130	130	}
131	131	$this->payload .= "</params>\n";
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	$this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
254	254
255	255	if ($data == '') {
256		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
	256	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
257	257	return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
258	258	}
259	259
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	// failed processing of HTTP response headers
267	267	// save into response obj the full payload received, for debugging
268	268	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
269		- } catch(\Exception $e) {
	269	+ } catch (\Exception $e) {
270	270	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
271	271	}
272	272	}
		@@ -280,7 +280,7 @@ discard block
		block discarded – undo
280	280	// idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
281	281	$pos = strrpos($data, '</methodResponse>');
282	282	if ($pos !== false) {
283		- $data = substr($data, 0, $pos + 17);
	283	+ $data = substr($data, 0, $pos+17);
284	284	}
285	285
286	286	// try to 'guestimate' the character encoding of the received response
		@@ -294,9 +294,9 @@ discard block
		block discarded – undo
294	294	if ($start) {
295	295	$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
296	296	$end = strpos($data, '-->', $start);
297		- $comments = substr($data, $start, $end - $start);
298		- $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
299		- str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
	297	+ $comments = substr($data, $start, $end-$start);
	298	+ $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
	299	+ str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
300	300	}
301	301	}
302	302
		@@ -318,7 +318,7 @@ discard block
		block discarded – undo
318	318	if ($respEncoding == 'ISO-8859-1') {
319	319	$data = utf8_encode($data);
320	320	} else {
321		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
	321	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
322	322	}
323	323	}
324	324	}
		@@ -339,12 +339,12 @@ discard block
		block discarded – undo
339	339	$xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
340	340
341	341	// first error check: xml not well-formed
342		- if ($xmlRpcParser->_xh['isf'] > 2) {
	342	+ if ($xmlRpcParser->_xh['isf']>2) {
343	343
344	344	// BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
345	345
346	346	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
347		- PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	347	+ PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
348	348	$this->httpResponse
349	349	);
350	350
		@@ -355,7 +355,7 @@ discard block
		block discarded – undo
355	355	// second error check: xml well-formed but not xml-rpc compliant
356	356	elseif ($xmlRpcParser->_xh['isf'] == 2) {
357	357	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
358		- PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	358	+ PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
359	359	$this->httpResponse
360	360	);
361	361
		@@ -371,7 +371,7 @@ discard block
		block discarded – undo
371	371	'', $this->httpResponse
372	372	);
373	373	} else {
374		- if ($this->debug > 1) {
	374	+ if ($this->debug>1) {
375	375	$this->getLogger()->debugMessage(
376	376	"---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
377	377	);

gggeek / phpxmlrpc

Push — master ( c32e95...287ad6 )

Status

Category

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch