gggeek / phpxmlrpc

src/Value.php

Spacing +31 added lines, -31 removed lines

@@ -98,7 +98,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -128,7 +128,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -145,10 +145,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -192,7 +192,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -223,7 +223,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -288,7 +288,7 @@ 
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**
@@ -303,7 +303,7 @@ 
     {
         $this->logDeprecationUnlessCalledBy('serialize');
 
-        if (!isset(static::$xmlrpcTypes[(string)$typ])) {
+        if (!isset(static::$xmlrpcTypes[(string) $typ])) {
             return '';
         }
 
@@ -311,19 +311,19 @@ 
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs = "<{$typ}>" . base64_encode($val) . "</{$typ}>";
+                        $rs = "<{$typ}>".base64_encode($val)."</{$typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs = "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
+                        $rs = "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs = "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
+                        $rs = "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs = "<{$typ}>" . (int)$val . "</{$typ}>";
+                        $rs = "<{$typ}>".(int) $val."</{$typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -331,16 +331,16 @@ 
                         // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs = "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((float)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((float) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs = "<{$typ}>{$val}</{$typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs = "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
+                            $rs = "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
                         } elseif (is_int($val)) {
-                            $rs = "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
+                            $rs = "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs = "<{$typ}>{$val}</{$typ}>";
@@ -362,14 +362,14 @@ 
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs = '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs = '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs = "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
                 }
@@ -581,7 +581,7 @@ 
      */
     public function structMemExists($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return array_key_exists($key, $this->me['struct']);
     }
@@ -597,7 +597,7 @@ 
      */
     public function structMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['struct'][$key];
     }
@@ -610,7 +610,7 @@ 
      */
     public function structReset()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         reset($this->me['struct']);
     }
@@ -624,7 +624,7 @@ 
      */
     public function structEach()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $key = key($this->me['struct']);
         $value = current($this->me['struct']);
@@ -643,7 +643,7 @@ 
      */
     public function arrayMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['array'][$key];
     }
@@ -657,7 +657,7 @@ 
      */
     public function arraySize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['array']);
     }
@@ -671,7 +671,7 @@ 
      */
     public function structSize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['struct']);
     }
@@ -683,12 +683,12 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Getting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Value::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -700,13 +700,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Setting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Value::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -716,7 +716,7 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Checking property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Value::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -729,13 +729,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

demo/client/getstatename.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>phpxmlrpc - Getstatename demo</title></head>
@@ -17,13 +17,13 @@ 
 $stateNo = "";
 
 if (isset($_POST['stateno']) && $_POST['stateno'] != "") {
-    $stateNo = (int)$_POST['stateno'];
+    $stateNo = (int) $_POST['stateno'];
     $method = 'examples.getStateName';
     $arguments = array(
         new Value($stateNo, Value::$xmlrpcInt),
     );
     $req = new Request($method, $arguments);
-    output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) .
+    output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()).
         "\n\n</pre>Debug info of server data follows...\n\n");
     $client = new Client(XMLRPCSERVER);
     $client->setOption(Client::OPT_DEBUG, 1);
@@ -32,12 +32,12 @@ 
         $val = $resp->value();
         // NB: we are _assuming_ that the server did return a scalar xml-rpc value here.
         // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'`
-        output('<br/>State number <b>' . $stateNo . '</b> is <b>'
-            . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>');
+        output('<br/>State number <b>'.$stateNo.'</b> is <b>'
+            . htmlspecialchars($val->scalarVal()).'</b><br/><br/>');
     } else {
         output('An error occurred: ');
-        output('<pre>Code: ' . htmlspecialchars($resp->faultCode())
-            . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>");
+        output('<pre>Code: '.htmlspecialchars($resp->faultCode())
+            . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>");
     }
 }
 

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE ***
 // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!!
@@ -47,7 +47,7 @@ 
     //            fe. any url using the 'file://' protocol might be considered a hacking attempt
     $client = new 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));
@@ -87,7 +87,7 @@ 
                     $client->setOption(Client::OPT_VERIFY_PEER, $val);
                     break;
                 case 'Timeout':
-                    $timeout = (int)$val;
+                    $timeout = (int) $val;
                     break;
             } // switch
         }
@@ -100,7 +100,7 @@ 
     ///         X-forwarded-for anyway, unless they consider this server as trusted...)
     $reqMethod = $req->getParam(1)->scalarVal();
     $req = new Request($reqMethod);
-    if ($req->getNumParams() > 1) {
+    if ($req->getNumParams()>1) {
         $pars = $req->getParam(2);
         foreach ($pars as $par) {
             $req->addParam($par);
@@ -108,7 +108,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }

src/Helper/XMLParser.php

Spacing +56 added lines, -56 removed lines

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

Braces +9 added lines, -3 removed lines

@@ -272,19 +272,25 @@
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION < 8) {
+            xml_parser_free($parser);
+        }
         $this->current_parsing_options = array();
 
         // BC

tests/WebTestCase.php

Spacing +8 added lines, -8 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
+        if (PHP_MAJOR_VERSION < 8) {
+            curl_close($ch);
+        }
 
         $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
         if (!$emptyPageOk) {

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($data);
-$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->setOption(Client::OPT_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->setOption(Client::OPT_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->setOption(Client::OPT_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->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']);
@@ -327,7 +327,7 @@ 
         $c->setOption(Client::OPT_KEEPALIVE, false);
         begin_test($testName, 'https no keep-alive');
         $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 @@ 
         $c->setOption(Client::OPT_KEEPALIVE, true);
         begin_test($testName, 'https w. keep-alive');
         $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->setOption(Client::OPT_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->setOption(Client::OPT_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->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']);
@@ -405,7 +405,7 @@ 
         $c->setOption(Client::OPT_KEEPALIVE, false);
         begin_test($testName, 'http2 no keep-alive');
         $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 @@ 
         $c->setOption(Client::OPT_KEEPALIVE, true);
         begin_test($testName, 'http2 w. keep-alive');
         $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->setOption(Client::OPT_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->setOption(Client::OPT_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";
     }
 }