gggeek / phpxmlrpc

tests/07ClientTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 use PhpXmlRpc\Client;
 
@@ -64,7 +64,7 @@ 
         $this->client->server .= 'XXX';
         $dnsinfo = @dns_get_record($this->client->server);
         if ($dnsinfo) {
-            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found');
+            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found');
         } else {
             $m = new xmlrpcmsg('examples.echo', array(
                 new xmlrpcval('hello', 'string'),
@@ -93,7 +93,7 @@ 
 
         // now test a successful connection
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client->port = $server[1];
         }
         $this->client->server = $server[0];

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';
 
 use PhpXmlRpc\Client;
 
@@ -17,7 +17,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(
@@ -31,21 +31,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');
         }
@@ -64,7 +64,7 @@ 
      */
     protected function newClient($path)
     {
-        $client = new Client($this->baseUrl . $path);
+        $client = new Client($this->baseUrl.$path);
         $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);

tests/02ValueTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 use PhpXmlRpc\Encoder;
 use PhpXmlRpc\Helper\XMLParser;
@@ -143,7 +143,7 @@ 
             if (version_compare(PHP_VERSION, '8.0', '>=')) {
                 $str = sprintf("%f", $v->scalarval());
             } else {
-                $str = (string)$v->scalarval();
+                $str = (string) $v->scalarval();
             }
             if (strpos($str, ',') == 1) {
                 $r = $v->serialize();
@@ -164,7 +164,7 @@ 
         $this->assertequals(1, count($v1));
         $out = array('me' => array(), 'mytype' => 2, '_php_class' => null);
 
-        foreach($v1 as $key => $val)
+        foreach ($v1 as $key => $val)
         {
             $this->assertArrayHasKey($key, $out);
             $expected = $out[$key];
@@ -179,7 +179,7 @@ 
         $this->assertequals(2, count($v2));
         $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object'));
         $i = 0;
-        foreach($v2 as $key => $val)
+        foreach ($v2 as $key => $val)
         {
             $expected = $out[$i];
             $this->assertequals($expected['key'], $key);
@@ -206,7 +206,7 @@ 
     {
         // nb: make sure that  the serialized xml corresponding to this is > 10MB in size
         $data = array();
-        for ($i = 0; $i < 500000; $i++ ) {
+        for ($i = 0; $i<500000; $i++) {
             $data[] = 'hello world';
         }
 

tests/03MessagesTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 use PhpXmlRpc\Response;
 

src/Wrapper.php

Spacing +96 added lines, -96 removed lines

@@ -173,20 +173,20 @@ 
             $callable = explode('::', $callable);
         }
         if (is_array($callable)) {
-            if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong');
+            if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong');
                 return false;
             }
             if (is_string($callable[0])) {
                 $plainFuncName = implode('::', $callable);
             } elseif (is_object($callable[0])) {
-                $plainFuncName = get_class($callable[0]) . '->' . $callable[1];
+                $plainFuncName = get_class($callable[0]).'->'.$callable[1];
             }
             $exists = method_exists($callable[0], $callable[1]);
         } else if ($callable instanceof \Closure) {
             // we do not support creating code which wraps closures, as php does not allow to serialize them
             if (!$buildIt) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code');
                 return false;
             }
 
@@ -198,7 +198,7 @@ 
         }
 
         if (!$exists) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName);
             return false;
         }
 
@@ -242,23 +242,23 @@ 
         if (is_array($callable)) {
             $func = new \ReflectionMethod($callable[0], $callable[1]);
             if ($func->isPrivate()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName);
                 return false;
             }
             if ($func->isProtected()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName);
                 return false;
             }
             if ($func->isConstructor()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isDestructor()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isAbstract()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName);
                 return false;
             }
             /// @todo add more checks for static vs. nonstatic?
@@ -268,7 +268,7 @@ 
         if ($func->isInternal()) {
             /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully
             ///       reflect internal php functions
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName);
             return false;
         }
 
