gggeek / phpxmlrpc

src/Client.php

Spacing +106 added lines, -106 removed lines

@@ -335,10 +335,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'];
@@ -354,7 +354,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -386,7 +386,7 @@ 
         //$this->accepted_charset_encodings = $ch->knownCharsets();
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -558,7 +558,7 @@ 
      */
     public function setSSLVerifyPeer($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifypeer = $i;
         return $this;
@@ -575,7 +575,7 @@ 
      */
     public function setSSLVerifyHost($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifyhost = $i;
         return $this;
@@ -590,7 +590,7 @@ 
      */
     public function setSSLVersion($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->sslversion = $i;
         return $this;
@@ -655,7 +655,7 @@ 
      */
     public function setRequestCompression($compMethod)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->request_compression = $compMethod;
         return $this;
@@ -705,7 +705,7 @@ 
      */
     public function setCurlOptions($options)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->extracurlopts = $options;
         return $this;
@@ -718,7 +718,7 @@ 
      */
     public function setUseCurl($useCurlMode)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->use_curl = $useCurlMode;
         return $this;
@@ -736,7 +736,7 @@ 
      */
     public function setUserAgent($agentString)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->user_agent = $agentString;
         return $this;
@@ -767,12 +767,12 @@ 
             }
         }
 
-        $url = $this->method . '://' . $this->server;
+        $url = $this->method.'://'.$this->server;
         if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) ||
             ($this->port == 443 && in_array($this->method, array('https', 'h2')))) {
-            return $url . $this->path;
+            return $url.$this->path;
         } else {
-            return $url . ':' . $this->port . $this->path;
+            return $url.':'.$this->port.$this->path;
         }
     }
 
@@ -812,7 +812,7 @@ 
     public function send($req, $timeout = 0, $method = '')
     {
         if ($method !== '' || $timeout !== 0) {
-            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated');
+            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated');
         }
 
         // if user does not specify http protocol, use native method of this client
@@ -931,7 +931,7 @@ 
                     $payload = $a;
                     $encodingHdr = "Content-Encoding: gzip\r\n";
                 } else {
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
                 }
             } else if (function_exists('gzcompress')) {
                 $a = @gzcompress($payload);
@@ -939,14 +939,14 @@ 
                     $payload = $a;
                     $encodingHdr = "Content-Encoding: deflate\r\n";
                 } else {
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
                 }
             } else {
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
             }
         } else {
             if ($opts['request_compression'] != '') {
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
             }
         }
 
@@ -954,16 +954,16 @@ 
         $credentials = '';
         if ($opts['username'] != '') {
             if ($opts['authtype'] != 1) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
-                    PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0');
+                    PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0');
             }
-            $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n";
         }
 
         $acceptedEncoding = '';
         if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) {
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n";
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n";
         }
 
         if ($port == 0) {
@@ -979,15 +979,15 @@ 
             $connectPort = $opts['proxyport'];
             $transport = 'tcp';
             /// @todo check: should we not use https in some cases?
-            $uri = 'http://' . $server . ':' . $port . $path;
+            $uri = 'http://'.$server.':'.$port.$path;
             if ($opts['proxy_user'] != '') {
                 if ($opts['proxy_authtype'] != 1) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
-                        PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with HTTP 1.0');
+                        PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with HTTP 1.0');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' .
-                    $opts['proxy_pass']) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'.
+                    $opts['proxy_pass'])."\r\n";
             }
         } else {
             $connectServer = $server;
@@ -1003,38 +1003,38 @@ 
             $version = '';
             foreach ($opts['cookies'] as $name => $cookie) {
                 /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments
-                $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";
         }
 
         $extraHeaders = '';
         if (!empty($this->extra_headers) && is_array($this->extra_headers)) {
-            $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n";
+            $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
             $port = '';
         } else {
-            $port = ':' . $port;
-        }
-
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $opts['user_agent'] . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" .
-            $cookieHeader .
-            $extraHeaders .
-            'Content-Type: ' . $req->getContentType() . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+            $port = ':'.$port;
+        }
+
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$opts['user_agent']."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n".
+            $cookieHeader.
+            $extraHeaders.
+            'Content-Type: '.$req->getContentType()."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$op\n---END---");
         }
 
