gggeek / phpxmlrpc

src/Server.php

Indentation +1 added lines, -1 removed lines

@@ -463,7 +463,7 @@
     public function addToMap($methodName, $function, $sig = null, $doc = false, $sigDoc = false, $parametersType = false,
         $exceptionHandling = false)
     {
-       $this->add_to_map($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling);
+        $this->add_to_map($methodName, $function, $sig, $doc, $sigDoc, $parametersType, $exceptionHandling);
     }
 
     /**

Spacing +67 added lines, -67 removed lines

@@ -251,7 +251,7 @@ 
     public function getOptions()
     {
         $values = array();
-        foreach(static::$options as $opt) {
+        foreach (static::$options as $opt) {
             $values[$opt] = $this->getOption($opt);
         }
         return $values;
@@ -264,7 +264,7 @@ 
      */
     public function setOptions($options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
 
@@ -302,7 +302,7 @@ 
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -314,7 +314,7 @@ 
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -335,10 +335,10 @@ 
         // user debug info should be encoded by the end user using the INTERNAL_ENCODING
         $out = '';
         if ($this->debug_info != '') {
-            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
+            $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
         }
         if (static::$_xmlrpc_debuginfo != '') {
-            $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
+            $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
             // NB: a better solution MIGHT be to use CDATA, but we need to insert it
             // into return payload AFTER the beginning tag
             //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
@@ -367,8 +367,8 @@ 
         $this->debug_info = '';
 
         // Save what we received, before parsing it
-        if ($this->debug > 1) {
-            $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++");
+        if ($this->debug>1) {
+            $this->debugMsg("+++GOT+++\n".$data."\n+++END+++");
         }
 
         $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -385,13 +385,13 @@ 
             $resp->raw_data = $rawData;
         }
 
-        if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
-            $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
-                static::$_xmlrpcs_occurred_errors . "+++END+++");
+        if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
+            $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
+                static::$_xmlrpcs_occurred_errors."+++END+++");
         }
 
         $header = $resp->xml_header($respCharset);
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $header .= $this->serializeDebug($respCharset);
         }
 
@@ -402,7 +402,7 @@ 
         if (empty($payload)) {
             $payload = $resp->serialize($respCharset);
         }
