gggeek / phpxmlrpc

tests/5ServerTest.php

Spacing +32 added lines, -32 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestResult;
@@ -42,7 +42,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            for ($i = 0; $i < count($trace); $i++) {
+            for ($i = 0; $i<count($trace); $i++) {
                 if (strpos($trace[$i]['function'], 'test') === 0) {
                     self::$failed_tests[$trace[$i]['function']] = true;
                     break;
@@ -65,7 +65,7 @@ 
      */
     public function _run($result = NULL)
     {
-        $this->testId = get_class($this) . '__' . $this->getName();
+        $this->testId = get_class($this).'__'.$this->getName();
 
         if ($result === NULL) {
             $result = $this->createResult();
@@ -96,7 +96,7 @@ 
         $this->args = argParser::getArgs();
 
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
@@ -106,7 +106,7 @@ 
         $this->client->request_compression = $this->request_compression;
         $this->client->accepted_compression = $this->accepted_compression;
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
 
         if ($this->args['DEBUG'] == 1)
             ob_start();
@@ -143,9 +143,9 @@ 
         }
         $this->validateResponse($r);
         if (is_array($errorCode)) {
-            $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         } else {
-            $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         }
         if (!$r->faultCode()) {
             if ($returnResponse) {
@@ -172,20 +172,20 @@ 
         $query = parse_url($this->client->path, PHP_URL_QUERY);
         parse_str($query, $vars);
         $query = http_build_query(array_merge($vars, $data));
-        $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
+        $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
     }
 
     public function testString()
     {
-        $sendString = "here are 3 \"entities\": < > & " .
-            "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
-            " - isn't that great? \\\"hackery\\\" at it's best " .
-            " also don't want to miss out on \$item[0]. " .
-            "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
-            "a simple CR here" . chr(13) .
-            "a simple LF here" . chr(10) .
-            "and then LFCR" . chr(10) . chr(13) .
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
+        $sendString = "here are 3 \"entities\": < > & ".
+            "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
+            " - isn't that great? \\\"hackery\\\" at it's best ".
+            " also don't want to miss out on \$item[0]. ".
+            "The real weird stuff follows: CRLF here".chr(13).chr(10).
+            "a simple CR here".chr(13).
+            "a simple LF here".chr(10).
+            "and then LFCR".chr(10).chr(13).
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
         $m = new xmlrpcmsg('examples.stringecho', array(
             new xmlrpcval($sendString, 'string'),
         ));
@@ -206,7 +206,7 @@ 
     public function testLatin1String()
     {
         $sendString =
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
         $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
             $sendString.
             '</value></param></params></methodCall>';
@@ -310,7 +310,7 @@ 
     public function testUtf8Method()
     {
         PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
-        $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
+        $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
             new xmlrpcval('hello')
         ));
         $v = $this->send($m);
@@ -332,7 +332,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -344,7 +344,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -378,7 +378,7 @@ 
         if ($v) {
             $sz = $v->arraysize();
             $got = '';
-            for ($i = 0; $i < $sz; $i++) {
+            for ($i = 0; $i<$sz; $i++) {
                 $b = $v->arraymem($i);
                 if ($b->scalarval()) {
                     $got .= '1';
@@ -441,7 +441,7 @@ 
             $got = '';
             $expected = '37210';
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
-            foreach($expect_array as $val) {
+            foreach ($expect_array as $val) {
                 $b = $v->structmem($val);
                 $got .= $b->me['int'];
             }
@@ -894,7 +894,7 @@ 
     {
         // make a 'deep client copy' as the original one might have many properties set
         // also for speed only wrap one method of the whole server
-        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
+        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
         if ($class == '') {
             $this->fail('Registration of remote server failed');
         } else {
@@ -933,9 +933,9 @@ 
         $cookies = array(
             //'c1' => array(),
             'c2' => array('value' => 'c2'),
-            'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
-            'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
-            'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
+            'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
+            'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
+            'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
         );
         $cookiesval = php_xmlrpc_encode($cookies);
         $m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
@@ -983,10 +983,10 @@ 
         $m = new xmlrpcmsg('examples.getcookies', array());
         foreach ($cookies as $cookie => $val) {
             $this->client->setCookie($cookie, $val);
-            $cookies[$cookie] = (string)$cookies[$cookie];
+            $cookies[$cookie] = (string) $cookies[$cookie];
         }
         $r = $this->client->send($m, $this->timeout, $this->method);
-        $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+        $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         if (!$r->faultCode()) {
             $v = $r->value();
             $v = php_xmlrpc_decode($v);

src/Client.php

Spacing +64 added lines, -64 removed lines

@@ -157,10 +157,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'];
@@ -176,7 +176,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -214,7 +214,7 @@ 
         }*/
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -592,7 +592,7 @@ 
      */
     protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
-        $method='http')
+        $method = 'http')
     {
         //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
 
@@ -624,7 +624,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)
@@ -663,13 +663,13 @@ 
      */
     protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '',
         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '',
+        $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '',
         $sslVersion = 0)
     {
         /// @todo log a warning if passed an unsupported method
 
         if ($port == 0) {
-            $port = ( $method === 'https' ) ? 443 : 80;
+            $port = ($method === 'https') ? 443 : 80;
         }
 
         // Only create the payload if it was not created previously
@@ -699,15 +699,15 @@ 
         // thanks to Grant Rauscher <grant7@firstworld.net> for this
         $credentials = '';
         if ($username != '') {
-            $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";
             if ($authType != 1) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
             }
         }
 
         $acceptedEncoding = '';
         if (is_array($this->accepted_compression) && count($this->accepted_compression)) {
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";
         }
 
         $proxyCredentials = '';
@@ -718,17 +718,17 @@ 
             $connectServer = $proxyHost;
             $connectPort = $proxyPort;
             $transport = 'tcp';
-            $uri = 'http://' . $server . ':' . $port . $this->path;
+            $uri = 'http://'.$server.':'.$port.$this->path;
             if ($proxyUsername != '') {
                 if ($proxyAuthType != 1) {
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n";
             }
         } else {
             $connectServer = $server;
             $connectPort = $port;
-            $transport = ( $method === 'https' ) ? 'tls' : 'tcp';
+            $transport = ($method === 'https') ? 'tls' : 'tcp';
             $uri = $this->path;
         }
 
@@ -738,45 +738,45 @@ 
             $version = '';
             foreach ($this->cookies as $name => $cookie) {
                 if ($cookie['version']) {
-                    $version = ' $Version="' . $cookie['version'] . '";';
-                    $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";';
+                    $version = ' $Version="'.$cookie['version'].'";';
+                    $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";';
                     if ($cookie['path']) {
-                        $cookieHeader .= ' $Path="' . $cookie['path'] . '";';
+                        $cookieHeader .= ' $Path="'.$cookie['path'].'";';
                     }
                     if ($cookie['domain']) {
-                        $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";';
+                        $cookieHeader .= ' $Domain="'.$cookie['domain'].'";';
                     }
                     if ($cookie['port']) {
-                        $cookieHeader .= ' $Port="' . $cookie['port'] . '";';
+                        $cookieHeader .= ' $Port="'.$cookie['port'].'";';
                     }
                 } else {
-                    $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
+                    $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
                 }
             }
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
-            $port =  '';
+            $port = '';
         } else {
-            $port = ':' . $port;
+            $port = ':'.$port;
         }
 
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $this->user_agent . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
-            $cookieHeader .
-            'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$this->user_agent."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".
+            $cookieHeader.
+            'Content-Type: '.$req->content_type."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---");
         }
 
@@ -803,7 +803,7 @@ 
 
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -815,7 +815,7 @@ 
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($timeout > 0) {
+            if ($timeout>0) {
                 stream_set_timeout($fp, $timeout);
             }
         } else {
@@ -824,8 +824,8 @@ 
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -914,13 +914,13 @@ 
 
         $result = curl_exec($curl);
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $message = "---CURL INFO---\n";
             foreach (curl_getinfo($curl) as $name => $val) {
                 if (is_array($val)) {
                     $val = implode("\n", $val);
                 }
-                $message .= $name . ': ' . $val . "\n";
+                $message .= $name.': '.$val."\n";
             }
             $message .= '---END---';
             $this->getLogger()->debugMessage($message);
@@ -930,7 +930,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;
@@ -999,7 +999,7 @@ 
                     $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;
             }
@@ -1010,7 +1010,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
         }
@@ -1035,7 +1035,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';
@@ -1052,10 +1052,10 @@ 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($timeout) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);
         }
 
-        switch($method) {
+        switch ($method) {
             case 'http10':
                 curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
                 break;
@@ -1071,11 +1071,11 @@ 
         }
 
         if ($username && $password) {
-            curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password);
+            curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
             if (defined('CURLOPT_HTTPAUTH')) {
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $authType);
             } elseif ($authType != 1) {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
             }
         }
 
@@ -1117,13 +1117,13 @@ 
             if ($proxyPort == 0) {
                 $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080
             }
-            curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort);
+            curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort);
             if ($proxyUsername) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword);
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword);
                 if (defined('CURLOPT_PROXYAUTH')) {
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType);
                 } elseif ($proxyAuthType != 1) {
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                 }
             }
         }