@@ -1060,7 +1060,7 @@ 
 
             if ($opts['sslversion'] != 0) {
                 /// @see https://www.php.net/manual/en/function.curl-setopt.php, https://www.php.net/manual/en/migration56.openssl.php
-                switch($opts['sslversion']) {
+                switch ($opts['sslversion']) {
                     /// @todo what does this map to? 1.0-1.3?
                     //case 1: // TLSv1
                     //    break;
@@ -1084,12 +1084,12 @@ 
                             $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
                         } else {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
-                                PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later');
+                                PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later');
                         }
                         break;
                     default:
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
-                            PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version');
+                            PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version');
                 }
             }
         }
@@ -1102,7 +1102,7 @@ 
 
         $context = stream_context_create($contextOptions);
 
-        if ($opts['timeout'] <= 0) {
+        if ($opts['timeout']<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $opts['timeout'];
@@ -1114,7 +1114,7 @@ 
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($opts['timeout'] > 0) {
+            if ($opts['timeout']>0) {
                 stream_set_timeout($fp, $opts['timeout'], 0);
             }
         } else {
@@ -1123,8 +1123,8 @@ 
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -1191,19 +1191,19 @@ 
             $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']);
 
         if (!$curl) {
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
                 ': error during curl initialization. Check php error log for details');
         }
 
         $result = curl_exec($curl);
 
-        if ($opts['debug'] > 1) {
+        if ($opts['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()->debug($message);
@@ -1213,8 +1213,8 @@ 
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
-                ': ' . curl_error($curl));
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
+                ': '.curl_error($curl));
             curl_close($curl);
             if ($opts['keepalive']) {
                 $this->xmlrpc_curl_handle = null;
@@ -1272,7 +1272,7 @@ 
                     $payload = $a;
                     $encodingHdr = 'Content-Encoding: gzip';
                 } else {
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
                 }
             } else if (function_exists('gzcompress')) {
                 $a = @gzcompress($payload);
@@ -1280,14 +1280,14 @@ 
                     $payload = $a;
                     $encodingHdr = 'Content-Encoding: deflate';
                 } else {
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
                 }
             } else {
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
             }
         } else {
             if ($opts['request_compression'] != '') {
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
             }
         }
 
@@ -1301,12 +1301,12 @@ 
                     // http, https
                     $protocol = $method;
                     if (strpos($protocol, ':') !== false) {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
                         return false;
                     }
                 }
             }
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$path);
             if (!$curl) {
                 return false;
             }
@@ -1320,7 +1320,7 @@ 
         // results into variable
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             curl_setopt($curl, CURLOPT_VERBOSE, true);
             /// @todo redirect curlopt_stderr to some stream which can be piped to the logger
         }
@@ -1345,7 +1345,7 @@ 
             }
         }
         // extra headers
-        $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']));
+        $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings']));
         // if no keepalive is wanted, let the server know it in advance
         if (!$opts['keepalive']) {
             $headers[] = 'Connection: close';
@@ -1366,7 +1366,7 @@ 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($opts['timeout']) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout'] - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout']-1);
         }
 
         switch ($method) {
@@ -1380,7 +1380,7 @@ 
                 if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) {
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
                     curl_close($curl);
                     return false;
                 }
@@ -1391,11 +1391,11 @@ 
         }
 
         if ($opts['username'] && $opts['password']) {
-            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']);
+            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']);
             if (defined('CURLOPT_HTTPAUTH')) {
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
             } elseif ($opts['authtype'] != 1) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
                 curl_close($curl);
                 return false;
             }
@@ -1440,13 +1440,13 @@ 
             if ($opts['proxyport'] == 0) {
                 $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080
             }
-            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']);
+            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']);
             if ($opts['proxy_user']) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']);
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']);
                 if (defined('CURLOPT_PROXYAUTH')) {
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
                 } elseif ($opts['proxy_authtype'] != 1) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                     curl_close($curl);
                     return false;
                 }
@@ -1458,7 +1458,7 @@ 
         if (count($opts['cookies'])) {
             $cookieHeader = '';
             foreach ($opts['cookies'] as $name => $cookie) {
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
             }
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
         }
@@ -1467,7 +1467,7 @@ 
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
         }
 