-        $payload = $header . $payload;
+        $payload = $header.$payload;
 
         if ($returnPayload) {
             return $payload;
@@ -411,7 +411,7 @@ 
         // if we get a warning/error that has output some text before here, then we cannot
         // add a new header. We cannot say we are sending xml, either...
         if (!headers_sent()) {
-            header('Content-Type: ' . $resp->getContentType());
+            header('Content-Type: '.$resp->getContentType());
             // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
             header("Vary: Accept-Charset");
 
@@ -434,10 +434,10 @@ 
             // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
             // responses up to 8000 bytes
             if ($phpNoSelfCompress) {
-                header('Content-Length: ' . (int)strlen($payload));
+                header('Content-Length: '.(int) strlen($payload));
             }
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
         }
 
         print $payload;
@@ -526,9 +526,9 @@ 
             $numParams = count($in);
         }
         foreach ($sigs as $curSig) {
-            if (count($curSig) == $numParams + 1) {
+            if (count($curSig) == $numParams+1) {
                 $itsOK = 1;
-                for ($n = 0; $n < $numParams; $n++) {
+                for ($n = 0; $n<$numParams; $n++) {
                     if (is_object($in)) {
                         $p = $in->getParam($n);
                         if ($p->kindOf() == 'scalar') {
@@ -541,10 +541,10 @@ 
                     }
 
                     // param index is $n+1, as first member of sig is return type
-                    if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
+                    if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
                         $itsOK = 0;
-                        $pno = $n + 1;
-                        $wanted = $curSig[$n + 1];
+                        $pno = $n+1;
+                        $wanted = $curSig[$n+1];
                         $got = $pt;
                         break;
                     }
@@ -571,10 +571,10 @@ 
         // check if $_SERVER is populated: it might have been disabled via ini file
         // (this is true even when in CLI mode)
         if (count($_SERVER) == 0) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             if (function_exists('getallheaders')) {
                 $this->debugMsg(''); // empty line
                 foreach (getallheaders() as $name => $val) {
@@ -599,13 +599,13 @@ 
                 if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
                     if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                         $data = $degzdata;
-                        if ($this->debug > 1) {
-                            $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
+                        if ($this->debug>1) {
+                            $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
                         }
                     } else {
                         $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
@@ -692,7 +692,7 @@ 
                     if ($reqEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding);
                     }
                 }
             }
@@ -723,7 +723,7 @@ 
             preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches);
             return new static::$responseClass(
                 0,
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
                 $_xh['isf_reason']);
         } elseif ($_xh['isf']) {
             /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs.
@@ -731,7 +731,7 @@ 
             return new static::$responseClass(
                 0,
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']);
         } else {
             // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle
             // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals)
@@ -741,8 +741,8 @@ 
                     ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals')
                 )
             ) {
-                if ($this->debug > 1) {
-                    $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++");
                 }
 
                 return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']);
@@ -750,12 +750,12 @@ 
                 // build a Request object with data parsed from xml and add parameters in
                 $req = new Request($_xh['method']);
                 /// @todo for more speed, we could just pass in the array to the constructor (and loose the type validation)...
-                for ($i = 0; $i < count($_xh['params']); $i++) {
+                for ($i = 0; $i<count($_xh['params']); $i++) {
                     $req->addParam($_xh['params'][$i]);
                 }
 
-                if ($this->debug > 1) {
-                    $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
                 }
 
                 return $this->execute($req);
@@ -805,7 +805,7 @@ 
                 return new static::$responseClass(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -820,7 +820,7 @@ 
         // build string representation of function 'name'
         if (is_array($func)) {
             if (is_object($func[0])) {
-                $funcName = get_class($func[0]) . '->' . $func[1];
+                $funcName = get_class($func[0]).'->'.$func[1];
             } else {
                 $funcName = implode('::', $func);
             }
@@ -832,23 +832,23 @@ 
 
         // verify that function to be invoked is in fact callable
         if (!is_callable($func)) {
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
             return new static::$responseClass(
                 0,
                 PhpXmlRpc::$xmlrpcerr['server_error'],
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
             );
         }
 
         if (isset($dmap[$methodName]['exception_handling'])) {
-            $exception_handling = (int)$dmap[$methodName]['exception_handling'];
+            $exception_handling = (int) $dmap[$methodName]['exception_handling'];
         } else {
             $exception_handling = $this->exception_handling;
         }
 
         // If debug level is 3, we should catch all errors generated during processing of user function, and log them
         // as part of response
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
         }
 
@@ -862,14 +862,14 @@ 
                     $r = call_user_func($func, $req);
                 }
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
                     if (is_a($r, 'PhpXmlRpc\Value')) {
                         $r = new static::$responseClass($r);
                     } else {
                         $r = new static::$responseClass(
                             0,
                             PhpXmlRpc::$xmlrpcerr['server_error'],
-                            PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
+                            PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
                         );
                     }
                 }
@@ -884,7 +884,7 @@ 
                         $r = call_user_func_array($func, array($methodName, $params, $this->user_data));
                         // mimic EPI behaviour: if we get an array that looks like an error, make it an error response
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
-                            $r = new static::$responseClass(0, (integer)$r['faultCode'], (string)$r['faultString']);
+                            $r = new static::$responseClass(0, (integer) $r['faultCode'], (string) $r['faultString']);
                         } else {
                             // functions using EPI api should NOT return resp objects, so make sure we encode the
                             // return type correctly
@@ -909,7 +909,7 @@ 
             // proper error-response
             switch ($exception_handling) {
                 case 2:
-                    if ($this->debug > 2) {
+                    if ($this->debug>2) {
                         if (self::$_xmlrpcs_prev_ehandler) {
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
                         } else {
@@ -932,7 +932,7 @@ 
             // proper error-response
             switch ($exception_handling) {
                 case 2:
-                    if ($this->debug > 2) {
+                    if ($this->debug>2) {
                         if (self::$_xmlrpcs_prev_ehandler) {
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
                         } else {
@@ -952,7 +952,7 @@ 
             }
         }
 
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             // note: restore the error handler we found before calling the user func, even if it has been changed
             // inside the func itself
             if (self::$_xmlrpcs_prev_ehandler) {
@@ -1018,7 +1018,7 @@ 
      */
     protected function debugMsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -1309,7 +1309,7 @@ 
                 $i++; // for error message, we count params from 1
                 return static::_xmlrpcs_multicall_error(new static::$responseClass(0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
             }
         }
 
@@ -1390,7 +1390,7 @@ 
             }
         } else {
             $numCalls = count($req);
-            for ($i = 0; $i < $numCalls; $i++) {
+            for ($i = 0; $i<$numCalls; $i++) {
                 $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
             }
         }
@@ -1455,12 +1455,12 @@ 
      */
     protected function xml_header($charsetEncoding = '')
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n";
+            return "<?xml version=\"1.0\"?".">\n";
         }
     }
 
@@ -1476,7 +1476,7 @@ 
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
             case self::OPT_RESPONSE_CHARSET_ENCODING:
-                $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
                 return $this->$name;
             case 'accepted_charset_encodings':
                 // manually implement the 'protected property' behaviour
@@ -1488,16 +1488,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Getting property Request::'.$name.' is deprecated');
                     return $this->accepted_compression;
                 } else {
-                    trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Server::accepted_charset_encodings 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;
         }
@@ -1514,7 +1514,7 @@ 
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
             case self::OPT_RESPONSE_CHARSET_ENCODING:
-                $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             case 'accepted_charset_encodings':
@@ -1527,16 +1527,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Setting property Request::'.$name.' is deprecated');
                     $this->accepted_compression = $value;
                 } else {
-                    trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Server::accepted_charset_encodings 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);
         }
     }
 
@@ -1551,7 +1551,7 @@ 
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
             case self::OPT_RESPONSE_CHARSET_ENCODING:
-                $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
                 return isset($this->$name);
             case 'accepted_charset_encodings':
                 // manually implement the 'protected property' behaviour
@@ -1563,7 +1563,7 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
                     return isset($this->accepted_compression);
                 }
                 // break through voluntarily
@@ -1583,7 +1583,7 @@ 
             case self::OPT_FUNCTIONS_PARAMETERS_TYPE:
             case self::OPT_PHPVALS_ENCODING_OPTIONS:
             case self::OPT_RESPONSE_CHARSET_ENCODING:
-                $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             case 'accepted_charset_encodings':
@@ -1596,16 +1596,16 @@ 
                     }
                 }
                 if ($canAccess) {
-                    $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
+                    $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated');
                     unset($this->accepted_compression);
                 } else {
-                    trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR);
+                    trigger_error("Cannot access protected property Server::accepted_charset_encodings 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);
         }
     }
 }

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) {
@@ -357,7 +357,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 ($_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
+        elseif ($_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !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
@@ -365,7 +365,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---"
                 );
@@ -389,7 +389,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;
@@ -437,7 +437,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
@@ -449,16 +449,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;
         }
@@ -472,7 +472,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':
@@ -485,16 +485,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);
         }
     }
 