@@ -328,7 +328,7 @@ 
         $i = 0;
         foreach ($func->getParameters() as $paramObj) {
             $params[$i] = array();
-            $params[$i]['name'] = '$' . $paramObj->getName();
+            $params[$i]['name'] = '$'.$paramObj->getName();
             $params[$i]['isoptional'] = $paramObj->isOptional();
             if (method_exists($paramObj, 'getType')) {
                 $paramType = $paramObj->getType();
@@ -399,7 +399,7 @@ 
             // build a signature
             $sig = array($this->php2XmlrpcType($funcDesc['returns']));
             $pSig = array($funcDesc['returnsDocs']);
-            for ($i = 0; $i < count($pars); $i++) {
+            for ($i = 0; $i<count($pars); $i++) {
                 $name = strtolower($funcDesc['params'][$i]['name']);
                 if (isset($funcDesc['paramDocs'][$name]['type'])) {
                     $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']);
@@ -455,7 +455,7 @@ 
                 }
             }
             $numPars = $req->getNumParams();
-            if ($numPars < $minPars || $numPars > $maxPars) {
+            if ($numPars<$minPars || $numPars>$maxPars) {
                 return new $responseClass(0, 3, 'Incorrect parameters passed to method');
             }
 
@@ -468,7 +468,7 @@ 
 
             $result = call_user_func_array($callable, $params);
 
-            if (! is_a($result, $responseClass)) {
+            if (!is_a($result, $responseClass)) {
                 // q: why not do the same for int, float, bool, string?
                 if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) {
                     $result = new $valueClass($result, $funcDesc['returns']);
@@ -507,9 +507,9 @@ 
         if ($newFuncName == '') {
             if (is_array($callable)) {
                 if (is_string($callable[0])) {
-                    $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable);
+                    $xmlrpcFuncName = "{$prefix}_".implode('_', $callable);
                 } else {
-                    $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1];
+                    $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1];
                 }
             } else {
                 if ($callable instanceof \Closure) {
@@ -541,9 +541,9 @@ 
      */
     protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc)
     {
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : '';
 
         $i = 0;
@@ -578,9 +578,9 @@ 
         // build body of new function
 
         $innerCode = "  \$paramCount = \$req->getNumParams();\n";
-        $innerCode .= "  if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n";
+        $innerCode .= "  if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n";
 
-        $innerCode .= "  \$encoder = new " . static::$namespace . "Encoder();\n";
+        $innerCode .= "  \$encoder = new ".static::$namespace."Encoder();\n";
         if ($decodePhpObjects) {
             $innerCode .= "  \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n";
         } else {
@@ -593,23 +593,23 @@ 
             static::holdObject($newFuncName, $callable[0]);
             $class = get_class($callable[0]);
             if ($class[0] !== '\\') {
-                $class = '\\' . $class;
+                $class = '\\'.$class;
             }
             $innerCode .= "  /// @var $class \$obj\n";
             $innerCode .= "  \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n";
-            $realFuncName = '$obj->' . $callable[1];
+            $realFuncName = '$obj->'.$callable[1];
         } else {
             $realFuncName = $plainFuncName;
         }
         foreach ($parsVariations as $i => $pars) {
-            $innerCode .= "  if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
-            if ($i < (count($parsVariations) - 1))
+            $innerCode .= "  if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n";
+            if ($i<(count($parsVariations)-1))
                 $innerCode .= "  else\n";
         }
-        $innerCode .= "  if (is_a(\$retVal, '" . static::$namespace . "Response'))\n    return \$retVal;\n  else\n";
+        $innerCode .= "  if (is_a(\$retVal, '".static::$namespace."Response'))\n    return \$retVal;\n  else\n";
         /// q: why not do the same for int, float, bool, string?
         if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) {
-            $innerCode .= "    return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));";
+            $innerCode .= "    return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));";
         } else {
             $encodeOptions = array();
             if ($encodeNulls) {
@@ -620,18 +620,18 @@ 
             }
 
             if ($encodeOptions) {
-                $innerCode .= "    return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" .
-                    implode("', '", $encodeOptions) . "')));";
+                $innerCode .= "    return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('".
+                    implode("', '", $encodeOptions)."')));";
             } else {
-                $innerCode .= "    return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));";
+                $innerCode .= "    return new ".static::$namespace."Response(\$encoder->encode(\$retVal));";
             }
         }
         // shall we exclude functions returning by ref?
         // if ($func->returnsReference())
         //     return false;
 
-        $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" .
-            "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}";
+        $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n".
+            "function $newFuncName(\$req)\n{\n".$innerCode."\n}";
 
         return $code;
     }
@@ -691,7 +691,7 @@ 
     protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array())
     {
         if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) {
-            return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . $classMethod;
+            return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod;
         }
 
         if (is_object($className)) {
@@ -699,7 +699,7 @@ 
         } else {
             $realClassName = $className;
         }
-        return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . "$realClassName.$classMethod";
+        return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod";
     }
 
     /**
@@ -795,14 +795,14 @@ 
      */
     protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array())
     {
-        $reqClass = static::$namespace . 'Request';
-        $valClass = static::$namespace . 'Value';
-        $decoderClass = static::$namespace . 'Encoder';
+        $reqClass = static::$namespace.'Request';
+        $valClass = static::$namespace.'Value';
+        $decoderClass = static::$namespace.'Encoder';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0;
+        $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0;
 
         $req = new $reqClass('system.methodSignature');
         $req->addParam(new $valClass($methodName));
@@ -812,7 +812,7 @@ 
         $response = $client->send($req, $timeout, $protocol);
         $client->setDebug($origDebug);
         if ($response->faultCode()) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName);
             return false;
         }
 
