gggeek / phpxmlrpc

src/Autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             return;
         }
 
-        if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
+        if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
             require $file;
         }
     }

lib/xmlrpc_wrappers.inc

Indentation +3 added lines, -3 removed lines

@@ -141,9 +141,9 @@
  * @deprecated
  */
 function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName,
-     $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
-     $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
-     $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
+        $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
+        $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
+        $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
     if ($clientCopyMode < 2) {

Spacing +17 added lines, -17 removed lines

@@ -41,10 +41,10 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_function($funcName, $newFuncName='', $extraOptions=array())
+function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions);
@@ -64,17 +64,17 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_class($className, $extraOptions=array())
+function wrap_php_class($className, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     $fix = false;
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $fix = true;
     }
     $wrapped = $wrapper->wrapPhpClass($className, $extraOptions);
-    foreach($wrapped as $name => $value) {
+    foreach ($wrapped as $name => $value) {
         if ($fix) {
             eval($value['source']);
         }
@@ -93,7 +93,7 @@ 
  * @param string $newFuncName     deprecated, use an option in $extraOptions
  * @return array|callable|false
  */
-function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='')
+function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '')
 {
     if (!is_array($extraOptions))
     {
@@ -128,7 +128,7 @@ 
  * @param array $extraOptions
  * @return mixed
  */
-function wrap_xmlrpc_server($client, $extraOptions=array())
+function wrap_xmlrpc_server($client, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     return $wrapper->wrapXmlrpcServer($client, $extraOptions);
@@ -148,7 +148,7 @@ 
      $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         // client copy mode 0 or 1 == partial / full client copy in emitted code
         $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix);
         $innerCode .= "\$client->setDebug(\$debug);\n";
@@ -162,7 +162,7 @@ 
 
     if ($mDesc != '') {
         // take care that PHP comment is not terminated unwillingly by method description
-        $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n";
+        $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n";
     } else {
         $mDesc = "/**\nFunction $xmlrpcFuncName\n";
     }
@@ -171,7 +171,7 @@ 
     $innerCode .= "\$encoder = new {$namespace}Encoder();\n";
     $plist = array();
     $pCount = count($mSig);
-    for ($i = 1; $i < $pCount; $i++) {
+    for ($i = 1; $i<$pCount; $i++) {
         $plist[] = "\$p$i";
         $pType = $mSig[$i];
         if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' ||
@@ -187,19 +187,19 @@ 
             }
         }
         $innerCode .= "\$req->addparam(\$p$i);\n";
-        $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n";
+        $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n";
     }
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         $plist[] = '$debug=0';
         $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";
     }
     $plist = implode(', ', $plist);
-    $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n";
+    $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n";
 
     $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n";
     if ($decodeFault) {
         if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
         } else {
             $respCode = var_export($faultResponse, true);
         }
@@ -212,7 +212,7 @@ 
         $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());";
     }
 
-    $code = $code . $plist . ") {\n" . $innerCode . "\n}\n";
+    $code = $code.$plist.") {\n".$innerCode."\n}\n";
 
     return array('source' => $code, 'docstring' => $mDesc);
 }
@@ -220,10 +220,10 @@ 
 /**
  * @deprecated
  */
-function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
+function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')
 {
     $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).
-        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";
+        "', '".str_replace("'", "\'", $client->server)."', $client->port);\n";
 
     // copy all client fields to the client that will be generated runtime
     // (this provides for future expansion or subclassing of client obj)