@@ -506,7 +506,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
@@ -518,7 +518,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
@@ -535,7 +535,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':
@@ -548,16 +548,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/vardemo.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/client/_prepend.php";
+require_once __DIR__."/client/_prepend.php";
 
 output('<html lang="en">
 <head><title>phpxmlrpc</title></head>
@@ -10,25 +10,25 @@ 
 output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n");
 
 $v = new PhpXmlRpc\Value(1234, 'int');
-output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Int: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >');
-output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("String <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(true, 'boolean');
-output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(1234.5678, 'double');
-output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Double: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601');
-output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601');
-output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value('hello world', 'base64');
-output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
-output("(value of base64 string is: '" . $v->scalarVal() . "')<BR><BR>");
+output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>");
+output("(value of base64 string is: '".$v->scalarVal()."')<BR><BR>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -41,7 +41,7 @@ 
     ),
     "array"
 );
-output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Array: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -61,10 +61,10 @@ 
     ),
     "struct"
 );
-output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value(array($v), 'array');
-output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>");
 
 class MyClass
 {
@@ -76,49 +76,49 @@ 
 // the public property is the only one which will be serialized. As such, it has to be of type Value
 $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped');
 $w = new PhpXmlRpc\Value($myObject, 'struct');
-output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>");
 
 output("<h3>Testing value serialization - xml-rpc extensions</h3>\n");
 $v = new PhpXmlRpc\Value(1234, 'i8');
-output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("I8: <PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value(null, 'null');
-output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Null: <PRE>".htmlentities($v->serialize())."</PRE>");
 \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true;
-output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 output("<h3>Testing value serialization - character encoding</h3>\n");
 // The greek word 'kosme'
 $v = new PhpXmlRpc\Value('κόσμε');
-output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
-output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>");
+output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>");
+output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>");
 if (function_exists('mb_convert_encoding')) {
-    output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>");
+    output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>");
 }
 
 output("<h3>Testing request serialization</h3>\n");
 $req = new PhpXmlRpc\Request('examples.getStateName');
 $req->method('examples.getStateName');
 $req->addParam(new PhpXmlRpc\Value(42, 'int'));
-output("<PRE>" . htmlentities($req->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($req->serialize())."</PRE>");
 
 output("<h3>Testing response serialization</h3>\n");
 $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life'));
-output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($resp->serialize())."</PRE>");
 
 output("<h3>Testing ISO date formatting</h3><pre>\n");
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 output("Now is $t --> $date\n");
-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 output("That is to say $date --> $tb\n");
-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
 output("</pre>\n");
 
 output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n");
 $v = new PhpXmlRpc\Value(1234.56789, 'double');
 \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2;
-output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 output('</body></html>');

demo/client/getstatename.php

Spacing +7 added lines, -7 removed lines

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

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

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

demo/server/methodProviders/functions.php

Spacing +11 added lines, -11 removed lines

@@ -54,11 +54,11 @@ 
         $snv = $sno->scalarVal();
 
         // look it up in our array (zero-based)
-        if (isset(self::$stateNames[$snv - 1])) {
-            $stateName = self::$stateNames[$snv - 1];
+        if (isset(self::$stateNames[$snv-1])) {
+            $stateName = self::$stateNames[$snv-1];
         } else {
             // not there, so complain
-            $err = "I don't have a state for the index '" . $snv . "'";
+            $err = "I don't have a state for the index '".$snv."'";
         }
 
         if ($err != '') {
@@ -132,7 +132,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcInt));
+        return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcInt));
     }
 
     public static $addtwodouble_sig = array(array('double', 'double', 'double'));