@@ -1568,7 +1568,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');
@@ -1590,7 +1590,7 @@ 
         $response = array();
 
         if ($this->return_type == 'xml') {
-            for ($i = 0; $i < count($reqs); $i++) {
+            for ($i = 0; $i<count($reqs); $i++) {
                 $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse());
             }
 
@@ -1598,21 +1598,21 @@ 
             if (!is_array($rets)) {
                 // bad return type from system.multicall
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse());
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse());
             }
             $numRets = count($rets);
             if ($numRets != count($reqs)) {
                 // wrong number of return values.
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals',
                     $result->httpResponse());
             }
 
-            for ($i = 0; $i < $numRets; $i++) {
+            for ($i = 0; $i<$numRets; $i++) {
                 $val = $rets[$i];
                 if (!is_array($val)) {
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                        PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
+                        PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
                         'phpvals', $result->httpResponse());
                 }
                 switch (count($val)) {
@@ -1620,7 +1620,7 @@ 
                         if (!isset($val[0])) {
                             // Bad value
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value",
                                 'phpvals', $result->httpResponse());
                         }
                         // Normal return value
@@ -1632,20 +1632,20 @@ 
                         if (!is_int($code)) {
                             /// @todo should we check that it is != 0?
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'phpvals', $result->httpResponse());
                         }
                         $str = @$val['faultString'];
                         if (!is_string($str)) {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString",
                                 'phpvals', $result->httpResponse());
                         }
                         $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse());
                         break;
                     default:
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                             'phpvals', $result->httpResponse());
                 }
             }
@@ -1654,14 +1654,14 @@ 
             // return type == 'xmlrpcvals'
             if ($rets->kindOf() != 'array') {
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals',
                     $result->httpResponse());
             }
             $numRets = $rets->count();
             if ($numRets != count($reqs)) {
                 // wrong number of return values.
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals',
                     $result->httpResponse());
             }
 
@@ -1670,7 +1670,7 @@ 
                     case 'array':
                         if ($val->count() != 1) {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                                 'phpvals', $result->httpResponse());
                         }
                         // Normal return value
@@ -1679,28 +1679,28 @@ 
                     case 'struct':
                         if ($val->count() != 2) {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                                 'phpvals', $result->httpResponse());
                         }
                         /** @var Value $code */
                         $code = $val['faultCode'];
                         if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'xmlrpcvals', $result->httpResponse());
                         }
                         /** @var Value $str */
                         $str = $val['faultString'];
                         if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'xmlrpcvals', $result->httpResponse());
                         }
                         $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse());
                         break;
                     default:
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
                             'xmlrpcvals', $result->httpResponse());
                 }
             }
@@ -1733,7 +1733,7 @@ 
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
         $method = 'http')
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null,
             null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method);
@@ -1769,7 +1769,7 @@ 
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
         $sslVersion = 0)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->sendPayloadCURL($req, $server, $port, $timeout, $username,
             $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort,
@@ -1982,7 +1982,7 @@ 
     public function &__get($name)
     {
         if (in_array($name, static::$options)) {
-            $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
+            $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
             return $this->$name;
         }
 
@@ -1993,12 +1993,12 @@ 
             case 'server':
             case 'port':
             case 'path':
-                $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -2007,7 +2007,7 @@ 
     public function __set($name, $value)
     {
         if (in_array($name, static::$options)) {
-            $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
+            $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
             $this->$name = $value;
             return;
         }
@@ -2019,20 +2019,20 @@ 
             case 'server':
             case 'port':
             case 'path':
-                $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
                 $this->$name = $value;
                 return;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
     public function __isset($name)
     {
         if (in_array($name, static::$options)) {
-            $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
+            $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
             return isset($this->$name);
         }
 
@@ -2043,7 +2043,7 @@ 
             case 'server':
             case 'port':
             case 'path':
-                $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -2053,7 +2053,7 @@ 
     public function __unset($name)
     {
         if (in_array($name, static::$options)) {
-            $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
+            $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
             unset($this->$name);
             return;
         }
@@ -2065,13 +2065,13 @@ 
             case 'server':
             case 'port':
             case 'path':
-                $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
                 unset($this->$name);
                 return;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }