gggeek / phpxmlrpc

src/Client.php

Spacing +63 added lines, -63 removed lines

@@ -136,10 +136,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'];
@@ -155,7 +155,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -193,7 +193,7 @@ 
         }*/
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -566,7 +566,7 @@ 
      */
     protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
-        $method='http')
+        $method = 'http')
     {
         return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null,
             null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType);
@@ -596,7 +596,7 @@ 
      * @param int $sslVersion
      * @return Response
      */
-    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '',  $password = '',
+    protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
         $sslVersion = 0)
@@ -631,11 +631,11 @@ 
      */
     protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '',
+        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '',
         $sslVersion = 0)
     {
         if ($port == 0) {
-            $port = ( $method === 'https' ) ? 443 : 80;
+            $port = ($method === 'https') ? 443 : 80;
         }
 
         // Only create the payload if it was not created previously
@@ -666,15 +666,15 @@ 
         // thanks to Grant Rauscher <grant7@firstworld.net> for this
         $credentials = '';
         if ($username != '') {
-            $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
             if ($authType != 1) {
-                error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
+                error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
             }
         }
 
         $acceptedEncoding = '';
         if (is_array($this->accepted_compression) && count($this->accepted_compression)) {
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";
         }
 
         $proxyCredentials = '';
@@ -685,17 +685,17 @@ 
             $connectServer = $proxyHost;
             $connectPort = $proxyPort;
             $transport = 'tcp';
-            $uri = 'http://' . $server . ':' . $port . $this->path;
+            $uri = 'http://'.$server.':'.$port.$this->path;
             if ($proxyUsername != '') {
                 if ($proxyAuthType != 1) {
-                    error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                    error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n";
             }
         } else {
             $connectServer = $server;
             $connectPort = $port;
-            $transport = ( $method === 'https' ) ? 'tls' : 'tcp';
+            $transport = ($method === 'https') ? 'tls' : 'tcp';
             $uri = $this->path;
         }
 
@@ -706,45 +706,45 @@ 
             $version = '';
             foreach ($this->cookies as $name => $cookie) {
                 if ($cookie['version']) {
-                    $version = ' $Version="' . $cookie['version'] . '";';
-                    $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";';
+                    $version = ' $Version="'.$cookie['version'].'";';
+                    $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";';
                     if ($cookie['path']) {
-                        $cookieHeader .= ' $Path="' . $cookie['path'] . '";';
+                        $cookieHeader .= ' $Path="'.$cookie['path'].'";';
                     }
                     if ($cookie['domain']) {
-                        $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";';
+                        $cookieHeader .= ' $Domain="'.$cookie['domain'].'";';
                     }
                     if ($cookie['port']) {
-                        $cookieHeader .= ' $Port="' . $cookie['port'] . '";';
+                        $cookieHeader .= ' $Port="'.$cookie['port'].'";';
                     }
                 } else {
-                    $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
+                    $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
                 }
             }
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
-            $port =  '';
+            $port = '';
         } else {
-            $port = ':' . $port;
+            $port = ':'.$port;
         }
 
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $this->user_agent . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
-            $cookieHeader .
-            'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$this->user_agent."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
+            $cookieHeader.
+            'Content-Type: '.$req->content_type."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             Logger::instance()->debugMessage("---SENDING---\n$op\n---END---");
         }
 
@@ -770,7 +770,7 @@ 
         }
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -782,12 +782,12 @@ 
         $fp = stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($timeout > 0) {
+            if ($timeout>0) {
                 stream_set_timeout($fp, $timeout);
             }
         } else {
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -894,7 +894,7 @@ 
             $encodingHdr = '';
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             Logger::instance()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
@@ -904,7 +904,7 @@ 
             } else {
                 $protocol = $method;
             }
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = $curl;
             }
@@ -915,7 +915,7 @@ 
         // results into variable
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             curl_setopt($curl, CURLOPT_VERBOSE, true);
             /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered
         }
@@ -941,7 +941,7 @@ 
             }
         }
         // extra headers
-        $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+        $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));
         // if no keepalive is wanted, let the server know it in advance
         if (!$keepAlive) {
             $headers[] = 'Connection: close';
@@ -958,7 +958,7 @@ 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($timeout) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);
         }
 
         if ($method == 'http10') {
@@ -968,11 +968,11 @@ 
         }
 
         if ($username && $password) {
-            curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password);
+            curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
             if (defined('CURLOPT_HTTPAUTH')) {
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $authType);
             } elseif ($authType != 1) {
-                error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
             }
         }
 
@@ -1013,13 +1013,13 @@ 
             if ($proxyPort == 0) {
                 $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080
             }
-            curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort);
+            curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort);
             if ($proxyUsername) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword);
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword);
                 if (defined('CURLOPT_PROXYAUTH')) {
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType);
                 } elseif ($proxyAuthType != 1) {
-                    error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                 }
             }
         }
@@ -1030,7 +1030,7 @@ 
         if (count($this->cookies)) {
             $cookieHeader = '';
             foreach ($this->cookies as $name => $cookie) {
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
             }
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
         }
@@ -1041,13 +1041,13 @@ 
 
         $result = curl_exec($curl);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $message = "---CURL INFO---\n";
             foreach (curl_getinfo($curl) as $name => $val) {
                 if (is_array($val)) {
                     $val = implode("\n", $val);
                 }
-                $message .= $name . ': ' . $val . "\n";
+                $message .= $name.': '.$val."\n";
             }
             $message .= '---END---';
             Logger::instance()->debugMessage($message);
@@ -1057,7 +1057,7 @@ 
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+            $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             curl_close($curl);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = null;
@@ -1167,7 +1167,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');
@@ -1193,15 +1193,15 @@ 
             /// @todo test this code branch...
             $rets = $result->value();
             if (!is_array($rets)) {
-                return false;       // bad return type from system.multicall
+                return false; // bad return type from system.multicall
             }
             $numRets = count($rets);
             if ($numRets != count($reqs)) {
-                return false;       // wrong number of return values.
+                return false; // wrong number of return values.
             }
 
             $response = array();
-            for ($i = 0; $i < $numRets; $i++) {
+            for ($i = 0; $i<$numRets; $i++) {
                 $val = $rets[$i];
                 if (!is_array($val)) {
                     return false;
@@ -1209,7 +1209,7 @@ 
                 switch (count($val)) {
                     case 1:
                         if (!isset($val[0])) {
-                            return false;       // Bad value
+                            return false; // Bad value
                         }
                         // Normal return value
                         $response[$i] = new Response($val[0], 0, '', 'phpvals');
@@ -1237,19 +1237,19 @@ 
 
             $rets = $result->value();
             if ($rets->kindOf() != 'array') {
-                return false;       // bad return type from system.multicall
+                return false; // bad return type from system.multicall
             }
             $numRets = $rets->count();
             if ($numRets != count($reqs)) {
-                return false;       // wrong number of return values.
+                return false; // wrong number of return values.
             }
 
             $response = array();
-            foreach($rets as $val) {
+            foreach ($rets as $val) {
                 switch ($val->kindOf()) {
                     case 'array':
                         if ($val->count() != 1) {
-                            return false;       // Bad value
+                            return false; // Bad value
                         }
                         // Normal return value
                         $response[] = new Response($val[0]);