src/Helper/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
             $flags = ENT_COMPAT;
             // avoid warnings on php < 5.4...
             if (defined('ENT_HTML401')) {
-                $flags =  $flags | ENT_HTML401;
+                $flags = $flags | ENT_HTML401;
             }
             if (defined('ENT_SUBSTITUTE')) {
-                $flags =  $flags | ENT_SUBSTITUTE;
+                $flags = $flags | ENT_SUBSTITUTE;
             }
             if ($encoding != null) {
                 print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";

extras/verify_compat.php

Spacing +7 added lines, -7 removed lines

@@ -17,8 +17,8 @@ 
         // test for php version
         $ver = phpversion();
         $tests['php_version'] = array();
-        $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n";
-        if (version_compare($ver, '5.3.0') < 0) {
+        $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n";
+        if (version_compare($ver, '5.3.0')<0) {
             $tests['php_version']['status'] = 0;
             $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later';
         } else {
@@ -51,8 +51,8 @@ 
         // test for php version
         $ver = phpversion();
         $tests['php_version'] = array();
-        $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n";
-        if (version_compare($ver, '5.3.0') < 0) {
+        $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n";
+        if (version_compare($ver, '5.3.0')<0) {
             $tests['php_version']['status'] = 0;
             $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later';
         } else {
@@ -79,7 +79,7 @@ 
             $info = curl_version();
             $tests['curl']['status'] = 2;
             $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols";
-            if (version_compare($ver, '4.3.8') < 0) {
+            if (version_compare($ver, '4.3.8')<0) {
                 $tests['curl']['status'] = 1;
                 $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives";
             }
@@ -167,7 +167,7 @@ 
     <?php
     $res = phpxmlrpc_verify_compat('server');
     foreach ($res as $test => $result) {
-        echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n";
+        echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n";
     }
     ?>
     </tbody>
@@ -184,7 +184,7 @@ 
     <?php
     $res = phpxmlrpc_verify_compat('client');
     foreach ($res as $test => $result) {
-        echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n";
+        echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n";
     }
     ?>
     </tbody>

lib/xmlrpc.inc

Spacing +11 added lines, -11 removed lines

@@ -107,7 +107,7 @@ 
         $val = reset($ar);
         $typ = key($ar);
 
-        return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val)."</value>\n";
         //}
     }
 
@@ -126,7 +126,7 @@ 
         // preserve back compatibility
 
         if (is_array($b)) {
-            foreach($b as $id => $cont) {
+            foreach ($b as $id => $cont) {
                 $b[$id] = $cont->scalarval();
             }
         }
@@ -134,10 +134,10 @@ 
         // add support for structures directly encoding php objects
         if (is_object($b)) {
             $t = get_object_vars($b);
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 $t[$id] = $cont->scalarval();
             }
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 @$b->$id = $cont;
             }
         }
@@ -179,17 +179,17 @@ 
 /* Expose as global functions the ones which are now class methods */
 
 /// Wrong speling, but we are adamant on backwards compatibility!
-function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
+function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '')
 {
     return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding);
 }
 
-function iso8601_encode($timeT, $utc=0)
+function iso8601_encode($timeT, $utc = 0)
 {
     return Date::iso8601Encode($timeT, $utc);
 }
 
-function iso8601_decode($iDate, $utc=0)
+function iso8601_decode($iDate, $utc = 0)
 {
     return Date::iso8601Decode($iDate, $utc);
 }
@@ -199,25 +199,25 @@ 
     return Http::decodeChunked($buffer);
 }
 
-function php_xmlrpc_decode($xmlrpcVal, $options=array())
+function php_xmlrpc_decode($xmlrpcVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->decode($xmlrpcVal, $options);
 }
 
-function php_xmlrpc_encode($phpVal, $options=array())
+function php_xmlrpc_encode($phpVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->encode($phpVal, $options);
 }
 
-function php_xmlrpc_decode_xml($xmlVal, $options=array())
+function php_xmlrpc_decode_xml($xmlVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->decodeXml($xmlVal, $options);
 }
 
-function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
+function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null)
 {
     return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
 }

src/Helper/Charset.php

Braces +1 added lines, -2 removed lines

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

Spacing +22 added lines, -22 removed lines

@@ -76,14 +76,14 @@ 
                 if (count($this->xml_iso88591_Entities['in'])) {
                     return;
                 }