@@ -142,7 +142,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcDouble));
+        return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcDouble));
     }
 
     public static $stringecho_sig = array(array('string', 'string'));
@@ -165,7 +165,7 @@ 
         ///       In fact, we miss some API (or extra data) in the Request...
         //$payload = file_get_contents('php://input');
         $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding);
-        $s = "I got the following message:\n" . $payload;
+        $s = "I got the following message:\n".$payload;
 
         return new Response(new Value($s));
     }
@@ -238,17 +238,17 @@ 
 
         /// @todo in real life, we should check for presence of return characters to avoid header injection!
 
-        $msgHdr = "From: " . $mFrom->scalarVal() . "\n";
-        $msgHdr .= "To: " . $mTo->scalarVal() . "\n";
+        $msgHdr = "From: ".$mFrom->scalarVal()."\n";
+        $msgHdr .= "To: ".$mTo->scalarVal()."\n";
 
         if ($mCc->scalarVal() != "") {
-            $msgHdr .= "Cc: " . $mCc->scalarVal() . "\n";
+            $msgHdr .= "Cc: ".$mCc->scalarVal()."\n";
         }
         if ($mBcc->scalarVal() != "") {
-            $msgHdr .= "Bcc: " . $mBcc->scalarVal() . "\n";
+            $msgHdr .= "Bcc: ".$mBcc->scalarVal()."\n";
         }
         if ($mMime->scalarVal() != "") {
-            $msgHdr .= "Content-type: " . $mMime->scalarVal() . "\n";
+            $msgHdr .= "Content-type: ".$mMime->scalarVal()."\n";
         }
         $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 

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 ">":

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

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';
 
 /**
  * Tests involving the Client class (and mostly no server).
@@ -59,7 +59,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 {
             $r = $this->client->send($m, 5);
             // make sure there's no freaking catchall DNS in effect
@@ -86,7 +86,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];