gggeek / phpxmlrpc

src/Helper/Charset.php

Spacing +20 added lines, -20 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
                         } else {
                             $escapedData .= $ch;
                         }
-                    }
-                    else if ($ii < 128) {
+                    } else if ($ii < 128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {

src/Client.php

Spacing +63 added lines, -63 removed lines

@@ -151,10 +151,10 @@ 
             $server = $parts['host'];
             $path = isset($parts['path']) ? $parts['path'] : '';
             if (isset($parts['query'])) {
-                $path .= '?' . $parts['query'];
+                $path .= '?'.$parts['query'];
             }
             if (isset($parts['fragment'])) {
-                $path .= '#' . $parts['fragment'];
+                $path .= '#'.$parts['fragment'];
             }
             if (isset($parts['port'])) {
                 $port = $parts['port'];
@@ -170,7 +170,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -208,7 +208,7 @@ 
         }*/
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -581,7 +581,7 @@ 
      */
     protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
-        $method='http')
+        $method = 'http')
     {
         //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
 
@@ -613,7 +613,7 @@ 
      * @param int $sslVersion
      * @return Response
      */
-    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '',  $password = '',
+    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
         $sslVersion = 0)
@@ -650,11 +650,11 @@ 
      */
     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)
     {
         if ($port == 0) {
-            $port = ( $method === 'https' ) ? 443 : 80;
+            $port = ($method === 'https') ? 443 : 80;
         }
 
         // Only create the payload if it was not created previously
@@ -684,15 +684,15 @@ 
         // thanks to Grant Rauscher <grant7@firstworld.net> for this
         $credentials = '';
         if ($username != '') {
-            $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
             if ($authType != 1) {
-                $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 = '';
@@ -703,17 +703,17 @@ 
             $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;
             $connectPort = $port;
-            $transport = ( $method === 'https' ) ? 'tls' : 'tcp';
+            $transport = ($method === 'https') ? 'tls' : 'tcp';
             $uri = $this->path;
         }
 
@@ -723,45 +723,45 @@ 
             $version = '';
             foreach ($this->cookies as $name => $cookie) {
                 if ($cookie['version']) {
-                    $version = ' $Version="' . $cookie['version'] . '";';
-                    $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";';
+                    $version = ' $Version="'.$cookie['version'].'";';
+                    $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";';
                     if ($cookie['path']) {
-                        $cookieHeader .= ' $Path="' . $cookie['path'] . '";';
+                        $cookieHeader .= ' $Path="'.$cookie['path'].'";';
                     }
                     if ($cookie['domain']) {
-                        $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";';
+                        $cookieHeader .= ' $Domain="'.$cookie['domain'].'";';
                     }
                     if ($cookie['port']) {
-                        $cookieHeader .= ' $Port="' . $cookie['port'] . '";';
+                        $cookieHeader .= ' $Port="'.$cookie['port'].'";';
                     }
                 } else {
-                    $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
+                    $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
                 }
             }
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
-            $port =  '';
+            $port = '';
         } else {
-            $port = ':' . $port;
+            $port = ':'.$port;
         }
 
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $this->user_agent . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
-            $cookieHeader .
-            'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$this->user_agent."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
+            $cookieHeader.
+            'Content-Type: '.$req->content_type."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---");
         }
 
@@ -787,7 +787,7 @@ 
         }
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -799,7 +799,7 @@ 
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($timeout > 0) {
+            if ($timeout>0) {
                 stream_set_timeout($fp, $timeout);
             }
         } else {
@@ -807,8 +807,8 @@ 
                 $err = error_get_last();
                 $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;
         }
@@ -915,7 +915,7 @@ 
             $encodingHdr = '';
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
@@ -925,7 +925,7 @@ 
             } else {
                 $protocol = $method;
             }
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = $curl;
             }
@@ -936,7 +936,7 @@ 
         // results into variable
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             curl_setopt($curl, CURLOPT_VERBOSE, true);
             /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered
         }
@@ -961,7 +961,7 @@ 
             }
         }
         // extra headers
-        $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+        $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));
         // if no keepalive is wanted, let the server know it in advance
         if (!$keepAlive) {
             $headers[] = 'Connection: close';
@@ -978,7 +978,7 @@ 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($timeout) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);
         }
 
         if ($method == 'http10') {
@@ -988,11 +988,11 @@ 
         }
 
         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');
             }
         }
 
@@ -1034,13 +1034,13 @@ 
             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');
                 }
             }
         }
