gggeek / phpxmlrpc

demo/server/methodProviders/validator1.php

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $numCurly = 0;
@@ -38,13 +38,13 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $moe = $sno["moe"];
             $larry = $sno["larry"];
             $curly = $sno["curly"];
-            $num = $moe->scalarVal() + $larry->scalarVal() + $curly->scalarVal();
+            $num = $moe->scalarVal()+$larry->scalarVal()+$curly->scalarVal();
 
             return new Response(new Value($num, Value::$xmlrpcInt));
         }
@@ -55,7 +55,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -71,7 +71,7 @@ 
             )
         ),
         "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             return new Response(new Value(
                 array(
@@ -92,14 +92,14 @@ 
             array(Value::$xmlrpcString, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $ar = $req->getParam(0);
             $sz = $ar->count();
             $first = $ar[0];
-            $last = $ar[$sz - 1];
+            $last = $ar[$sz-1];
 
-            return new Response(new Value($first->scalarVal() . $last->scalarVal(), Value::$xmlrpcString));
+            return new Response(new Value($first->scalarVal().$last->scalarVal(), Value::$xmlrpcString));
         }
     ),
 
@@ -108,7 +108,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcInt)
         ),
         "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $v = $sno->scalarVal();
@@ -129,7 +129,7 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -140,7 +140,7 @@ 
             $larry = $fools["larry"];
             $moe = $fools["moe"];
 
-            return new Response(new Value($curly->scalarVal() + $larry->scalarVal() + $moe->scalarVal(), Value::$xmlrpcInt));
+            return new Response(new Value($curly->scalarVal()+$larry->scalarVal()+$moe->scalarVal(), Value::$xmlrpcInt));
         }
     ),
 
@@ -149,7 +149,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcString)
         ),
         "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $str = $sno->scalarVal();
@@ -158,7 +158,7 @@ 
             $ap = 0;
             $qu = 0;
             $amp = 0;
-            for ($i = 0; $i < strlen($str); $i++) {
+            for ($i = 0; $i<strlen($str); $i++) {
                 $c = substr($str, $i, 1);
                 switch ($c) {
                     case ">":

demo/server/methodProviders/wrapper.php

Spacing +8 added lines, -8 removed lines

@@ -26,11 +26,11 @@ 
  */
 function plain_findstate($stateNo)
 {
-     if (isset(exampleMethods::$stateNames[$stateNo - 1])) {
-        return exampleMethods::$stateNames[$stateNo - 1];
+     if (isset(exampleMethods::$stateNames[$stateNo-1])) {
+        return exampleMethods::$stateNames[$stateNo-1];
     } else {
         // not, there so complain
-        throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
+        throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
     }
 }
 
@@ -69,7 +69,7 @@ 
         if ($req->getNumParams()) {
             $p1 = $req->getParam(0);
             if ($p1->kindOf() === 'scalar') {
-                $errNum = (int)$p1->scalarVal();
+                $errNum = (int) $p1->scalarVal();
             }
         }
         throw new Exception("it's just a test", $errNum);
@@ -141,13 +141,13 @@ 
 
 $findstate10_sig = array(
     /// @todo add a demo and test with closure usage
-    "function" => function ($req) { return exampleMethods::findState($req); },
+    "function" => function($req) { return exampleMethods::findState($req); },
     "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
-    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
+    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
         'index of that state name in an alphabetic order.',
 );
 
-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
 
 /// @todo do we really need a new instance ?
 $c = new handlersContainer();
@@ -156,7 +156,7 @@ 
 
 $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
 
-$returnObj_sig =  $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
 
 return array_merge(
     array(

tests/parse_args.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
         // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST)
         // Note that the only use-case for web-page mode is when this is used by benchmark.php
         if (!isset($_SERVER['REQUEST_METHOD'])) {
-            foreach($_SERVER as $key => $val) {
+            foreach ($_SERVER as $key => $val) {
                 if (array_key_exists($key, $args)) {
                     $$key = $val;
                 }
@@ -91,7 +91,7 @@ 
             //}
         }
         if ($HTTPURI[0] != '/') {
-            $HTTPURI = '/' . $HTTPURI;
+            $HTTPURI = '/'.$HTTPURI;
         }
         $args['HTTPURI'] = $HTTPURI;
 
@@ -105,21 +105,21 @@ 
         }
 
         if (isset($HTTPSIGNOREPEER)) {
-            $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER;
+            $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER;
         }
 
         if (isset($HTTPSVERIFYHOST)) {
-            $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST;
+            $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST;
         }
 
         if (isset($SSLVERSION)) {
-            $args['SSLVERSION'] = (int)$SSLVERSION;
+            $args['SSLVERSION'] = (int) $SSLVERSION;
         }
 
         if (isset($PROXYSERVER)) {
             $arr = explode(':', $PROXYSERVER);
             $args['PROXYSERVER'] = $arr[0];
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $args['PROXYPORT'] = $arr[1];
             } else {
                 $args['PROXYPORT'] = 8080;

src/Request.php

Spacing +38 added lines, -38 removed lines

@@ -84,7 +84,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;
         }
     }
@@ -134,17 +134,17 @@ 
         $this->logDeprecationUnlessCalledBy('serialize');
 
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
 
         $result = $this->xml_header($charsetEncoding);
-        $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $result .= "<params>\n";
         foreach ($this->params as $p) {
-            $result .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $result .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $result .= "</params>\n";
@@ -164,9 +164,9 @@ 
         $this->logDeprecationUnlessCalledBy('createPayload');
 
         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";
         }
     }
 
@@ -228,14 +228,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']);
         }
 
@@ -243,12 +243,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 {
@@ -264,7 +264,7 @@ 
         // idea from Luca Mariano, 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
@@ -273,21 +273,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));
             }
         }
 
@@ -309,7 +309,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);
                     }
                 }
             }