-                for ($i = 0; $i < 32; $i++) {
+                for ($i = 0; $i<32; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
 
                 /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
 
-                for ($i = 160; $i < 256; $i++) {
+                for ($i = 160; $i<256; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
@@ -111,7 +111,7 @@ 
                 break;*/
 
             default:
-                throw new ValueErrorException('Unsupported table: ' . $tableName);
+                throw new ValueErrorException('Unsupported table: '.$tableName);
         }
     }
 
@@ -163,7 +163,7 @@ 
             $srcEncoding = 'UTF-8';
         }
 
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
 
         // list ordered with (expected) most common scenarios first
         switch ($conversion) {
@@ -181,20 +181,20 @@ 
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
                 $escapedData = '';
                 // be kind to users creating string xml-rpc values out of different php types
-                $data = (string)$data;
+                $data = (string) $data;
                 $ns = strlen($data);
-                for ($nn = 0; $nn < $ns; $nn++) {
+                for ($nn = 0; $nn<$ns; $nn++) {
                     $ch = $data[$nn];
                     $ii = ord($ch);
                     // 7 bits in 1 byte: 0bbbbbbb (127)
-                    if ($ii < 32) {
+                    if ($ii<32) {
                         if ($conversion == 'UTF-8_US-ASCII') {
                             $escapedData .= sprintf('&#%d;', $ii);
                         } else {
                             $escapedData .= $ch;
                         }
                     }
-                    else if ($ii < 128) {
+                    else if ($ii<128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {
@@ -219,25 +219,25 @@ 
                     } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
                     elseif ($ii >> 5 == 6) {
                         $b1 = ($ii & 31);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $ii = ($b1 * 64) + $b2;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $ii = ($b1 * 64)+$b2;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 1;
                     } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 4 == 14) {
                         $b1 = ($ii & 15);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 2;
                     } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 3 == 30) {
                         $b1 = ($ii & 7);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $b4 = (ord($data[$nn + 3]) & 63);
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $b4 = (ord($data[$nn+3]) & 63);
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 3;
                     }
@@ -290,7 +290,7 @@ 
                     // If src is UTF8, we run htmlspecialchars before converting to the target charset, as
                     // htmlspecialchars has limited charset support, but it groks utf8
                     if ($srcEncoding === 'UTF-8') {
-                        $data = htmlspecialchars($data,  defined('ENT_XML1') ? ENT_XML1 | ENT_QUOTES : ENT_QUOTES, 'UTF-8');
+                        $data = htmlspecialchars($data, defined('ENT_XML1') ? ENT_XML1 | ENT_QUOTES : ENT_QUOTES, 'UTF-8');
                     }
                     if ($srcEncoding !== $destEncoding) {
                         try {
@@ -302,7 +302,7 @@ 
                     }
                     if ($data === false) {
                         $escapedData = '';
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding via mbstring: failed...");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding via mbstring: failed...");
                     } else {
                         if ($srcEncoding === 'UTF-8') {
                             $escapedData = $data;
@@ -312,7 +312,7 @@ 
                     }
                 } else {
                     $escapedData = '';
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
                 }
         }
 
@@ -330,7 +330,7 @@ 
         if (function_exists('mb_list_encodings')) {
             $knownCharsets = array_unique(array_merge($knownCharsets, array_diff(mb_list_encodings(), array(
                 'pass', 'auto', 'wchar', 'BASE64', 'UUENCODE', 'ASCII', 'HTML-ENTITIES', 'Quoted-Printable',
-                '7bit','8bit', 'byte2be', 'byte2le', 'byte4be', 'byte4le'
+                '7bit', '8bit', 'byte2be', 'byte2le', 'byte4be', 'byte4le'
             ))));
         }
         return $knownCharsets;
@@ -384,7 +384,7 @@ 
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new ValueErrorException('Unsupported charset: ' . $charset);
+                throw new ValueErrorException('Unsupported charset: '.$charset);
         }
     }
 }

src/Client.php

Indentation +3 added lines, -3 removed lines

@@ -951,9 +951,9 @@
     }
 
     protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
-         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
-         $keyPass = '', $sslVersion = 0)
+            $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
+            $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
+            $keyPass = '', $sslVersion = 0)
     {
         if ($port == 0) {
             if (in_array($method, array('http', 'http10', 'http11', 'h2c'))) {

Spacing +75 added lines, -75 removed lines

@@ -293,10 +293,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'];
@@ -312,7 +312,7 @@ 
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -344,7 +344,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;
     }
 
     /**
@@ -638,12 +638,12 @@ 
      */
     public function getUrl()
     {
-        $url = $this->method . '://' . $this->server;
+        $url = $this->method.'://'.$this->server;
         if (($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;
         }
     }
 
@@ -784,7 +784,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);
 
@@ -817,7 +817,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)
@@ -856,7 +856,7 @@ 
      */
     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
@@ -893,16 +893,16 @@ 
         // 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) {
                 /// @todo make this a proper error, i.e. return a failure
-                $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');
             }
         }
 
         $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 = '';
@@ -914,13 +914,13 @@ 
             $connectPort = $proxyPort;
             $transport = 'tcp';
             /// @todo check: should we not use https in some cases?
-            $uri = 'http://' . $server . ':' . $port . $this->path;
+            $uri = 'http://'.$server.':'.$port.$this->path;
             if ($proxyUsername != '') {
                 if ($proxyAuthType != 1) {
                     /// @todo make this a proper error, i.e. return a failure
-                    $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');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n";
             }
         } else {
             $connectServer = $server;
@@ -935,45 +935,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()->debug("---SENDING---\n$op\n---END---");
         }
 
@@ -1000,7 +1000,7 @@ 
 
         $context = stream_context_create($contextOptions);
 
-        if ($timeout <= 0) {
+        if ($timeout<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $timeout;
@@ -1012,7 +1012,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, 0);
             }
         } else {
@@ -1021,8 +1021,8 @@ 
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -1110,18 +1110,18 @@ 
             $keyPass, $sslVersion);
 
         if (!$curl) {
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details');
+            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 ($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()->debug($message);
@@ -1131,7 +1131,7 @@ 
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl));
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl));
             curl_close($curl);
             if ($keepAlive) {
                 $this->xmlrpc_curl_handle = null;
@@ -1201,12 +1201,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 . $this->path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path);
             if (!$curl) {
                 return false;
             }
@@ -1220,7 +1220,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 redirect curlopt_stderr to some stream which can be piped to the logger
         }
@@ -1245,7 +1245,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';
@@ -1262,7 +1262,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);
         }
 
         switch ($method) {
@@ -1277,7 +1277,7 @@ 
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
                     /// @todo make this a proper error, i.e. return a failure
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
                 }
                 break;
             case 'h2':
@@ -1286,12 +1286,12 @@ 
         }
 
         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) {
                 /// @todo make this a proper error, i.e. return a failure
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
             }
         }
 
@@ -1334,14 +1334,14 @@ 
             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) {
                     /// @todo make this a proper error, i.e. return a failure
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                 }
             }
         }
@@ -1351,7 +1351,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));
         }
@@ -1360,7 +1360,7 @@ 
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
         }
 