@@ -1133,7 +1133,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));
         }
@@ -1142,7 +1142,7 @@ 
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
@@ -1240,7 +1240,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');
@@ -1266,15 +1266,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;
@@ -1282,7 +1282,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');
@@ -1310,19 +1310,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]);

demo/vardemo.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/client/_prepend.php";
+require_once __DIR__."/client/_prepend.php";
 
 output('html lang="en">
 <head><title>xmlrpc</title></head>
@@ -11,9 +11,9 @@ 
 output("<h3>Testing value serialization</h3>\n");
 
 $v = new PhpXmlRpc\Value(23, "int");
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value("What are you saying? >> << &&");
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -24,7 +24,7 @@ 
     "array"
 );
 
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -52,11 +52,11 @@ 
     "struct"
 );
 
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
 
-output("<PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($w->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -68,29 +68,29 @@ 
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 );
-output("<PRE>" . htmlentities($w->serialize()) . "</PRE>");
-output("<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>");
+output("<PRE>".htmlentities($w->serialize())."</PRE>");
+output("<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>");
 
 $req->method('');
 $req->addParam(new PhpXmlRpc\Value("41", "int"));
 
 output("<h3>Testing request serialization</h3>\n");
 $op = $req->serialize();
-output("<PRE>" . htmlentities($op) . "</PRE>");
+output("<PRE>".htmlentities($op)."</PRE>");
 
 output("<h3>Testing ISO date format</h3><pre>\n");
 
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 output("Now is $t --> $date\n");
-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 output("That is to say $date --> $tb\n");
-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
 
 output("</pre>\n");
 
 output('</body></html>');
 