@@ -339,16 +339,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'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse);
 
-            if ($this->debug > 0) {
+            if ($this->debug>0) {
                 $this->getLogger()->debug($_xh['isf_reason']);
             }
         }
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse);
 
             /// @todo echo something for the user? check if it was already done by the parser...
             //if ($this->debug > 0) {
@@ -358,7 +358,7 @@ 
         // third error check: parsing of the response has somehow gone boink.
         /// @todo shall we omit the 2nd part of this check, since we trust the parsing code?
         ///       Either that, or check the fault results too...
-        elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) {
+        elseif ($_xh['isf']>3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_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
@@ -366,7 +366,7 @@ 
 
             /// @todo echo something for the user?
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debug(
                     "---PARSED---\n".var_export($_xh['value'], true)."\n---END---"
                 );
@@ -390,7 +390,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');
                     /// @todo in Encoder::decodeXML, we use PhpXmlRpc::$xmlrpcerr['invalid_return'] for this case (see
                     ///       also the todo 17 lines above)
                     $errNo = -1;
@@ -438,7 +438,7 @@ 
             case '_php_class':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
                 return $this->$name;
             case 'httpResponse':
                 // manually implement the 'protected property' behaviour
@@ -450,16 +450,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
                     return $this->httpResponse;
                 } else {
-                    trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR);
                 }
                 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 __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;
         }
@@ -473,7 +473,7 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             case 'httpResponse':
@@ -486,16 +486,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
                     $this->httpResponse = $value;
                 } else {
-                    trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR);
                 }
                 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);
         }
     }
 
@@ -507,7 +507,7 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
                 return isset($this->$name);
             case 'httpResponse':
                 // manually implement the 'protected property' behaviour
@@ -519,7 +519,7 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
                     return isset($this->httpResponse);
                 }
                 // break through voluntarily
@@ -536,7 +536,7 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             case 'httpResponse':
@@ -549,16 +549,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
                     unset($this->httpResponse);
                 } else {
-                    trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR);
                 }
                 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/server/server.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     }
 }
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Server;

demo/server/legacy.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 // That is generally a good idea security-wise, but you might want to allow it in case of specific needs.
 // Look at the code in demo/server.php for an example of how to enable that.
 
-require_once __DIR__ . "/../../lib/xmlrpc.inc";
-require_once __DIR__ . "/../../lib/xmlrpcs.inc";
+require_once __DIR__."/../../lib/xmlrpc.inc";
+require_once __DIR__."/../../lib/xmlrpcs.inc";
 
 $signatures1 = include(__DIR__.'/methodProviders/functions.php');
 $signatures2 = include(__DIR__.'/methodProviders/interop.php');

tests/08ServerTest.php

Spacing +27 added lines, -27 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.
@@ -30,7 +30,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'servertest') {
             $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;
@@ -79,9 +79,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) {
@@ -108,20 +108,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'),
         ));
@@ -142,7 +142,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>';
@@ -251,7 +251,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);
@@ -272,7 +272,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -284,7 +284,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -323,7 +323,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';
@@ -370,7 +370,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->scalarVal();
             }
@@ -873,7 +873,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 {
@@ -912,9 +912,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));
@@ -962,10 +962,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/index.php

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
 // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also
 // write a specific file to disk.
 // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file
-$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt';
+$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt';
 $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : '';
 $fileId = file_exists($idFile) ? file_get_contents($idFile) : '';
 if ($randId == '' || $fileId == '' || $fileId !== $randId) {
@@ -31,7 +31,7 @@ 
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }
 
 $targetFile = null;
@@ -54,7 +54,7 @@ 
 }
 
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }
 
 /**
@@ -87,7 +87,7 @@ 
         } elseif ($_GET['FORCE_AUTH'] == 'Digest') {
             if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
                 header('HTTP/1.1 401 Unauthorized');
-                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
+                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
                 die('Text visible if user hits Cancel button');
             }
         }
@@ -95,11 +95,11 @@ 
     if (isset($_GET['FORCE_REDIRECT'])) {
         header('HTTP/1.0 302 Found');
         unset($_GET['FORCE_REDIRECT']);
-        header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : ''));
+        header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : ''));
         die();
     }
-    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS'] > 0) {
-        slowLoris((int)$_GET['SLOW_LORIS'], $s);
+    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS']>0) {
+        slowLoris((int) $_GET['SLOW_LORIS'], $s);
         die();
     }
 }
@@ -113,13 +113,13 @@ 
 {
     /// @todo as is, this method can not be used by eg. jsonrpc servers. We could look at the value $s::$responseClass
     ///       to improve that
-    $strings = array('<?xml version="1.0"?>','<methodResponse>','<params>','<param>','<value>','<string></string>','</value>','</param>','</params>','</methodResponse>');
+    $strings = array('<?xml version="1.0"?>', '<methodResponse>', '<params>', '<param>', '<value>', '<string></string>', '</value>', '</param>', '</params>', '</methodResponse>');
 
     header('Content-type: xml; charset=utf-8');
-    foreach($strings as $i => $string) {
+    foreach ($strings as $i => $string) {
         echo $string;
         flush();
-        if ($i < count($strings) && $secs > 0 && $secs <= 60) {
+        if ($i<count($strings) && $secs>0 && $secs<=60) {
             sleep($secs);
         }
     }

tests/legacy_loader_test.php

Spacing +7 added lines, -7 removed lines

@@ -6,15 +6,15 @@ 
 
 echo "Legacy Loader Test\n\n";
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
 $args = argParser::getArgs();
-$baseurl = 'http://' . $args['HTTPSERVER'] . str_replace('/server.php', '/legacy.php', $args['HTTPURI']);
+$baseurl = 'http://'.$args['HTTPSERVER'].str_replace('/server.php', '/legacy.php', $args['HTTPURI']);
 
 $randId = uniqid();
-file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', $randId);
+file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', $randId);
 
 $client = new xmlrpc_client($baseurl);
 $client->setCookie('PHPUNIT_RANDOM_TEST_ID', $randId);
@@ -22,11 +22,11 @@ 
 $req = new xmlrpcmsg('system.listMethods', array());
 $resp = $client->send($req);
 if ($resp->faultCode() !== 0) {
-    unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
-    throw new \Exception("system.listMethods returned fault " . $resp->faultCode());
+    unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');
+    throw new \Exception("system.listMethods returned fault ".$resp->faultCode());
 }
 echo ". 1/1 (100%)\n\n";
 
 echo "OK (1 test, 1 assertion)\n";
 
-unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
+unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');