@@ -823,8 +823,8 @@ 
             $mSig = $decoder->decode($mSig);
         }
 
-        if (!is_array($mSig) || count($mSig) <= $sigNum) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName);
+        if (!is_array($mSig) || count($mSig)<=$sigNum) {
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName);
             return false;
         }
 
@@ -839,11 +839,11 @@ 
      */
     protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array())
     {
-        $reqClass = static::$namespace . 'Request';
-        $valClass = static::$namespace . 'Value';
+        $reqClass = static::$namespace.'Request';
+        $valClass = static::$namespace.'Value';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
 
         $mDesc = '';
@@ -880,11 +880,11 @@ 
         $clientClone = $this->cloneClientForClosure($client);
         $function = function() use($clientClone, $methodName, $extraOptions, $mSig)
         {
-            $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+            $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
             $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
-            $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
+            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
+            $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
             $throwFault = false;
             $decodeFault = false;
             $faultResponse = null;
@@ -895,9 +895,9 @@ 
                 $faultResponse = $extraOptions['return_on_fault'];
             }
 
-            $reqClass = static::$namespace . 'Request';
-            $encoderClass = static::$namespace . 'Encoder';
-            $valueClass = static::$namespace . 'Value';
+            $reqClass = static::$namespace.'Request';
+            $encoderClass = static::$namespace.'Encoder';
+            $valueClass = static::$namespace.'Value';
 
             $encoder = new $encoderClass();
             $encodeOptions = array();
@@ -979,14 +979,14 @@ 
      * @param string $mDesc
      * @return string[] keys: source, docstring
      */
-    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='')
+    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '')
     {
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
         $throwFault = false;
         $decodeFault = false;
@@ -999,10 +999,10 @@ 
         }
 
         $code = "function $newFuncName(";
-        if ($clientCopyMode < 2) {
+        if ($clientCopyMode<2) {
             // client copy mode 0 or 1 == full / partial client copy in emitted code
             $verbatimClientCopy = !$clientCopyMode;
-            $innerCode = '  ' . str_replace("\n", "\n  ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
+            $innerCode = '  '.str_replace("\n", "\n  ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
             $innerCode .= "\$client->setDebug(\$debug);\n";
             $this_ = '';
         } else {
@@ -1010,28 +1010,28 @@ 
             $innerCode = '';
             $this_ = 'this->';
         }
-        $innerCode .= "  \$req = new " . static::$namespace . "Request('$methodName');\n";
+        $innerCode .= "  \$req = new ".static::$namespace."Request('$methodName');\n";
 
         if ($mDesc != '') {
             // take care that PHP comment is not terminated unwillingly by method description
             /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags...
-            $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n";
+            $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n";
         } else {
             $mDesc = "/**\n * Function $newFuncName.\n";
         }
 
         // param parsing
-        $innerCode .= "  \$encoder = new " . static::$namespace . "Encoder();\n";
+        $innerCode .= "  \$encoder = new ".static::$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' ||
                 $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null'
             ) {
                 // only build directly xml-rpc values when type is known and scalar
-                $innerCode .= "  \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n";
+                $innerCode .= "  \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n";
             } else {
                 if ($encodePhpObjects || $encodeNulls) {
                     $encOpts = array();
@@ -1042,26 +1042,26 @@ 
                         $encOpts[] = 'null_extension';
                     }
 
-                    $innerCode .= "  \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n";
+                    $innerCode .= "  \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n";
                 } else {
                     $innerCode .= "  \$p$i = \$encoder->encode(\$p$i);\n";
                 }
             }
             $innerCode .= "  \$req->addParam(\$p$i);\n";
-            $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n";
+            $mDesc .= " * @param ".$this->xmlrpc2PhpType($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 ' . $this->xmlrpc2PhpType($mSig[0]);
+        $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]);
         if ($throwFault) {
-            $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception');
+            $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception');
         } else if ($decodeFault) {
-            $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)";
+            $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)";
         } else {
-            $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)";
+            $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)";
         }
         $mDesc .= "\n */\n";
 
