gggeek / phpxmlrpc

src/Client.php

Spacing +114 added lines, -114 removed lines

@@ -338,10 +338,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'];
@@ -357,7 +357,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -389,7 +389,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;
     }
 
     /**
@@ -561,7 +561,7 @@ 
      */
     public function setSSLVerifyPeer($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifypeer = $i;
         return $this;
@@ -578,7 +578,7 @@ 
      */
     public function setSSLVerifyHost($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifyhost = $i;
         return $this;
@@ -596,7 +596,7 @@ 
      */
     public function setSSLVersion($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->sslversion = $i;
         return $this;
@@ -661,7 +661,7 @@ 
      */
     public function setRequestCompression($compMethod)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->request_compression = $compMethod;
         return $this;
@@ -711,7 +711,7 @@ 
      */
     public function setCurlOptions($options)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->extracurlopts = $options;
         return $this;
@@ -725,7 +725,7 @@ 
      */
     public function setUseCurl($useCurlMode)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->use_curl = $useCurlMode;
         return $this;
@@ -742,7 +742,7 @@ 
      */
     public function setUserAgent($agentString)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->user_agent = $agentString;
         return $this;
@@ -774,12 +774,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;
         }
     }
 
@@ -822,7 +822,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
@@ -946,7 +946,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);
@@ -954,14 +954,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');
             }
         }
 
@@ -969,16 +969,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) {
@@ -999,21 +999,21 @@ 
             } elseif ($method === 'h2') {
                 $protocol = 'https';
             } else if (strpos($protocol, ':') !== false) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
-                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'] .
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
+                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'].
                     " attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
             }
             /// @todo this does not work atm (tested at least with an http proxy forwarding to an https server) - we
             ///       should implement the CONNECT protocol
-            $uri = $protocol . '://' . $server . ':' . $port . $path;
+            $uri = $protocol.'://'.$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 socket transport');
+                        PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with socket transport');
                 }
-                $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;
@@ -1030,14 +1030,14 @@ 
             $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 (is_array($this->extra_headers) && $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
@@ -1045,24 +1045,24 @@ 
         if (($port == 80 && in_array($method, array('http', 'http10', 'http11'))) || ($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 .
-            'Content-Type: ' . $req->getContentType() . "\r\n" .
-            $extraHeaders .
-            'Content-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.
+            'Content-Type: '.$req->getContentType()."\r\n".
+            $extraHeaders.
+            'Content-Length: '.strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$op\n---END---");
         }
 
@@ -1091,13 +1091,13 @@ 
                 ///      https://www.php.net/manual/en/function.stream-socket-enable-crypto.php
                 ///      https://www.php.net/manual/en/migration56.openssl.php,
                 ///      https://wiki.php.net/rfc/improved-tls-constants
-                switch($opts['sslversion']) {
+                switch ($opts['sslversion']) {
                     case 1: // TLSv1x
                         if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
                             $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLS_CLIENT;
                         } else {
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
-                                PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-any only is supported with PHP 7.2 or later');
+                                PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-any only is supported with PHP 7.2 or later');
                         }
                         break;
                     case 2: // SSLv2
@@ -1120,12 +1120,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');
                 }
             }
         }
@@ -1138,7 +1138,7 @@ 
 
         $context = stream_context_create($contextOptions);
 
-        if ($opts['timeout'] <= 0) {
+        if ($opts['timeout']<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $opts['timeout'];
@@ -1157,7 +1157,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 {
@@ -1166,8 +1166,8 @@ 
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
         }
 
         /// @todo from here onwards, we can inject the results of stream_get_meta_data in the response. We could
@@ -1250,19 +1250,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);
@@ -1272,21 +1272,21 @@ 
             /// @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));
-            if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
+                ': '.curl_error($curl));
+            if (PHP_MAJOR_VERSION<8) curl_close($curl);
             if ($opts['keepalive']) {
                 $this->xmlrpc_curl_handle = null;
             }
         } else {
             if (!$opts['keepalive']) {
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                if (PHP_MAJOR_VERSION<8) curl_close($curl);
             }
             $resp = $req->parseResponse($result, true, $opts['return_type']);
             if ($opts['keepalive']) {
                 /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls
                 if ($resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) {
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
                     $this->xmlrpc_curl_handle = null;
                 }
             }
@@ -1331,7 +1331,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);
@@ -1339,14 +1339,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');
             }
         }
 
