gggeek / phpxmlrpc

src/Server.php

Spacing +64 added lines, -64 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'],
@@ -693,7 +693,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);
                     }
                 }
             }
@@ -727,7 +727,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.
@@ -735,7 +735,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)
@@ -745,8 +745,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']);
@@ -754,12 +754,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);
@@ -809,7 +809,7 @@ 
                 return new static::$responseClass(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -824,7 +824,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);
             }
@@ -836,16 +836,16 @@ 
 
         // 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;
         }
@@ -866,14 +866,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"
                         );
                     }
                 }
@@ -888,7 +888,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
@@ -1019,7 +1019,7 @@ 
      */
     protected function debugMsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -1310,7 +1310,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));
             }
         }
 
@@ -1391,7 +1391,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]);
             }
         }
@@ -1419,7 +1419,7 @@ 
         // From PHP 8.4 the E_STRICT constant has been deprecated and will emit deprecation notices.
         // PHP core and core extensions since PHP 8.0 and later do not emit E_STRICT notices at all.
         // On PHP 7 series before PHP 7.4, some functions conditionally emit E_STRICT notices.
-        if (PHP_VERSION_ID >= 70400) {
+        if (PHP_VERSION_ID>=70400) {
             static::error_occurred($errString);
         } elseif ($errCode != E_STRICT) {
                 static::error_occurred($errString);
@@ -1460,12 +1460,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";
         }
     }
 
@@ -1481,7 +1481,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
@@ -1493,16 +1493,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;
         }
@@ -1519,7 +1519,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':
@@ -1532,16 +1532,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);
         }
     }
 
@@ -1556,7 +1556,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
@@ -1568,7 +1568,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
@@ -1588,7 +1588,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':
@@ -1601,16 +1601,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);
         }
     }
 }