@@ -1074,9 +1074,9 @@ 
             $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())";
         } else if ($decodeFault) {
             if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-                $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+                $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
             } else {
-                $respCode = 'return ' . var_export($faultResponse, true);
+                $respCode = 'return '.var_export($faultResponse, true);
             }
         } else {
             $respCode = 'return $res';
@@ -1087,7 +1087,7 @@ 
             $innerCode .= "  if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());";
         }
 
-        $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n";
+        $code = $code.$plist.")\n{\n".$innerCode."\n}\n";
 
         return array('source' => $code, 'docstring' => $mDesc);
     }
@@ -1117,26 +1117,26 @@ 
     public function wrapXmlrpcServer($client, $extraOptions = array())
     {
         $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : '';
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
         $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : '';
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true;
-        $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false;
+        $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false;
         $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
 
-        $reqClass = static::$namespace . 'Request';
-        $decoderClass = static::$namespace . 'Encoder';
+        $reqClass = static::$namespace.'Request';
+        $decoderClass = static::$namespace.'Encoder';
 
         // retrieve the list of methods
         $req = new $reqClass('system.listMethods');
         /// @todo move setting of timeout, protocol to outside the send() call
         $response = $client->send($req, $timeout, $protocol);
         if ($response->faultCode()) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server');
 
             return false;
         }
@@ -1147,7 +1147,7 @@ 
             $mList = $decoder->decode($mList);
         }
         if (!is_array($mList) || !count($mList)) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server');
 
             return false;
         }
@@ -1157,8 +1157,8 @@ 
             $xmlrpcClassName = $newClassName;
         } else {
             /// @todo direct access to $client->server is now deprecated
-            $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''),
-                $client->server) . '_client';
+            $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''),
+                $client->server).'_client';
         }
         while ($buildIt && class_exists($xmlrpcClassName)) {
             $xmlrpcClassName .= 'x';
@@ -1166,7 +1166,7 @@ 
 
         $source = "class $xmlrpcClassName\n{\n  public \$client;\n\n";
         $source .= "  function __construct()\n  {\n";
-        $source .= '    ' . str_replace("\n", "\n    ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
+        $source .= '    '.str_replace("\n", "\n    ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
         $source .= "\$this->client = \$client;\n  }\n\n";
         $opts = array(
             'return_source' => true,
@@ -1189,28 +1189,28 @@ 
                 $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts);
                 if ($methodWrap) {
                     if ($buildIt) {
-                        $source .= $methodWrap['source'] . "\n";
+                        $source .= $methodWrap['source']."\n";
 
                     } else {
-                        $source .= '  ' . str_replace("\n", "\n  ", $methodWrap['docstring']);
-                        $source .= str_replace("\n", "\n  ", $methodWrap['source']). "\n";
+                        $source .= '  '.str_replace("\n", "\n  ", $methodWrap['docstring']);
+                        $source .= str_replace("\n", "\n  ", $methodWrap['source'])."\n";
                     }
 
                 } else {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName);
                 }
             }
         }
         $source .= "}\n";
         if ($buildIt) {
             $allOK = 0;
-            eval($source . '$allOK=1;');
+            eval($source.'$allOK=1;');
             if ($allOK) {
                 return $xmlrpcClassName;
             } else {
                 /// @todo direct access to $client->server is now deprecated
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName .
-                    ' to wrap remote server ' . $client->server);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.
+                    ' to wrap remote server '.$client->server);
                 return false;
             }
         } else {
@@ -1229,7 +1229,7 @@ 
      */
     protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\')
     {
-        $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()) .
+        $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()).
             "');\n";
 
         // copy all client fields to the client that will be generated runtime

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->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";
     }
 }