-require_once __DIR__ . "/client/_append.php";
+require_once __DIR__."/client/_append.php";

demo/server/server.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * Please _do not_ copy this file verbatim into your production server.
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Response;
@@ -61,7 +61,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" => "stringEcho",
         "signature" => $stringecho_sig,
         "docstring" => $stringecho_doc,
@@ -121,4 +121,4 @@ 
 $s->service();
 // That should do all we need!
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Forward an xmlrpc request to another server, and return to client the response received.
@@ -31,7 +31,7 @@ 
     // NB: here we should validate the received url, using f.e. a whitelist...
     $client = new PhpXmlRpc\Client($url);
 
-    if ($req->getNumParams() > 3) {
+    if ($req->getNumParams()>3) {
         // we have to set some options onto the client.
         // Note that if we do not untaint the received values, warnings might be generated...
         $options = $encoder->decode($req->getParam(3));
@@ -51,7 +51,7 @@ 
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -69,7 +69,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }
@@ -90,4 +90,4 @@ 
     )
 );
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/server/discuss.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  * It uses a Berkeley DB database for storage.
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Value;
 
@@ -35,8 +35,8 @@ 
             $count = 0;
         }
         // add the new comment in
-        dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-        dba_insert($msgID . "_name_${count}", $name, $dbh);
+        dba_insert($msgID."_comment_${count}", $comment, $dbh);
+        dba_insert($msgID."_name_${count}", $name, $dbh);
         $count++;
         dba_replace($countID, $count, $dbh);
         dba_close($dbh);