@@ -1050,7 +1050,7 @@ 
         if (count($this->cookies)) {
             $cookieHeader = '';
             foreach ($this->cookies as $name => $cookie) {
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
             }
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
         }
@@ -1061,13 +1061,13 @@ 
 
         $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);
@@ -1077,7 +1077,7 @@ 
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             curl_close($curl);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = null;
@@ -1187,7 +1187,7 @@ 
             $call['methodName'] = new Value($req->method(), 'string');
             $numParams = $req->getNumParams();
             $params = array();
-            for ($i = 0; $i < $numParams; $i++) {
+            for ($i = 0; $i<$numParams; $i++) {
                 $params[$i] = $req->getParam($i);
             }
             $call['params'] = new Value($params, 'array');
@@ -1213,15 +1213,15 @@ 
             /// @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;
@@ -1229,7 +1229,7 @@ 
                 switch (count($val)) {
                     case 1:
                         if (!isset($val[0])) {
-                            return false;       // Bad value
+                            return false; // Bad value
                         }
                         // Normal return value
                         $response[$i] = new Response($val[0], 0, '', 'phpvals');
@@ -1257,19 +1257,19 @@ 
 
             $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();
-            foreach($rets as $val) {
+            foreach ($rets as $val) {
                 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]);

src/Request.php

Spacing +17 added lines, -17 removed lines

@@ -88,9 +88,9 @@ 
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -110,16 +110,16 @@ 
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -246,7 +246,7 @@ 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -255,7 +255,7 @@ 
             $httpParser = new Http();
             try {
                 $this->httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug);
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 $r = new Response(0, $e->getCode(), $e->getMessage());
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
@@ -274,7 +274,7 @@ 
         // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -285,9 +285,9 @@ 
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
             }
         }
 
@@ -315,7 +315,7 @@ 
                     if (extension_loaded('mbstring')) {
                         $data = mb_convert_encoding($data, 'UTF-8', $respEncoding);
                     } 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);
                     }
                 }
             }
@@ -336,12 +336,12 @@ 
         $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
 
         // first error check: xml not well formed
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
 
             // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_return'],
-                PhpXmlRpc::$xmlrpcstr['invalid_return'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_return'].' '.$xmlRpcParser->_xh['isf_reason']);
 
             if ($this->debug) {
                 print $xmlRpcParser->_xh['isf_reason'];
@@ -350,7 +350,7 @@ 
         // second error check: xml well formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_return'],
-                PhpXmlRpc::$xmlrpcstr['invalid_return'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_return'].' '.$xmlRpcParser->_xh['isf_reason']);
 
             if ($this->debug) {
                 /// @todo echo something for user?
@@ -365,7 +365,7 @@ 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_return'],
                 PhpXmlRpc::$xmlrpcstr['invalid_return']);
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debugMessage(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );

src/Value.php

Spacing +16 added lines, -16 removed lines

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

src/Server.php

Spacing +52 added lines, -52 removed lines

@@ -203,7 +203,7 @@ 
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -215,7 +215,7 @@ 
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -234,10 +234,10 @@ 
         // user debug info should be encoded by the end user using the INTERNAL_ENCODING
         $out = '';
         if ($this->debug_info != '') {
-            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
+            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
         }
         if (static::$_xmlrpc_debuginfo != '') {
-            $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
+            $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
             // NB: a better solution MIGHT be to use CDATA, but we need to insert it
             // into return payload AFTER the beginning tag
             //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
@@ -267,8 +267,8 @@ 
         $this->debug_info = '';
 
         // Save what we received, before parsing it
-        if ($this->debug > 1) {
-            $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
+        if ($this->debug>1) {
+            $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
         }
 
         $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -280,21 +280,21 @@ 
         // save full body of request into response, for more debugging usages
         $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;
@@ -303,7 +303,7 @@ 
         // if we get a warning/error that has output some text before here, then we cannot
         // add a new header. We cannot say we are sending xml, either...
         if (!headers_sent()) {
-            header('Content-Type: ' . $r->content_type);
+            header('Content-Type: '.$r->content_type);
             // we do not know if client actually told us an accepted charset, but if he did
             // we have to tell him what we did
             header("Vary: Accept-Charset");
@@ -332,10 +332,10 @@ 
             // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
             // responses up to 8000 bytes
             if ($phpNoSelfCompress) {
-                header('Content-Length: ' . (int)strlen($payload));
+                header('Content-Length: '.(int) strlen($payload));
             }
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
         }
 
         print $payload;
@@ -390,9 +390,9 @@ 
             $numParams = count($in);
         }
         foreach ($sigs as $curSig) {
-            if (count($curSig) == $numParams + 1) {
+            if (count($curSig) == $numParams+1) {
                 $itsOK = 1;
-                for ($n = 0; $n < $numParams; $n++) {
+                for ($n = 0; $n<$numParams; $n++) {
                     if (is_object($in)) {
                         $p = $in->getParam($n);
                         if ($p->kindOf() == 'scalar') {
@@ -405,10 +405,10 @@ 
                     }
 
                     // param index is $n+1, as first member of sig is return type
-                    if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
+                    if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
                         $itsOK = 0;
-                        $pno = $n + 1;
-                        $wanted = $curSig[$n + 1];
+                        $pno = $n+1;
+                        $wanted = $curSig[$n+1];
                         $got = $pt;
                         break;
                     }
@@ -435,10 +435,10 @@ 
         // check if $_SERVER is populated: it might have been disabled via ini file
         // (this is true even when in CLI mode)
         if (count($_SERVER) == 0) {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             if (function_exists('getallheaders')) {
                 $this->debugmsg(''); // empty line
                 foreach (getallheaders() as $name => $val) {
@@ -460,13 +460,13 @@ 
                 if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
                     if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } else {
                         $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], PhpXmlRpc::$xmlrpcstr['server_decompress_fail']);
@@ -556,7 +556,7 @@ 
                     if (extension_loaded('mbstring')) {
                         $data = mb_convert_encoding($data, 'UTF-8', $reqEncoding);
                     } 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);
                     }
                 }
             }
@@ -575,16 +575,16 @@ 
 
         $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 + $matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+$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
@@ -595,20 +595,20 @@ 
                     ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
                 )
             ) {
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
                 }
                 $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
             } else {
                 // build a Request object with data parsed from xml
                 $req = new Request($xmlRpcParser->_xh['method']);
                 // now add parameters in
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
 
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
                 }
                 $r = $this->execute($req);
             }
@@ -661,7 +661,7 @@ 
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": ${errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": ${errStr}"
                 );
             }
         }
@@ -674,7 +674,7 @@ 
 
         if (is_array($func)) {
             if (is_object($func[0])) {
-                $funcName = get_class($func[0]) . '->' . $func[1];
+                $funcName = get_class($func[0]).'->'.$func[1];
             } else {
                 $funcName = implode('::', $func);
             }
@@ -686,17 +686,17 @@ 
 
         // verify that function to be invoked is in fact callable
         if (!is_callable($func)) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
             return new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['server_error'],
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
             );
         }
 
         // If debug level is 3, we should catch all errors generated during
         // processing of user function, and log them as part of response
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
         }
 
@@ -709,14 +709,14 @@ 
                     $r = call_user_func($func, $req);
                 }
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
                     if (is_a($r, 'PhpXmlRpc\Value')) {
                         $r = new Response($r);
                     } else {
                         $r = new Response(
                             0,
                             PhpXmlRpc::$xmlrpcerr['server_error'],
-                            PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
+                            PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
                         );
                     }
                 }
@@ -732,7 +732,7 @@ 
                         // mimic EPI behaviour: if we get an array that looks like an error, make it
                         // an error response
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
-                            $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
+                            $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
                         } else {
                             // functions using EPI api should NOT return resp objects,
                             // so make sure we encode the return type correctly
@@ -756,7 +756,7 @@ 
             // in the called function, we wrap it in a 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 {
@@ -771,7 +771,7 @@ 
                     $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']);
             }
         }
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             // note: restore the error handler we found before calling the
             // user func, even if it has been changed inside the func itself
             if (self::$_xmlrpcs_prev_ehandler) {
@@ -791,7 +791,7 @@ 
      */
     protected function debugmsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -801,9 +801,9 @@ 
     protected function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n";
+            return "<?xml version=\"1.0\"?".">\n";
         }
     }
 
@@ -1055,12 +1055,12 @@ 
         }
 
         $req = new Request($methName->scalarval());
-        foreach($params as $i => $param) {
+        foreach ($params as $i => $param) {
             if (!$req->addParam($param)) {
                 $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));
             }
         }
 
@@ -1132,12 +1132,12 @@ 
         // let accept a plain list of php parameters, beside a single xmlrpc msg object
         if (is_object($req)) {
             $calls = $req->getParam(0);
-            foreach($calls as $call) {
+            foreach ($calls as $call) {
                 $result[] = static::_xmlrpcs_multicall_do_call($server, $call);
             }
         } 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]);
             }
         }