@@ -1451,7 +1451,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');
@@ -1473,7 +1473,7 @@ 
         $response = array();
 
         if ($this->return_type == 'xml') {
-            for ($i = 0; $i < count($reqs); $i++) {
+            for ($i = 0; $i<count($reqs); $i++) {
                 $response[] = new Response($rets, 0, '', 'xml', $result->httpResponse());
             }
 
@@ -1481,21 +1481,21 @@ 
             if (!is_array($rets)) {
                 // bad return type from system.multicall
                 return new Response(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 Response(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 Response(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)) {
@@ -1503,7 +1503,7 @@ 
                         if (!isset($val[0])) {
                             // Bad value
                             return new Response(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
@@ -1515,20 +1515,20 @@ 
                         if (!is_int($code)) {
                             /// @todo should we check that it is != 0?
                             return new Response(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 Response(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 Response(0, $code, $str, 'phpvals', $result->httpResponse());
                         break;
                     default:
                         return new Response(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());
                 }
             }
@@ -1537,14 +1537,14 @@ 
             // return type == 'xmlrpcvals'
             if ($rets->kindOf() != 'array') {
                 return new Response(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 Response(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());
             }
 
@@ -1553,7 +1553,7 @@ 
                     case 'array':
                         if ($val->count() != 1) {
                             return new Response(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
@@ -1562,28 +1562,28 @@ 
                     case 'struct':
                         if ($val->count() != 2) {
                             return new Response(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 Response(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 Response(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 Response(0, $code->scalarval(), $str->scalarval(), 'xmlrpcvals', $result->httpResponse());
                         break;
                     default:
                         return new Response(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());
                 }
             }

extras/benchmark.php

Spacing +48 added lines, -48 removed lines

@@ -19,9 +19,9 @@ 
 use PhpXmlRpc\Encoder;
 
 /// @todo allow autoloading when the library is installed as dependency
-include_once __DIR__ . '/../vendor/autoload.php';
+include_once __DIR__.'/../vendor/autoload.php';
 
-include __DIR__ . '/../tests/parse_args.php';
+include __DIR__.'/../tests/parse_args.php';
 $args = argParser::getArgs();
 
 function begin_test($test_name, $test_case)
@@ -41,7 +41,7 @@ 
     if (!isset($test_results[$test_name][$test_case])) {
         trigger_error('ending test that was not started');
     }
-    $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
+    $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
     $test_results[$test_name][$test_case]['result'] = $test_result;
     echo '.';
     flush();
@@ -75,24 +75,24 @@ 
 }
 
 if ($is_web) {
-    echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
+    echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
     if ($xd) {
-        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
+        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
     }
     flush();
     ob_flush();
 } else {
-    echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
+    echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
     if ($xd) {
-        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
+        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
     }
 }
 
 // test 'manual style' data encoding vs. 'automatic style' encoding
 begin_test('Data encoding (large array)', 'manual encoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $vals = array();
-    for ($j = 0; $j < 10; $j++) {
+    for ($j = 0; $j<10; $j++) {
         $valarray = array();
         foreach ($data[$j] as $key => $val) {
             $values = array();
@@ -117,7 +117,7 @@ 
 
 begin_test('Data encoding (large array)', 'automatic encoding');
 $encoder = new Encoder();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $value = $encoder->encode($data, array('auto_dates'));
     $out = $value->serialize();
 }
@@ -125,8 +125,8 @@ 
 
 if (function_exists('xmlrpc_set_type')) {
     begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
-    for ($i = 0; $i < $num_tests; $i++) {
-        for ($j = 0; $j < 10; $j++) {
+    for ($i = 0; $i<$num_tests; $i++) {
+        for ($j = 0; $j<10; $j++) {
             foreach ($keys as $k) {
                 xmlrpc_set_type($data[$j][$k][4], 'datetime');
                 xmlrpc_set_type($data[$j][$k][8], 'datetime');
@@ -140,18 +140,18 @@ 
 // test 'old style' data decoding vs. 'automatic style' decoding
 $dummy = new Request('');
 $out = new Response($value);
-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
 
 begin_test('Data decoding (large array)', 'manual decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
-    foreach($value as $val1) {
+    foreach ($value as $val1) {
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
-            foreach($val as $data) {
+            foreach ($val as $data) {
                 $out[$name][] = $data->scalarval();
             }
         }
@@ -161,18 +161,18 @@ 
 end_test('Data decoding (large array)', 'manual decoding', $result);
 
 begin_test('Data decoding (large array)', 'manual decoding deprecated');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
     $l = $value->arraysize();
-    for ($k = 0; $k < $l; $k++) {
+    for ($k = 0; $k<$l; $k++) {
         $val1 = $value->arraymem($k);
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
             $m = $val->arraysize();
-            for ($j = 0; $j < $m; $j++) {
+            for ($j = 0; $j<$m; $j++) {
                 $data = $val->arraymem($j);
                 $out[$name][] = $data->scalarval();
             }
@@ -183,7 +183,7 @@ 
 end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
 
 begin_test('Data decoding (large array)', 'automatic decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true, 'phpvals');
     $value = $response->value();
 }
@@ -191,7 +191,7 @@ 
 
 if (function_exists('xmlrpc_decode')) {
     begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $response = $dummy->ParseResponse($in, true, 'xml');
         $value = xmlrpc_decode($response->value());
     }
@@ -208,16 +208,16 @@ 
     $value = $encoder->encode($data1, 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;
     }
 
     $server = explode(':', $args['HTTPSERVER']);
-    if (count($server) > 1) {
-        $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI'];
+    if (count($server)>1) {
+        $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $server[0], $server[1]);
     } else {
-        $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI'];
+        $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $args['HTTPSERVER']);
     }
 
@@ -229,7 +229,7 @@ 
 
     begin_test($testName, 'http 10');
     $response = array();
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $resp = $c->send($req);
         $response[] = $resp->value();
     }
@@ -239,7 +239,7 @@ 
         $c->keepalive = false;
         begin_test($testName, 'http 11 no keepalive');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -247,7 +247,7 @@ 
 
         begin_test($testName, 'http 11 w. keep-alive');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -269,7 +269,7 @@ 
 
         begin_test($testName, 'http 10 w. compression');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -279,7 +279,7 @@ 
             $c->keepalive = false;
             begin_test($testName, 'http 11 w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -288,7 +288,7 @@ 
             $c->keepalive = true;
             begin_test($testName, 'http 11 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -309,11 +309,11 @@ 
         /// test multicall vs. many calls vs. keep-alives - HTTPS
 
         $server = explode(':', $args['HTTPSSERVER']);
-        if (count($server) > 1) {
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
+        if (count($server)>1) {
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
         } else {
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https');
         }
         $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
@@ -327,7 +327,7 @@ 
         begin_test($testName, 'https no keep-alive');
         $c->keepalive = false;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -336,7 +336,7 @@ 
         begin_test($testName, 'https w. keep-alive');
         $c->keepalive = true;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10);
             $response[] = $resp->value();
         }
@@ -357,7 +357,7 @@ 
             $c->keepalive = false;
             begin_test($testName, 'https w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req);
                 $response[] = $resp->value();
             }
@@ -366,7 +366,7 @@ 
             $c->keepalive = true;
             begin_test($testName, 'https w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10);
                 $response[] = $resp->value();
             }
@@ -387,11 +387,11 @@ 
         /// test multicall vs. many calls vs. keep-alives - HTTP/2
 
         $server = explode(':', $args['HTTPSSERVER']);
-        if (count($server) > 1) {
-            $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI'];
+        if (count($server)>1) {
+            $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https');
         } else {
-            $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI'];
+            $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI'];
             $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2');
         }
         $c->setSSLVerifyPeer(!$args['HTTPSIGNOREPEER']);
@@ -405,7 +405,7 @@ 
         begin_test($testName, 'http2 no keep-alive');
         $c->keepalive = false;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -414,7 +414,7 @@ 
         begin_test($testName, 'http2 w. keep-alive');
         $c->keepalive = true;
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10);
             $response[] = $resp->value();
         }
@@ -435,7 +435,7 @@ 
             $c->keepalive = false;
             begin_test($testName, 'http2 w. compression and no keepalive');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req);
                 $response[] = $resp->value();
             }
@@ -444,7 +444,7 @@ 
             $c->keepalive = true;
             begin_test($testName, 'http2 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10);
                 $response[] = $resp->value();
             }
@@ -466,7 +466,7 @@ 
 foreach ($test_results as $test => $results) {
     echo "\nTEST: $test\n";
     foreach ($results as $case => $data) {
-        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
+        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
     }
 }
 

tests/PolyfillTestCase.php

Spacing +8 added lines, -8 removed lines

@@ -2,20 +2,20 @@
 
 use PHPUnit\Runner\Version as PHPUnit_Version;
 
-if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true
-    && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false
+if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true
+    && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false
 ) {
-    class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' );
+    class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage');
 }
 
-if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true
-    && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false
+if (class_exists('PHPUnit_Runner_BaseTestRunner') === true
+    && class_exists('PHPUnit\Runner\BaseTestRunner') === false
 ) {
-    class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' );
+    class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner');
 }
 
 if (class_exists('PHPUnit\Runner\Version') === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) {
-    include_once __DIR__ . '/PolyfillTestCase7.php';
+    include_once __DIR__.'/PolyfillTestCase7.php';
 } else {
-    include_once __DIR__ . '/PolyfillTestCase8.php';
+    include_once __DIR__.'/PolyfillTestCase8.php';
 }