@@ -69,7 +69,7 @@ 
         $countID = "${msgID}_count";
         if (dba_exists($countID, $dbh)) {
             $count = dba_fetch($countID, $dbh);
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i<$count; $i++) {
                 $name = dba_fetch("${msgID}_name_${i}", $dbh);
                 $comment = dba_fetch("${msgID}_comment_${i}", $dbh);
                 // push a new struct onto the return array
@@ -107,4 +107,4 @@ 
     ),
 ));
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/client/getstatename.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Getstatename demo</title></head>
@@ -11,34 +11,34 @@ 
 ');
 
 if (isset($_POST["stateno"]) && $_POST["stateno"] != "") {
-    $stateNo = (integer)$_POST["stateno"];
+    $stateNo = (integer) $_POST["stateno"];
     $encoder = new PhpXmlRpc\Encoder();
     $req = new PhpXmlRpc\Request('examples.getStateName',
         array($encoder->encode($stateNo))
     );
-    output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . "\n\n</pre>Debug info of server data follows...\n\n");
+    output("Sending the following request:<pre>\n\n".htmlentities($req->serialize())."\n\n</pre>Debug info of server data follows...\n\n");
     $client = new PhpXmlRpc\Client(XMLRPCSERVER);
     $client->setDebug(1);
     $r = $client->send($req);
     if (!$r->faultCode()) {
         $v = $r->value();
-        output("<br/>State number <b>" . $stateNo . "</b> is <b>"
-            . htmlspecialchars($encoder->decode($v)) . "</b><br/><br/>");
+        output("<br/>State number <b>".$stateNo."</b> is <b>"
+            . htmlspecialchars($encoder->decode($v))."</b><br/><br/>");
     } else {
         output("An error occurred: ");
-        output("Code: " . htmlspecialchars($r->faultCode())
-            . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>");
+        output("Code: ".htmlspecialchars($r->faultCode())
+            . " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>");
     }
 } else {
     $stateNo = "";
 }
 
 output("<form action=\"getstatename.php\" method=\"POST\">
-<input name=\"stateno\" value=\"" . $stateNo . "\">
+<input name=\"stateno\" value=\"" . $stateNo."\">
 <input type=\"submit\" value=\"go\" name=\"submit\">
 </form>
 <p>Enter a state number to query its name</p>");
 
 output("</body></html>\n");
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/client/_append.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 // Out-of-band information: let the client manipulate the page operations.
 // We do this to help the testsuite script: do not reproduce in production!
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }

demo/client/parallel.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Encoder;
 use PhpXmlRpc\Client;
@@ -25,7 +25,7 @@ 
         $handles = array();
         $curl = curl_multi_init();
 
-        foreach($requests as $k => $req) {
+        foreach ($requests as $k => $req) {
             $req->setDebug($this->debug);
 
             $handle = $this->prepareCurlHandle(
@@ -58,19 +58,19 @@ 
         $running = 0;
         do {
             curl_multi_exec($curl, $running);
-        } while($running > 0);
+        } while ($running>0);
 
         $responses = array();
-        foreach($handles as $k => $h) {
+        foreach ($handles as $k => $h) {
             $responses[$k] = curl_multi_getcontent($handles[$k]);
 
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $message = "---CURL INFO---\n";
                 foreach (curl_getinfo($h) as $name => $val) {
                     if (is_array($val)) {
                         $val = implode("\n", $val);
                     }
-                    $message .= $name . ': ' . $val . "\n";
+                    $message .= $name.': '.$val."\n";
                 }
                 $message .= '---END---';
                 $this->getLogger()->debugMessage($message);
@@ -81,9 +81,9 @@ 
         }
         curl_multi_close($curl);
 
-        foreach($responses as $k => $resp) {
+        foreach ($responses as $k => $resp) {
             if (!$resp) {
-                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             } else {
                 $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type);
             }
@@ -100,7 +100,7 @@ 
 $value = $encoder->encode($data, array('auto_dates'));
 $req = new Request('interopEchoTests.echoValue', array($value));
 $reqs = array();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $reqs[] = $req;
 }
 
@@ -109,18 +109,18 @@ 
 
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
+$t = microtime(true)-$t;
 echo "Sequential send: $t secs\n";
 
 $t = microtime(true);
 $resp = $client->sendParallel($reqs);
-$t = microtime(true) - $t;
+$t = microtime(true)-$t;
 echo "Parallel send: $t secs\n";
 
 $client->no_multicall = false;
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
+$t = microtime(true)-$t;
 echo "Multicall send: $t secs\n";
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";