@@ -1360,12 +1360,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;
             }
@@ -1379,7 +1379,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
         }
@@ -1404,7 +1404,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';
@@ -1441,8 +1441,8 @@ 
                 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');
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
                     return false;
                 }
                 break;
@@ -1452,12 +1452,12 @@ 
         }
 
         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');
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
+                if (PHP_MAJOR_VERSION<8) curl_close($curl);
                 return false;
             }
         }
@@ -1501,14 +1501,14 @@ 
             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');
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
                     return false;
                 }
             }
@@ -1519,7 +1519,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));
         }
@@ -1528,7 +1528,7 @@ 
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
         }
 
@@ -1629,7 +1629,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');
@@ -1651,7 +1651,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());
             }
 
@@ -1659,21 +1659,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)) {
@@ -1681,7 +1681,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
@@ -1693,20 +1693,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());
                 }
             }
@@ -1715,14 +1715,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());
             }
 
@@ -1731,7 +1731,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
@@ -1740,28 +1740,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());
                 }
             }
@@ -1796,7 +1796,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);
@@ -1834,7 +1834,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,
@@ -2047,7 +2047,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;
         }
 
@@ -2058,12 +2058,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;
         }
@@ -2072,7 +2072,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;
         }
@@ -2084,20 +2084,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);
         }
 
@@ -2108,7 +2108,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;
@@ -2118,7 +2118,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;
         }
@@ -2130,13 +2130,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);
         }
     }
 }

src/Helper/XMLParser.php

Spacing +56 added lines, -56 removed lines

@@ -187,12 +187,12 @@ 
             // q: can php be built without ctype? should we use a regexp?
             if (is_string($key) && !ctype_digit($key)) {
                 /// @todo on invalid options, throw/error-out instead of logging an error message?
-                switch($key) {
+                switch ($key) {
                     case 'target_charset':
                         if (function_exists('mb_convert_encoding')) {
                             $this->current_parsing_options['target_charset'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring");
                         }
                         break;
 
@@ -200,7 +200,7 @@ 
                         if (is_callable($val)) {
                             $this->current_parsing_options['methodname_callback'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
                         }
                         break;
 
@@ -211,7 +211,7 @@ 
                         break;
 
                     default:
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key");
                 }
                 unset($mergedOptions[$key]);
             }
@@ -255,10 +255,10 @@ 
 
         try {
             // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors
-            for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
+            for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
                 $chunk = substr($data, $offset, $this->maxChunkLength);
                 // error handling: xml not well formed
-                if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
+                if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
                     $errCode = xml_get_error_code($parser);
                     $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
                         xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -266,25 +266,25 @@ 
                     $this->_xh['isf_reason'] = $errStr;
                 }
                 // no need to parse further if we already have a fatal error
-                if ($this->_xh['isf'] >= 2) {
+                if ($this->_xh['isf']>=2) {
                     break;
                 }
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
         $this->current_parsing_options = array();
 
         // BC
@@ -311,7 +311,7 @@ 
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xml-rpc already detected, skip all processing
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -325,7 +325,7 @@ 
             if ($acceptSingleVals === false) {
                 $accept = $this->current_parsing_options['accept'];
             } else {
-                $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated');
+                $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated');
                 $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE;
             }
             if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) ||
@@ -335,7 +335,7 @@ 
                 $this->_xh['rt'] = strtolower($name);
             } else {
                 $this->_xh['isf'] = 2;
-                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
+                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
 
                 return;
             }
@@ -440,7 +440,7 @@ 
 
             case 'MEMBER':
                 // set member name to null, in case we do not find in the xml later on
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null;
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null;
                 //$this->_xh['ac']='';
                 // Drop trough intentionally
 
@@ -503,7 +503,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -525,7 +525,7 @@ 
                     $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8');
                 }
 
-                if ($rebuildXmlrpcvals > 0) {
+                if ($rebuildXmlrpcvals>0) {
                     // build the xml-rpc val out of the data received, and substitute it
                     $temp = new Value($this->_xh['value'], $this->_xh['vt']);
                     // in case we got info about underlying php class, save it in the object we're rebuilding
@@ -533,15 +533,15 @@ 
                         $temp->_php_class = $this->_xh['php_class'];
                     }
                     $this->_xh['value'] = $temp;
-                } elseif ($rebuildXmlrpcvals < 0) {
+                } elseif ($rebuildXmlrpcvals<0) {
                     if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
-                        $this->_xh['value'] = (object)array(
+                        $this->_xh['value'] = (object) array(
                             'xmlrpc_type' => 'datetime',
                             'scalar' => $this->_xh['value'],
                             'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
                         );
                     } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
-                        $this->_xh['value'] = (object)array(
+                        $this->_xh['value'] = (object) array(
                             'xmlrpc_type' => 'base64',
                             'scalar' => $this->_xh['value']
                         );
@@ -556,8 +556,8 @@ 
                 // check if we are inside an array or struct:
                 // if value just built is inside an array, let's move it into array on the stack
                 $vscount = count($this->_xh['valuestack']);
-                if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
-                    $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
+                if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
+                    $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
                 }
                 break;
 
@@ -584,7 +584,7 @@ 
                     // log if receiving something strange, even though we set the value to false anyway
                     /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL
                     if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) {
-                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' .
+                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: '.
                             $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                             return;
                         }
@@ -604,7 +604,7 @@ 
                 $this->_xh['vt'] = strtolower($name);
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in INT value: ' .
+                    if (!$this->handleParsingError('non numeric data received in INT value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -612,7 +612,7 @@ 
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (int)$this->_xh['ac'];
+                    $this->_xh['value'] = (int) $this->_xh['ac'];
                 }
                 break;
 
@@ -620,7 +620,7 @@ 
                 $this->_xh['vt'] = Value::$xmlrpcDouble;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' .
+                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -628,7 +628,7 @@ 
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (float)$this->_xh['ac'];
+                    $this->_xh['value'] = (float) $this->_xh['ac'];
                 }
                 break;
 
@@ -636,7 +636,7 @@ 
                 $this->_xh['vt'] = Value::$xmlrpcDateTime;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('invalid data received in DATETIME value: ' .
+                    if (!$this->handleParsingError('invalid data received in DATETIME value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -647,9 +647,9 @@ 
 
                     // the default regex used to validate the date string a few lines above should make this case impossible,
                     // but one never knows...
-                    } catch(\Exception $e) {
+                    } catch (\Exception $e) {
                         // what to do? We can not guarantee that a valid date can be created. We return null...
-                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' .
+                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error '.
                             $e->getMessage(), __METHOD__)) {
                             return;
                         }
@@ -666,14 +666,14 @@ 
                     $v = base64_decode($this->_xh['ac'], true);
                     if ($v === false) {
                         $this->_xh['isf'] = 2;
-                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']);
+                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']);
                         return;
                     }
                 } else {
                     $v = base64_decode($this->_xh['ac']);
                     if ($v === '' && $this->_xh['ac'] !== '') {
                         // only the empty string should decode to the empty string
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' .
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '.
                             $this->truncateValueForLog($this->_xh['ac']));
                     }
                 }
