Inspection of "more WIP on the manual and php comments" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( c32e95...287ad6 )

by Gaetano

created 2023-01-02 16:52 UTC

Status

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Agesort demo</title></head>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 
 output("This is the input data:<br/><pre>");
 foreach ($inAr as $key => $val) {
-    output($key . ", " . $val . "\n");
+    output($key.", ".$val."\n");
 }
 output("</pre>");
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
     );
 }
 $v = new PhpXmlRpc\Value($p, "array");
-output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n");
+output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n");
 
 // create client and message objects
 $req = new PhpXmlRpc\Request('examples.sortByAge', array($v));
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
     foreach ($value as $struct) {
         $name = $struct["name"];
         $age = $struct["age"];
-        output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n");
+        output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n");
     }
 
-    output("<hr/>For nerds: I got this value back<br/><pre>" .
-        htmlentities($resp->serialize()) . "</pre><hr/>\n");
+    output("<hr/>For nerds: I got this value back<br/><pre>".
+        htmlentities($resp->serialize())."</pre><hr/>\n");
 } else {
     output("An error occurred:<pre>");
-    output("Code: " . htmlspecialchars($resp->faultCode()) .
-        "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>');
+    output("Code: ".htmlspecialchars($resp->faultCode()).
+        "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>');
 }
 
 output("</body></html>\n");

Please login to merge, or discard this patch.

src/Server.php 1 patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

@@ -203,7 +203,7 @@  discard block
 block discarded – undo
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
         // 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";
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
         $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+++");
         }
 
         $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -282,21 +282,21 @@  discard block
 block discarded – undo
             $r->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+++");
         }
 
         $payload = $this->xml_header($respCharset);
-        if ($this->debug > 0) {
-            $payload = $payload . $this->serializeDebug($respCharset);
+        if ($this->debug>0) {
+            $payload = $payload.$this->serializeDebug($respCharset);
         }
 
         // Do not create response serialization if it has already happened. Helps building json magic
         if (empty($r->payload)) {
             $r->serialize($respCharset);
         }
-        $payload = $payload . $r->payload;
+        $payload = $payload.$r->payload;
 
         if ($returnPayload) {
             return $payload;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
         // 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: ' . $r->content_type);
+            header('Content-Type: '.$r->content_type);
             // we do not know if client actually told us an accepted charset, but if he did
             // we have to tell him what we did
             header("Vary: Accept-Charset");
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
             // 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()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
         }
 
         print $payload;
@@ -392,9 +392,9 @@  discard block
 block discarded – undo
             $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') {
@@ -407,10 +407,10 @@  discard block
 block discarded – undo
                     }
 
                     // 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;
                     }
@@ -437,10 +437,10 @@  discard block
 block discarded – undo
         // 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()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
+            $this->getLogger()->errorLog('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) {
@@ -464,13 +464,13 @@  discard block
 block discarded – undo
                 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 Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
                     if ($reqEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
                     }
                 }
             }
@@ -582,18 +582,18 @@  discard block
 block discarded – undo
 
         $xmlRpcParser = $this->getParser();
         $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options);
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
             // (BC) we return XML error as a faultCode
             preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
             $r = new Response(
                 0,
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
                 $xmlRpcParser->_xh['isf_reason']);
         } elseif ($xmlRpcParser->_xh['isf']) {
             $r = new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_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
@@ -604,20 +604,20 @@  discard block
 block discarded – undo
                     ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
                 )
             ) {
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
                 }
                 $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
             } else {
                 // build a Request object with data parsed from xml
                 $req = new Request($xmlRpcParser->_xh['method']);
                 // now add parameters in
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_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+++");
                 }
                 $r = $this->execute($req);
             }
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
 
         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);
             }
@@ -695,17 +695,17 @@  discard block
 block discarded – undo
 
         // verify that function to be invoked is in fact callable
         if (!is_callable($func)) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
             return new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['server_error'],
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
             );
         }
 
         // 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'));
         }
 
@@ -718,14 +718,14 @@  discard block
 block discarded – undo
                     $r = call_user_func($func, $req);
                 }
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
+                    $this->getLogger()->errorLog("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 Response($r);
                     } else {
                         $r = new Response(
                             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"
                         );
                     }
                 }
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
                         // 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 Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
+                            $r = new Response(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
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
             // proper error-response
             switch ($this->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 {
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
                     $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']);
             }
         }
-        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) {
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
      */
     protected function debugmsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -810,9 +810,9 @@  discard block
 block discarded – undo
     protected function xml_header($charsetEncoding = '')
     {
         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";
         }
     }
 
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
                 $i++; // for error message, we count params from 1
                 return static::_xmlrpcs_multicall_error(new Response(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));
             }
         }
 
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
             }
         } 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]);
             }
         }

Please login to merge, or discard this patch.

src/Helper/Http.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -24,12 +24,12 @@  discard block
 block discarded – undo
 
         // read chunk-size, chunk-extension (if any) and crlf
         // get the position of the linebreak
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
+        $chunkEnd = strpos($buffer, "\r\n")+2;
         $temp = substr($buffer, 0, $chunkEnd);
         $chunkSize = hexdec(trim($temp));
         $chunkStart = $chunkEnd;
-        while ($chunkSize > 0) {
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
+        while ($chunkSize>0) {
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
 
             // just in case we got a broken connection
             if ($chunkEnd == false) {
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
             }
 
             // read chunk-data and crlf
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             // append chunk-data to entity-body
             $new .= $chunk;
             // length := length + chunk-size
             $length += strlen($chunk);
             // read chunk-size and crlf
-            $chunkStart = $chunkEnd + 2;
+            $chunkStart = $chunkEnd+2;
 
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
             if ($chunkEnd == false) {
                 break; // just in case we got a broken connection
             }
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             $chunkSize = hexdec(trim($temp));
             $chunkStart = $chunkEnd;
         }
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -131,19 +131,19 @@  discard block
 block discarded – undo
         }
 
         if ($httpResponse['status_code'] !== '200') {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
         foreach ($ar as $line) {
             // take care of multi-line headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $headerName = strtolower(trim($arr[0]));
                 /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
                 ///       passed using multiple header lines.
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
                     foreach ($cookies as $cookie) {
                         // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
                         if (isset($httpResponse['headers'][$headerName])) {
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                         } else {
                             $httpResponse['headers'][$headerName] = trim($cookie);
                         }
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
                 }
             } elseif (isset($headerName)) {
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -241,19 +241,19 @@  discard block
 block discarded – undo
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }

Please login to merge, or discard this patch.

src/Request.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -92,9 +92,9 @@  discard block
 block discarded – undo
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -116,16 +116,16 @@  discard block
 block discarded – undo
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
                 // 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));
             }
         }
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
         // idea from Luca Mariano <[email protected]> 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
@@ -294,9 +294,9 @@  discard block
 block discarded – undo
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
             }
         }
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -339,12 +339,12 @@  discard block
 block discarded – undo
         $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
 
         // first error check: xml not well-formed
-        if ($xmlRpcParser->_xh['isf'] > 2) {
+        if ($xmlRpcParser->_xh['isf']>2) {
 
             // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
                 $this->httpResponse
             );
 
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
                 '', $this->httpResponse
             );
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debugMessage(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );

Please login to merge, or discard this patch.

		@@ -92,9 +92,9 @@ discard block
		block discarded – undo
92	92	public function xml_header($charsetEncoding = '')
93	93	{
94	94	if ($charsetEncoding != '') {
95		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
	95	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
96	96	} else {
97		- return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
	97	+ return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
98	98	}
99	99	}
100	100
		@@ -116,16 +116,16 @@ discard block
		block discarded – undo
116	116	public function createPayload($charsetEncoding = '')
117	117	{
118	118	if ($charsetEncoding != '') {
119		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	119	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
120	120	} else {
121	121	$this->content_type = 'text/xml';
122	122	}
123	123	$this->payload = $this->xml_header($charsetEncoding);
124		- $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
125		- $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
	124	+ $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
	125	+ $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
126	126	$this->payload .= "<params>\n";
127	127	foreach ($this->params as $p) {
128		- $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
	128	+ $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
129	129	"</param>\n";
130	130	}
131	131	$this->payload .= "</params>\n";
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	$this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
254	254
255	255	if ($data == '') {
256		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.');
	256	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.');
257	257	return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
258	258	}
259	259
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	// failed processing of HTTP response headers
267	267	// save into response obj the full payload received, for debugging
268	268	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
269		- } catch(\Exception $e) {
	269	+ } catch (\Exception $e) {
270	270	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
271	271	}
272	272	}
		@@ -280,7 +280,7 @@ discard block
		block discarded – undo
280	280	// idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
281	281	$pos = strrpos($data, '</methodResponse>');
282	282	if ($pos !== false) {
283		- $data = substr($data, 0, $pos + 17);
	283	+ $data = substr($data, 0, $pos+17);
284	284	}
285	285
286	286	// try to 'guestimate' the character encoding of the received response
		@@ -294,9 +294,9 @@ discard block
		block discarded – undo
294	294	if ($start) {
295	295	$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
296	296	$end = strpos($data, '-->', $start);
297		- $comments = substr($data, $start, $end - $start);
298		- $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" .
299		- str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding);
	297	+ $comments = substr($data, $start, $end-$start);
	298	+ $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t".
	299	+ str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding);
300	300	}
301	301	}
302	302
		@@ -318,7 +318,7 @@ discard block
		block discarded – undo
318	318	if ($respEncoding == 'ISO-8859-1') {
319	319	$data = utf8_encode($data);
320	320	} else {
321		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding);
	321	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding);
322	322	}
323	323	}
324	324	}
		@@ -339,12 +339,12 @@ discard block
		block discarded – undo
339	339	$xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options);
340	340
341	341	// first error check: xml not well-formed
342		- if ($xmlRpcParser->_xh['isf'] > 2) {
	342	+ if ($xmlRpcParser->_xh['isf']>2) {
343	343
344	344	// BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL'
345	345
346	346	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
347		- PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	347	+ PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '',
348	348	$this->httpResponse
349	349	);
350	350
		@@ -355,7 +355,7 @@ discard block
		block discarded – undo
355	355	// second error check: xml well-formed but not xml-rpc compliant
356	356	elseif ($xmlRpcParser->_xh['isf'] == 2) {
357	357	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
358		- PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '',
	358	+ PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '',
359	359	$this->httpResponse
360	360	);
361	361
		@@ -371,7 +371,7 @@ discard block
		block discarded – undo
371	371	'', $this->httpResponse
372	372	);
373	373	} else {
374		- if ($this->debug > 1) {
	374	+ if ($this->debug>1) {
375	375	$this->getLogger()->debugMessage(
376	376	"---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
377	377	);

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>xmlrpc - Agesort demo</title></head>
		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14
15	15	output("This is the input data:<br/><pre>");
16	16	foreach ($inAr as $key => $val) {
17		- output($key . ", " . $val . "\n");
	17	+ output($key.", ".$val."\n");
18	18	}
19	19	output("</pre>");
20	20
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	);
31	31	}
32	32	$v = new PhpXmlRpc\Value($p, "array");
33		-output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n");
	33	+output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n");
34	34
35	35	// create client and message objects
36	36	$req = new PhpXmlRpc\Request('examples.sortByAge', array($v));
		@@ -50,15 +50,15 @@ discard block
		block discarded – undo
50	50	foreach ($value as $struct) {
51	51	$name = $struct["name"];
52	52	$age = $struct["age"];
53		- output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n");
	53	+ output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n");
54	54	}
55	55
56		- output("<hr/>For nerds: I got this value back<br/><pre>" .
57		- htmlentities($resp->serialize()) . "</pre><hr/>\n");
	56	+ output("<hr/>For nerds: I got this value back<br/><pre>".
	57	+ htmlentities($resp->serialize())."</pre><hr/>\n");
58	58	} else {
59	59	output("An error occurred:<pre>");
60		- output("Code: " . htmlspecialchars($resp->faultCode()) .
61		- "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>');
	60	+ output("Code: ".htmlspecialchars($resp->faultCode()).
	61	+ "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>');
62	62	}
63	63
64	64	output("</body></html>\n");

		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	*/
204	204	public static function xmlrpc_debugmsg($msg)
205	205	{
206		- static::$_xmlrpc_debuginfo .= $msg . "\n";
	206	+ static::$_xmlrpc_debuginfo .= $msg."\n";
207	207	}
208	208
209	209	/**
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	*/
215	215	public static function error_occurred($msg)
216	216	{
217		- static::$_xmlrpcs_occurred_errors .= $msg . "\n";
	217	+ static::$_xmlrpcs_occurred_errors .= $msg."\n";
218	218	}
219	219
220	220	/**
		@@ -235,10 +235,10 @@ discard block
		block discarded – undo
235	235	// user debug info should be encoded by the end user using the INTERNAL_ENCODING
236	236	$out = '';
237	237	if ($this->debug_info != '') {
238		- $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
	238	+ $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
239	239	}
240	240	if (static::$_xmlrpc_debuginfo != '') {
241		- $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
	241	+ $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
242	242	// NB: a better solution MIGHT be to use CDATA, but we need to insert it
243	243	// into return payload AFTER the beginning tag
244	244	//$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
		@@ -267,8 +267,8 @@ discard block
		block discarded – undo
267	267	$this->debug_info = '';
268	268
269	269	// Save what we received, before parsing it
270		- if ($this->debug > 1) {
271		- $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
	270	+ if ($this->debug>1) {
	271	+ $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
272	272	}
273	273
274	274	$r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
		@@ -282,21 +282,21 @@ discard block
		block discarded – undo
282	282	$r->raw_data = $rawData;
283	283	}
284	284
285		- if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
286		- $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
287		- static::$_xmlrpcs_occurred_errors . "+++END+++");
	285	+ if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
	286	+ $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
	287	+ static::$_xmlrpcs_occurred_errors."+++END+++");
288	288	}
289	289
290	290	$payload = $this->xml_header($respCharset);
291		- if ($this->debug > 0) {
292		- $payload = $payload . $this->serializeDebug($respCharset);
	291	+ if ($this->debug>0) {
	292	+ $payload = $payload.$this->serializeDebug($respCharset);
293	293	}
294	294
295	295	// Do not create response serialization if it has already happened. Helps building json magic
296	296	if (empty($r->payload)) {
297	297	$r->serialize($respCharset);
298	298	}
299		- $payload = $payload . $r->payload;
	299	+ $payload = $payload.$r->payload;
300	300
301	301	if ($returnPayload) {
302	302	return $payload;
		@@ -305,7 +305,7 @@ discard block
		block discarded – undo
305	305	// if we get a warning/error that has output some text before here, then we cannot
306	306	// add a new header. We cannot say we are sending xml, either...
307	307	if (!headers_sent()) {
308		- header('Content-Type: ' . $r->content_type);
	308	+ header('Content-Type: '.$r->content_type);
309	309	// we do not know if client actually told us an accepted charset, but if he did
310	310	// we have to tell him what we did
311	311	header("Vary: Accept-Charset");
		@@ -334,10 +334,10 @@ discard block
		block discarded – undo
334	334	// Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
335	335	// responses up to 8000 bytes
336	336	if ($phpNoSelfCompress) {
337		- header('Content-Length: ' . (int)strlen($payload));
	337	+ header('Content-Length: '.(int) strlen($payload));
338	338	}
339	339	} else {
340		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
	340	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
341	341	}
342	342
343	343	print $payload;
		@@ -392,9 +392,9 @@ discard block
		block discarded – undo
392	392	$numParams = count($in);
393	393	}
394	394	foreach ($sigs as $curSig) {
395		- if (count($curSig) == $numParams + 1) {
	395	+ if (count($curSig) == $numParams+1) {
396	396	$itsOK = 1;
397		- for ($n = 0; $n < $numParams; $n++) {
	397	+ for ($n = 0; $n<$numParams; $n++) {
398	398	if (is_object($in)) {
399	399	$p = $in->getParam($n);
400	400	if ($p->kindOf() == 'scalar') {
		@@ -407,10 +407,10 @@ discard block
		block discarded – undo
407	407	}
408	408
409	409	// param index is $n+1, as first member of sig is return type
410		- if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
	410	+ if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
411	411	$itsOK = 0;
412		- $pno = $n + 1;
413		- $wanted = $curSig[$n + 1];
	412	+ $pno = $n+1;
	413	+ $wanted = $curSig[$n+1];
414	414	$got = $pt;
415	415	break;
416	416	}
		@@ -437,10 +437,10 @@ discard block
		block discarded – undo
437	437	// check if $_SERVER is populated: it might have been disabled via ini file
438	438	// (this is true even when in CLI mode)
439	439	if (count($_SERVER) == 0) {
440		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
	440	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
441	441	}
442	442
443		- if ($this->debug > 1) {
	443	+ if ($this->debug>1) {
444	444	if (function_exists('getallheaders')) {
445	445	$this->debugmsg(''); // empty line
446	446	foreach (getallheaders() as $name => $val) {
		@@ -464,13 +464,13 @@ discard block
		block discarded – undo
464	464	if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
465	465	if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
466	466	$data = $degzdata;
467		- if ($this->debug > 1) {
468		- $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	467	+ if ($this->debug>1) {
	468	+ $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
469	469	}
470	470	} elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
471	471	$data = $degzdata;
472		- if ($this->debug > 1) {
473		- $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	472	+ if ($this->debug>1) {
	473	+ $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
474	474	}
475	475	} else {
476	476	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
		@@ -563,7 +563,7 @@ discard block
		block discarded – undo
563	563	if ($reqEncoding == 'ISO-8859-1') {
564	564	$data = utf8_encode($data);
565	565	} else {
566		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
	566	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
567	567	}
568	568	}
569	569	}
		@@ -582,18 +582,18 @@ discard block
		block discarded – undo
582	582
583	583	$xmlRpcParser = $this->getParser();
584	584	$xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options);
585		- if ($xmlRpcParser->_xh['isf'] > 2) {
	585	+ if ($xmlRpcParser->_xh['isf']>2) {
586	586	// (BC) we return XML error as a faultCode
587	587	preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
588	588	$r = new Response(
589	589	0,
590		- PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
	590	+ PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
591	591	$xmlRpcParser->_xh['isf_reason']);
592	592	} elseif ($xmlRpcParser->_xh['isf']) {
593	593	$r = new Response(
594	594	0,
595	595	PhpXmlRpc::$xmlrpcerr['invalid_request'],
596		- PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
	596	+ PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']);
597	597	} else {
598	598	// small layering violation in favor of speed and memory usage:
599	599	// we should allow the 'execute' method handle this, but in the
		@@ -604,20 +604,20 @@ discard block
		block discarded – undo
604	604	($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
605	605	)
606	606	) {
607		- if ($this->debug > 1) {
608		- $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
	607	+ if ($this->debug>1) {
	608	+ $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
609	609	}
610	610	$r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
611	611	} else {
612	612	// build a Request object with data parsed from xml
613	613	$req = new Request($xmlRpcParser->_xh['method']);
614	614	// now add parameters in
615		- for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
	615	+ for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
616	616	$req->addParam($xmlRpcParser->_xh['params'][$i]);
617	617	}
618	618
619		- if ($this->debug > 1) {
620		- $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
	619	+ if ($this->debug>1) {
	620	+ $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
621	621	}
622	622	$r = $this->execute($req);
623	623	}
		@@ -670,7 +670,7 @@ discard block
		block discarded – undo
670	670	return new Response(
671	671	0,
672	672	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
673		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
	673	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
674	674	);
675	675	}
676	676	}
		@@ -683,7 +683,7 @@ discard block
		block discarded – undo
683	683
684	684	if (is_array($func)) {
685	685	if (is_object($func[0])) {
686		- $funcName = get_class($func[0]) . '->' . $func[1];
	686	+ $funcName = get_class($func[0]).'->'.$func[1];
687	687	} else {
688	688	$funcName = implode('::', $func);
689	689	}
		@@ -695,17 +695,17 @@ discard block
		block discarded – undo
695	695
696	696	// verify that function to be invoked is in fact callable
697	697	if (!is_callable($func)) {
698		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
	698	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
699	699	return new Response(
700	700	0,
701	701	PhpXmlRpc::$xmlrpcerr['server_error'],
702		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
	702	+ PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
703	703	);
704	704	}
705	705
706	706	// If debug level is 3, we should catch all errors generated during
707	707	// processing of user function, and log them as part of response
708		- if ($this->debug > 2) {
	708	+ if ($this->debug>2) {
709	709	self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
710	710	}
711	711
		@@ -718,14 +718,14 @@ discard block
		block discarded – undo
718	718	$r = call_user_func($func, $req);
719	719	}
720	720	if (!is_a($r, 'PhpXmlRpc\Response')) {
721		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
	721	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
722	722	if (is_a($r, 'PhpXmlRpc\Value')) {
723	723	$r = new Response($r);
724	724	} else {
725	725	$r = new Response(
726	726	0,
727	727	PhpXmlRpc::$xmlrpcerr['server_error'],
728		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
	728	+ PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
729	729	);
730	730	}
731	731	}
		@@ -741,7 +741,7 @@ discard block
		block discarded – undo
741	741	// mimic EPI behaviour: if we get an array that looks like an error, make it
742	742	// an error response
743	743	if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
744		- $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
	744	+ $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
745	745	} else {
746	746	// functions using EPI api should NOT return resp objects,
747	747	// so make sure we encode the return type correctly
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	// proper error-response
765	765	switch ($this->exception_handling) {
766	766	case 2:
767		- if ($this->debug > 2) {
	767	+ if ($this->debug>2) {
768	768	if (self::$_xmlrpcs_prev_ehandler) {
769	769	set_error_handler(self::$_xmlrpcs_prev_ehandler);
770	770	} else {
		@@ -779,7 +779,7 @@ discard block
		block discarded – undo
779	779	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']);
780	780	}
781	781	}
782		- if ($this->debug > 2) {
	782	+ if ($this->debug>2) {
783	783	// note: restore the error handler we found before calling the
784	784	// user func, even if it has been changed inside the func itself
785	785	if (self::$_xmlrpcs_prev_ehandler) {
		@@ -799,7 +799,7 @@ discard block
		block discarded – undo
799	799	*/
800	800	protected function debugmsg($string)
801	801	{
802		- $this->debug_info .= $string . "\n";
	802	+ $this->debug_info .= $string."\n";
803	803	}
804	804
805	805	/**
		@@ -810,9 +810,9 @@ discard block
		block discarded – undo
810	810	protected function xml_header($charsetEncoding = '')
811	811	{
812	812	if ($charsetEncoding != '') {
813		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
	813	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
814	814	} else {
815		- return "<?xml version=\"1.0\"?" . ">\n";
	815	+ return "<?xml version=\"1.0\"?".">\n";
816	816	}
817	817	}
818	818
		@@ -1090,7 +1090,7 @@ discard block
		block discarded – undo
1090	1090	$i++; // for error message, we count params from 1
1091	1091	return static::_xmlrpcs_multicall_error(new Response(0,
1092	1092	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1093		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
	1093	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1094	1094	}
1095	1095	}
1096	1096
		@@ -1173,7 +1173,7 @@ discard block
		block discarded – undo
1173	1173	}
1174	1174	} else {
1175	1175	$numCalls = count($req);
1176		- for ($i = 0; $i < $numCalls; $i++) {
	1176	+ for ($i = 0; $i<$numCalls; $i++) {
1177	1177	$result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1178	1178	}
1179	1179	}

		@@ -24,12 +24,12 @@ discard block
		block discarded – undo
24	24
25	25	// read chunk-size, chunk-extension (if any) and crlf
26	26	// get the position of the linebreak
27		- $chunkEnd = strpos($buffer, "\r\n") + 2;
	27	+ $chunkEnd = strpos($buffer, "\r\n")+2;
28	28	$temp = substr($buffer, 0, $chunkEnd);
29	29	$chunkSize = hexdec(trim($temp));
30	30	$chunkStart = $chunkEnd;
31		- while ($chunkSize > 0) {
32		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
	31	+ while ($chunkSize>0) {
	32	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
33	33
34	34	// just in case we got a broken connection
35	35	if ($chunkEnd == false) {
		@@ -41,19 +41,19 @@ discard block
		block discarded – undo
41	41	}
42	42
43	43	// read chunk-data and crlf
44		- $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	44	+ $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
45	45	// append chunk-data to entity-body
46	46	$new .= $chunk;
47	47	// length := length + chunk-size
48	48	$length += strlen($chunk);
49	49	// read chunk-size and crlf
50		- $chunkStart = $chunkEnd + 2;
	50	+ $chunkStart = $chunkEnd+2;
51	51
52		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
	52	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
53	53	if ($chunkEnd == false) {
54	54	break; // just in case we got a broken connection
55	55	}
56		- $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	56	+ $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
57	57	$chunkSize = hexdec(trim($temp));
58	58	$chunkStart = $chunkEnd;
59	59	}
		@@ -83,11 +83,11 @@ discard block
		block discarded – undo
83	83	// Look for CR/LF or simple LF as line separator (even though it is not valid http)
84	84	$pos = strpos($data, "\r\n\r\n");
85	85	if ($pos \|\| is_int($pos)) {
86		- $bd = $pos + 4;
	86	+ $bd = $pos+4;
87	87	} else {
88	88	$pos = strpos($data, "\n\n");
89	89	if ($pos \|\| is_int($pos)) {
90		- $bd = $pos + 2;
	90	+ $bd = $pos+2;
91	91	} else {
92	92	// No separation between response headers and body: fault?
93	93	$bd = 0;
		@@ -97,8 +97,8 @@ discard block
		block discarded – undo
97	97	// this filters out all http headers from proxy. maybe we could take them into account, too?
98	98	$data = substr($data, $bd);
99	99	} else {
100		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
101		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
	100	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
	101	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
102	102	}
103	103	}
104	104
		@@ -131,19 +131,19 @@ discard block
		block discarded – undo
131	131	}
132	132
133	133	if ($httpResponse['status_code'] !== '200') {
134		- $errstr = substr($data, 0, strpos($data, "\n") - 1);
135		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
136		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
	134	+ $errstr = substr($data, 0, strpos($data, "\n")-1);
	135	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
	136	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
137	137	}
138	138
139	139	// be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
140	140	$pos = strpos($data, "\r\n\r\n");
141	141	if ($pos \|\| is_int($pos)) {
142		- $bd = $pos + 4;
	142	+ $bd = $pos+4;
143	143	} else {
144	144	$pos = strpos($data, "\n\n");
145	145	if ($pos \|\| is_int($pos)) {
146		- $bd = $pos + 2;
	146	+ $bd = $pos+2;
147	147	} else {
148	148	// No separation between response headers and body: fault?
149	149	// we could take some action here instead of going on...
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	foreach ($ar as $line) {
158	158	// take care of multi-line headers and cookies
159	159	$arr = explode(':', $line, 2);
160		- if (count($arr) > 1) {
	160	+ if (count($arr)>1) {
161	161	$headerName = strtolower(trim($arr[0]));
162	162	/// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
163	163	/// passed using multiple header lines.
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	foreach ($cookies as $cookie) {
175	175	// glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
176	176	if (isset($httpResponse['headers'][$headerName])) {
177		- $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
	177	+ $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
178	178	} else {
179	179	$httpResponse['headers'][$headerName] = trim($cookie);
180	180	}
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	}
204	204	} elseif (isset($headerName)) {
205	205	/// @todo version1 cookies might span multiple lines, thus breaking the parsing above
206		- $httpResponse['headers'][$headerName] .= ' ' . trim($line);
	206	+ $httpResponse['headers'][$headerName] .= ' '.trim($line);
207	207	}
208	208	}
209	209
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	// Decode chunked encoding sent by http 1.1 servers
227	227	if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
228	228	if (!$data = static::decodeChunked($data)) {
229		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
	229	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
230	230	throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
231	231	}
232	232	}
		@@ -241,19 +241,19 @@ discard block
		block discarded – undo
241	241	if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
242	242	$data = $degzdata;
243	243	if ($debug) {
244		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	244	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
245	245	}
246	246	} elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
247	247	$data = $degzdata;
248	248	if ($debug) {
249		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	249	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
250	250	}
251	251	} else {
252		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
	252	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
253	253	throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
254	254	}
255	255	} else {
256		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
	256	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
257	257	throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
258	258	}
259	259	}

gggeek / phpxmlrpc

Push — master ( c32e95...287ad6 )

Status

Category

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch