gggeek / phpxmlrpc

src/Encoder.php

Spacing +7 added lines, -7 removed lines

@@ -57,13 +57,13 @@ 
                                 'scalar' => $val,
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'base64':
                             $xmlrpcVal = array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $val
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'string':
                             if (isset($options['extension_api_encoding'])) {
                                 // if iconv is not available, we use mb_convert_encoding
@@ -136,7 +136,7 @@ 
             case 'msg':
                 $paramCount = $xmlrpcVal->getNumParams();
                 $arr = array();
-                for ($i = 0; $i < $paramCount; $i++) {
+                for ($i = 0; $i<$paramCount; $i++) {
                     $arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
                 }
                 return $arr;
@@ -261,7 +261,7 @@ 
                 break;
             case 'resource':
                 if (in_array('extension_api', $options)) {
-                    $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
+                    $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
                 } else {
                     $xmlrpcVal = new Value();
                 }
@@ -310,7 +310,7 @@ 
                     if ($valEncoding == 'ISO-8859-1') {
                         $xmlVal = utf8_encode($xmlVal);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
                     }
                 }
             }
@@ -332,7 +332,7 @@ 
             $parserOptions
         );
 
-        if ($xmlRpcParser->_xh['isf'] > 1) {
+        if ($xmlRpcParser->_xh['isf']>1) {
             // test that $xmlrpc->_xh['value'] is an obj, too???
 
             $this->getLogger()->error($xmlRpcParser->_xh['isf_reason']);
@@ -356,7 +356,7 @@ 
 
             case 'methodcall':
                 $req = new Request($xmlRpcParser->_xh['method']);
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
                 return $req;

src/Value.php

Spacing +16 added lines, -16 removed lines

@@ -93,7 +93,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)");
             }
         }
     }
@@ -117,7 +117,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;
         }
 
@@ -134,10 +134,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
@@ -179,7 +179,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;
         }
     }
@@ -209,7 +209,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;
         }
     }
@@ -251,19 +251,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,
@@ -271,16 +271,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((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $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}>";
@@ -302,14 +302,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.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -344,7 +344,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";
     }
 
     /**

tests/05LoggerTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PhpXmlRpc\Helper\Charset;
 use PhpXmlRpc\Helper\Http;
@@ -38,9 +38,9 @@ 
         $l = $h->getLogger();
         Http::setLogger($this);
 
-        $s = "HTTP/1.0 200 OK\r\n" .
-            "Content-Type: unknown\r\n" .
-            "\r\n" .
+        $s = "HTTP/1.0 200 OK\r\n".
+            "Content-Type: unknown\r\n".
+            "\r\n".
             "body";
         ob_start();
         $h->parseResponseHeaders($s, false, 1);

src/Response.php

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
                 // user declares the type of resp value: we "almost" trust it... but log errors just in case
                 if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) ||
                     ($this->valtyp == 'xml' && (!is_string($this->val)))) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType);
                 }
             }
         }
@@ -152,33 +152,33 @@ 
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding).
                 "</string></value>\n</member>\n</struct>\n</value>\n</fault>";
         } else {
             if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) {
-                $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>";
+                $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>";
             } else if (is_string($this->val) && $this->valtyp == 'xml') {
-                $result .= "<params>\n<param>\n" .
-                    $this->val .
+                $result .= "<params>\n<param>\n".
+                    $this->val.
                     "</param>\n</params>";
             } else if ($this->valtyp == 'phpvals') {
                     $encoder = new Encoder();
                     $val = $encoder->encode($this->val);
-                    $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>";
+                    $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>";
             } else {
                 throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values');
             }
@@ -204,7 +204,7 @@ 
                 return $this->httpResponse['raw_data'];
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                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);
                 return null;
         }
     }
@@ -225,7 +225,7 @@ 
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                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);
         }
     }
 
@@ -259,7 +259,7 @@ 
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                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);
         }
     }
 }

src/Request.php

Spacing +24 added lines, -24 removed lines

@@ -57,9 +57,9 @@ 
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -82,16 +82,16 @@ 
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -141,7 +141,7 @@ 
 
             return true;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
             return false;
         }
     }
@@ -213,14 +213,14 @@ 
      */
     public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
     {
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $this->getLogger()->debug("---GOT---\n$data\n---END---");
         }
 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -228,12 +228,12 @@ 
         if (substr($data, 0, 4) == 'HTTP') {
             $httpParser = new Http();
             try {
-                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
+                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
             } catch (HttpException $e) {
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         } else {
@@ -249,7 +249,7 @@ 
         // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -258,21 +258,21 @@ 
             $data
         );
 
-        if ($this->debug >= 0) {
+        if ($this->debug>=0) {
             $this->httpResponse = $httpResponse;
         } else {
             $httpResponse = null;
         }
 
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 /// @todo what if there is no end tag?
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
             }
         }
 
@@ -294,7 +294,7 @@ 
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -320,16 +320,16 @@ 
             //    there could be proxies meddling with the request, or network data corruption...
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
 
-            if ($this->debug > 0) {
+            if ($this->debug>0) {
                 $this->getLogger()->debug($xmlRpcParser->_xh['isf_reason']);
             }
         }
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
 
             /// @todo echo something for the user? check if it was already done by the parser...
             //if ($this->debug > 0) {
@@ -338,7 +338,7 @@ 
         }
         // third error check: parsing of the response has somehow gone boink.
         /// @todo shall we omit this check, since we trust the parsing code?
-        elseif ($xmlRpcParser->_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
+        elseif ($xmlRpcParser->_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
             // something odd has happened and it's time to generate a client side error indicating something odd went on
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
                 '', $httpResponse
@@ -346,7 +346,7 @@ 
 
             /// @todo echo something for the user?
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debug(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );
@@ -370,7 +370,7 @@ 
                 if ($errNo == 0) {
                     // FAULT returned, errno needs to reflect that
                     /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
                     $errNo = -1;
                 }
 

tests/12ExtraFilesTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'extras' directory.

tests/10DemofilesTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory.

tests/08ServerTest.php

Spacing +28 added lines, -28 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 /**
  * Tests which involve interaction with the server - carried out via the client.
@@ -29,7 +29,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            for ($i = 0; $i < count($trace); $i++) {
+            for ($i = 0; $i<count($trace); $i++) {
                 if (strpos($trace[$i]['function'], 'test') === 0) {
                     self::$failed_tests[$trace[$i]['function']] = true;
                     break;
@@ -45,7 +45,7 @@ 
         parent::set_up();
 
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
@@ -75,9 +75,9 @@ 
         }
         $this->validateResponse($r);
         if (is_array($errorCode)) {
-            $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         } else {
-            $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         }
         if (!$r->faultCode()) {
             if ($returnResponse) {
@@ -104,20 +104,20 @@ 
         $query = parse_url($this->client->path, PHP_URL_QUERY);
         parse_str($query, $vars);
         $query = http_build_query(array_merge($vars, $data));
-        $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
+        $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
     }
 
     public function testString()
     {
-        $sendString = "here are 3 \"entities\": < > & " .
-            "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
-            " - isn't that great? \\\"hackery\\\" at it's best " .
-            " also don't want to miss out on \$item[0]. " .
-            "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
-            "a simple CR here" . chr(13) .
-            "a simple LF here" . chr(10) .
-            "and then LFCR" . chr(10) . chr(13) .
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
+        $sendString = "here are 3 \"entities\": < > & ".
+            "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
+            " - isn't that great? \\\"hackery\\\" at it's best ".
+            " also don't want to miss out on \$item[0]. ".
+            "The real weird stuff follows: CRLF here".chr(13).chr(10).
+            "a simple CR here".chr(13).
+            "a simple LF here".chr(10).
+            "and then LFCR".chr(10).chr(13).
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
         $m = new xmlrpcmsg('examples.stringecho', array(
             new xmlrpcval($sendString, 'string'),
         ));
@@ -138,7 +138,7 @@ 
     public function testLatin1String()
     {
         $sendString =
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
         $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
             $sendString.
             '</value></param></params></methodCall>';
@@ -247,7 +247,7 @@ 
     public function testUtf8Method()
     {
         PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
-        $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
+        $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
             new xmlrpcval('hello')
         ));
         $v = $this->send($m);
@@ -268,7 +268,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -280,7 +280,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -319,7 +319,7 @@ 
         if ($v) {
             $sz = $v->arraysize();
             $got = '';
-            for ($i = 0; $i < $sz; $i++) {
+            for ($i = 0; $i<$sz; $i++) {
                 $b = $v->arraymem($i);
                 if ($b->scalarval()) {
                     $got .= '1';
@@ -366,7 +366,7 @@ 
             $got = '';
             $expected = '37210';
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
-            foreach($expect_array as $val) {
+            foreach ($expect_array as $val) {
                 $b = $v->structmem($val);
                 $got .= $b->me['int'];
             }
@@ -868,7 +868,7 @@ 
     {
         // make a 'deep client copy' as the original one might have many properties set
         // also for speed only wrap one method of the whole server
-        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
+        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
         if ($class == '') {
             $this->fail('Registration of remote server failed');
         } else {
@@ -907,9 +907,9 @@ 
         $cookies = array(
             //'c1' => array(),
             'c2' => array('value' => 'c2'),
-            'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
-            'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
-            'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
+            'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
+            'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
+            'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
         );
         $cookiesval = php_xmlrpc_encode($cookies);
         $m = new xmlrpcmsg('tests.setcookies', array($cookiesval));
@@ -957,10 +957,10 @@ 
         $m = new xmlrpcmsg('tests.getcookies', array());
         foreach ($cookies as $cookie => $val) {
             $this->client->setCookie($cookie, $val);
-            $cookies[$cookie] = (string)$cookies[$cookie];
+            $cookies[$cookie] = (string) $cookies[$cookie];
         }
         $r = $this->client->send($m, $this->timeout, $this->method);
-        $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+        $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         if (!$r->faultCode()) {
             $v = $r->value();
             $v = php_xmlrpc_decode($v);

tests/WebTestCase.php

Spacing +4 added lines, -4 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(
@@ -33,7 +33,7 @@ 
         {
             curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId);
         }
-        if ($this->args['DEBUG'] > 0) {
+        if ($this->args['DEBUG']>0) {
             curl_setopt($ch, CURLOPT_VERBOSE, 1);
         }
         $page = curl_exec($ch);
@@ -57,7 +57,7 @@ 
      */
     protected function newClient($path)
     {
-        $client = new \PhpXmlRpc\Client($this->baseUrl . $path);
+        $client = new \PhpXmlRpc\Client($this->baseUrl.$path);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);
         }