@@ -681,20 +681,20 @@ 
                 break;
 
             case 'NAME':
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
                 break;
 
             case 'MEMBER':
                 // add to array in the stack the last element built, unless no VALUE or no NAME were found
                 if ($this->_xh['vt']) {
                     $vscount = count($this->_xh['valuestack']);
-                    if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) {
+                    if ($this->_xh['valuestack'][$vscount-1]['name'] === null) {
                         if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) {
                             return;
                         }
-                        $this->_xh['valuestack'][$vscount - 1]['name'] = '';
+                        $this->_xh['valuestack'][$vscount-1]['name'] = '';
                     }
-                    $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
+                    $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
                 } else {
                     if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) {
                         return;
@@ -828,7 +828,7 @@ 
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -850,7 +850,7 @@ 
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -930,8 +930,8 @@ 
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-9]+
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return strtoupper(substr($matches[2], 1, -1));
         }
@@ -949,7 +949,7 @@ 
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
             // IANA also likes better US-ASCII, so go with it
             if ($enc == 'ASCII') {
-                $enc = 'US-' . $enc;
+                $enc = 'US-'.$enc;
             }
 
             return $enc;
@@ -990,8 +990,8 @@ 
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-9]+
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk)) {
             return true;
         }
@@ -1011,7 +1011,7 @@ 
             $this->_xh['isf_reason'] = ucfirst($message);
             return false;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message);
+            $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message);
             return true;
         }
     }
@@ -1023,8 +1023,8 @@ 
      */
     protected function truncateValueForLog($data)
     {
-        if (strlen($data) > $this->maxLogValueLength) {
-            return substr($data, 0, $this->maxLogValueLength - 3) . '...';
+        if (strlen($data)>$this->maxLogValueLength) {
+            return substr($data, 0, $this->maxLogValueLength-3).'...';
         }
 
         return $data;
@@ -1045,7 +1045,7 @@ 
     public function xmlrpc_se_any($parser, $name, $attrs)
     {
         // this will be spamming the log if this method is in use...
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->xmlrpc_se($parser, $name, $attrs, true);
     }
@@ -1055,12 +1055,12 @@ 
         switch ($name) {
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property XMLParser::'.$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;
         }
@@ -1071,18 +1071,18 @@ 
         switch ($name) {
             // this should only ever be called by subclasses which overtook `parse()`
             case 'accept':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->current_parsing_options['accept'] = $value;
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             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);
         }
     }
 
@@ -1090,11 +1090,11 @@ 
     {
         switch ($name) {
             case 'accept':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->current_parsing_options['accept']);
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -1106,18 +1106,18 @@ 
         switch ($name) {
             // q: does this make sense at all?
             case 'accept':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->current_parsing_options['accept']);
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             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);
         }
     }
 }

demo/server/methodProviders/testsuite.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
                 $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
             } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
                 $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-                $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
+                $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass);
             } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
                 $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
             }
@@ -62,12 +62,12 @@ 
     foreach ($cookies as $name => $cookieDesc) {
         if (is_array($cookieDesc)) {
             setcookie($name,
-                isset($cookieDesc['value']) ? (string)$cookieDesc['value'] : '',
+                isset($cookieDesc['value']) ? (string) $cookieDesc['value'] : '',
                 isset($cookieDesc['expires']) ? $cookieDesc['expires'] : 0,
-                isset($cookieDesc['path']) ? (string)$cookieDesc['path'] : '',
-                isset($cookieDesc['domain']) ? (string)$cookieDesc['domain'] : '',
-                isset($cookieDesc['secure']) ? (bool)$cookieDesc['secure'] : false,
-                isset($cookieDesc['httponly']) ? (bool)$cookieDesc['httponly'] : false
+                isset($cookieDesc['path']) ? (string) $cookieDesc['path'] : '',
+                isset($cookieDesc['domain']) ? (string) $cookieDesc['domain'] : '',
+                isset($cookieDesc['secure']) ? (bool) $cookieDesc['secure'] : false,
+                isset($cookieDesc['httponly']) ? (bool) $cookieDesc['httponly'] : false
             );
         } else {
             /// @todo what to do?
@@ -104,7 +104,7 @@ 
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';
 function sleepSeconds($secs) {
-    if ($secs > 0 && $secs < 61) {
+    if ($secs>0 && $secs<61) {
         sleep($secs);
     }
     return $secs;
@@ -137,7 +137,7 @@ 
 
     // Greek word 'kosme'. NB: NOT a valid ISO8859 string!
     // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
-    "tests.utf8methodname." . 'κόσμε' => array(
+    "tests.utf8methodname.".'κόσμε' => array(
         "function" => "exampleMethods::stringEcho",
         "signature" => exampleMethods::$stringecho_sig,
         "docstring" => exampleMethods::$stringecho_doc,

tests/WebTestCase.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase
 {
@@ -15,7 +15,7 @@ 
      */
     protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false)
     {
-        $url = $this->baseUrl . $path;
+        $url = $this->baseUrl.$path;
 
         $ch = curl_init($url);
         curl_setopt_array($ch, array(
@@ -29,21 +29,21 @@ 
                 CURLOPT_POSTFIELDS => $payload
             ));
         }
-        $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId;
+        $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId;
         if ($this->collectCodeCoverageInformation)
         {
-            $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId;
+            $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId;
         }
         curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 
-        if ($this->args['DEBUG'] > 0) {
+        if ($this->args['DEBUG']>0) {
             curl_setopt($ch, CURLOPT_VERBOSE, 1);
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
+        if (PHP_MAJOR_VERSION<8) curl_close($ch);
 
-        $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
+        $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']);
         if (!$emptyPageOk) {
             $this->assertNotEquals('', $page, 'Retrieved web page should not be empty');
         }
@@ -62,7 +62,7 @@ 
      */
     protected function newClient($path)
     {
-        $client = new \PhpXmlRpc\Client($this->baseUrl . $path);
+        $client = new \PhpXmlRpc\Client($this->baseUrl.$path);
         $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);