Inspection of "more fixes for code cov gen upon testing" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 4b184a...e8165e )

by Gaetano

created 2022-11-26 15:06 UTC

Status

Spacing +4 added lines, -4 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 - Webservice wrappper demo</title></head>
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
 $resp = $client->send(new PhpXmlRpc\Request('system.listMethods'));
 if ($resp->faultCode()) {
-    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n");
+    output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n");
 } else {
     output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n");
     flush();
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
         if ($methodName == 'examples.getStateName') {
             $callable = $wrapper->wrapXmlrpcMethod($client, $methodName);
             if ($callable) {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n");
             } else {
-                output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n");
+                output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n");
             }
             break;
         }

Please login to merge, or discard this patch.

demo/client/_prepend.php 1 patch

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

@@ -14,7 +14,7 @@
 block discarded – undo
 }
 
 // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();
 
 // Let unit tests run against localhost, 'plain' demos against a known public server

Please login to merge, or discard this patch.

demo/client/which.php 1 patch

Spacing +6 added lines, -6 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 - Which toolkit demo</title></head>
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
     $value = $encoder->decode($resp->value());
     output("Toolkit info:<br/>\n");
     output("<pre>");
-    output("name: " . htmlspecialchars($value["toolkitName"]) . "\n");
-    output("version: " . htmlspecialchars($value["toolkitVersion"]) . "\n");
-    output("docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n");
-    output("os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n");
+    output("name: ".htmlspecialchars($value["toolkitName"])."\n");
+    output("version: ".htmlspecialchars($value["toolkitVersion"])."\n");
+    output("docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n");
+    output("os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n");
     output("</pre>");
 } else {
     output("An error occurred: ");
-    output("Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n");
+    output("Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n");
 }
 
 output("</body></html>\n");

Please login to merge, or discard this patch.

demo/client/introspect.php 1 patch

Spacing +9 added lines, -9 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 - Introspect demo</title></head>
@@ -13,13 +13,13 @@  discard block
 block discarded – undo
 function display_error($r)
 {
     output("An error occurred: ");
-    output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>");
+    output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>");
 }
 
 $client = new PhpXmlRpc\Client(XMLRPCSERVER);
 
 // First off, let's retrieve the list of methods available on the remote server
-output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n");
+output("<h3>methods available at http://".$client->server.$client->path."</h3>\n");
 $req = new PhpXmlRpc\Request('system.listMethods');
 $resp = $client->send($req);
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 
     // Then, retrieve the signature and help text of each available method
     foreach ($v as $methodName) {
-        output("<h4>" . htmlspecialchars($methodName->scalarval()) . "</h4>\n");
+        output("<h4>".htmlspecialchars($methodName->scalarval())."</h4>\n");
         // build messages first, add params later
         $m1 = new PhpXmlRpc\Request('system.methodHelp');
         $m2 = new PhpXmlRpc\Request('system.methodSignature');
@@ -61,13 +61,13 @@  discard block
 block discarded – undo
             if ($val->kindOf() == "array") {
                 foreach ($val as $x) {
                     $ret = $x[0];
-                    output("<code>" . htmlspecialchars($ret->scalarval()) . " "
-                        . htmlspecialchars($methodName->scalarval()) . "(");
-                    if ($x->count() > 1) {
-                        for ($k = 1; $k < $x->count(); $k++) {
+                    output("<code>".htmlspecialchars($ret->scalarval())." "
+                        . htmlspecialchars($methodName->scalarval())."(");
+                    if ($x->count()>1) {
+                        for ($k = 1; $k<$x->count(); $k++) {
                             $y = $x[$k];
                             output(htmlspecialchars($y->scalarval()));
-                            if ($k < $x->count() - 1) {
+                            if ($k<$x->count()-1) {
                                 output(", ");
                             }
                         }

Please login to merge, or discard this patch.

demo/client/proxy.php 1 patch

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Proxy demo</title></head>

Please login to merge, or discard this patch.

demo/client/mail.php 1 patch

Spacing +3 added lines, -3 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 - Mail demo</title></head>
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
         output("<font color=\"red\">");
         output("Mail send failed<br/>\n");
         output("Fault: ");
-        output("Code: " . htmlspecialchars($resp->faultCode()) .
-            " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>");
+        output("Code: ".htmlspecialchars($resp->faultCode()).
+            " Reason: '".htmlspecialchars($resp->faultString())."'<br/>");
         output("</font><br/>");
     }
 }

Please login to merge, or discard this patch.

tests/index.php 1 patch

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

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }
 
 $targetFile = null;
@@ -38,5 +38,5 @@  discard block
 block discarded – undo
 }
 
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }

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";
     }
 
     /**
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -234,10 +234,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'],
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
                     if (extension_loaded('mbstring')) {
                         $data = mb_convert_encoding($data, 'UTF-8', $reqEncoding);
                     } 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);
                     }
                 }
             }
@@ -583,16 +583,16 @@  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 + $matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+$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
@@ -603,20 +603,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);
             }
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": ${errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": ${errStr}"
                 );
             }
         }
@@ -682,7 +682,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);
             }
@@ -694,17 +694,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'));
         }
 
@@ -717,14 +717,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"
                         );
                     }
                 }
@@ -740,7 +740,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
             // in the called function, we wrap it in a 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";
     }
 
     /**
@@ -809,9 +809,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";
         }
     }
 
@@ -1068,7 +1068,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));
             }
         }
 
@@ -1145,7 +1145,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/Response.php 1 patch

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

@@ -151,35 +151,35 @@  discard block
 block discarded – undo
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
                 "</struct>\n</value>\n</fault>";
         } else {
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
                 if (is_string($this->val) && $this->valtyp == 'xml') {
-                    $result .= "<params>\n<param>\n" .
-                        $this->val .
+                    $result .= "<params>\n<param>\n".
+                        $this->val.
                         "</param>\n</params>";
                 } else {
                     /// @todo try to build something serializable using the Encoder...
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
                 }
             } else {
-                $result .= "<params>\n<param>\n" .
-                    $this->val->serialize($charsetEncoding) .
+                $result .= "<params>\n<param>\n".
+                    $this->val->serialize($charsetEncoding).
                     "</param>\n</params>";
             }
         }
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
                 return $this->httpResponse['raw_data'];
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 return null;
         }
     }
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

Please login to merge, or discard this patch.

		@@ -151,35 +151,35 @@ discard block
		block discarded – undo
151	151	public function serialize($charsetEncoding = '')
152	152	{
153	153	if ($charsetEncoding != '') {
154		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	154	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
155	155	} else {
156	156	$this->content_type = 'text/xml';
157	157	}
158	158	if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
159		- $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
	159	+ $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
160	160	} else {
161	161	$result = "<methodResponse>\n";
162	162	}
163	163	if ($this->errno) {
164	164	// Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
165		- $result .= "<fault>\n" .
166		- "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
167		- "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
168		- Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
	165	+ $result .= "<fault>\n".
	166	+ "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
	167	+ "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
	168	+ Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
169	169	"</struct>\n</value>\n</fault>";
170	170	} else {
171	171	if (!is_object($this->val) \|\| !is_a($this->val, 'PhpXmlRpc\Value')) {
172	172	if (is_string($this->val) && $this->valtyp == 'xml') {
173		- $result .= "<params>\n<param>\n" .
174		- $this->val .
	173	+ $result .= "<params>\n<param>\n".
	174	+ $this->val.
175	175	"</param>\n</params>";
176	176	} else {
177	177	/// @todo try to build something serializable using the Encoder...
178	178	throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
179	179	}
180	180	} else {
181		- $result .= "<params>\n<param>\n" .
182		- $this->val->serialize($charsetEncoding) .
	181	+ $result .= "<params>\n<param>\n".
	182	+ $this->val->serialize($charsetEncoding).
183	183	"</param>\n</params>";
184	184	}
185	185	}
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	return $this->httpResponse['raw_data'];
205	205	default:
206	206	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
207		- trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	207	+ trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
208	208	return null;
209	209	}
210	210	}
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	break;
226	226	default:
227	227	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
228		- trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	228	+ trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
229	229	}
230	230	}
231	231
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	break;
258	258	default:
259	259	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
260		- trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	260	+ trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
261	261	}
262	262	}
263	263	}

		@@ -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 - Webservice wrappper demo</title></head>
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	$client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
21	21	$resp = $client->send(new PhpXmlRpc\Request('system.listMethods'));
22	22	if ($resp->faultCode()) {
23		- output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n");
	23	+ output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n");
24	24	} else {
25	25	output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n");
26	26	flush();
		@@ -32,9 +32,9 @@ discard block
		block discarded – undo
32	32	if ($methodName == 'examples.getStateName') {
33	33	$callable = $wrapper->wrapXmlrpcMethod($client, $methodName);
34	34	if ($callable) {
35		- output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n");
	35	+ output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n");
36	36	} else {
37		- output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n");
	37	+ output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n");
38	38	}
39	39	break;
40	40	}

		@@ -14,7 +14,7 @@
		block discarded – undo
14	14	}
15	15
16	16	// Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
17		-include_once __DIR__ . '/../../src/Autoloader.php';
	17	+include_once __DIR__.'/../../src/Autoloader.php';
18	18	PhpXmlRpc\Autoloader::register();
19	19
20	20	// Let unit tests run against localhost, 'plain' demos against a known public server

		@@ -1,5 +1,5 @@
		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 - Proxy demo</title></head>

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
16	16	}
17	17
18		- include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
	18	+ include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
19	19	}
20	20
21	21	$targetFile = null;
		@@ -38,5 +38,5 @@ discard block
		block discarded – undo
38	38	}
39	39
40	40	if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
41		- include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
	41	+ include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
42	42	}

		@@ -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	/**
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	*/
216	216	public static function error_occurred($msg)
217	217	{
218		- static::$_xmlrpcs_occurred_errors .= $msg . "\n";
	218	+ static::$_xmlrpcs_occurred_errors .= $msg."\n";
219	219	}
220	220
221	221	/**
		@@ -234,10 +234,10 @@ discard block
		block discarded – undo
234	234	// user debug info should be encoded by the end user using the INTERNAL_ENCODING
235	235	$out = '';
236	236	if ($this->debug_info != '') {
237		- $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
	237	+ $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
238	238	}
239	239	if (static::$_xmlrpc_debuginfo != '') {
240		- $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
	240	+ $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
241	241	// NB: a better solution MIGHT be to use CDATA, but we need to insert it
242	242	// into return payload AFTER the beginning tag
243	243	//$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'],
		@@ -564,7 +564,7 @@ discard block
		block discarded – undo
564	564	if (extension_loaded('mbstring')) {
565	565	$data = mb_convert_encoding($data, 'UTF-8', $reqEncoding);
566	566	} else {
567		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding);
	567	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding);
568	568	}
569	569	}
570	570	}
		@@ -583,16 +583,16 @@ discard block
		block discarded – undo
583	583
584	584	$xmlRpcParser = $this->getParser();
585	585	$xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options);
586		- if ($xmlRpcParser->_xh['isf'] > 2) {
	586	+ if ($xmlRpcParser->_xh['isf']>2) {
587	587	// (BC) we return XML error as a faultCode
588	588	preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches);
589	589	$r = new Response(0,
590		- PhpXmlRpc::$xmlrpcerrxml + $matches[1],
	590	+ PhpXmlRpc::$xmlrpcerrxml+$matches[1],
591	591	$xmlRpcParser->_xh['isf_reason']);
592	592	} elseif ($xmlRpcParser->_xh['isf']) {
593	593	$r = new Response(0,
594	594	PhpXmlRpc::$xmlrpcerr['invalid_request'],
595		- PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']);
	595	+ PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']);
596	596	} else {
597	597	// small layering violation in favor of speed and memory usage:
598	598	// we should allow the 'execute' method handle this, but in the
		@@ -603,20 +603,20 @@ discard block
		block discarded – undo
603	603	($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals')
604	604	)
605	605	) {
606		- if ($this->debug > 1) {
607		- $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++");
	606	+ if ($this->debug>1) {
	607	+ $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++");
608	608	}
609	609	$r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']);
610	610	} else {
611	611	// build a Request object with data parsed from xml
612	612	$req = new Request($xmlRpcParser->_xh['method']);
613	613	// now add parameters in
614		- for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
	614	+ for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
615	615	$req->addParam($xmlRpcParser->_xh['params'][$i]);
616	616	}
617	617
618		- if ($this->debug > 1) {
619		- $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
	618	+ if ($this->debug>1) {
	619	+ $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
620	620	}
621	621	$r = $this->execute($req);
622	622	}
		@@ -669,7 +669,7 @@ discard block
		block discarded – undo
669	669	return new Response(
670	670	0,
671	671	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
672		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": ${errStr}"
	672	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": ${errStr}"
673	673	);
674	674	}
675	675	}
		@@ -682,7 +682,7 @@ discard block
		block discarded – undo
682	682
683	683	if (is_array($func)) {
684	684	if (is_object($func[0])) {
685		- $funcName = get_class($func[0]) . '->' . $func[1];
	685	+ $funcName = get_class($func[0]).'->'.$func[1];
686	686	} else {
687	687	$funcName = implode('::', $func);
688	688	}
		@@ -694,17 +694,17 @@ discard block
		block discarded – undo
694	694
695	695	// verify that function to be invoked is in fact callable
696	696	if (!is_callable($func)) {
697		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
	697	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
698	698	return new Response(
699	699	0,
700	700	PhpXmlRpc::$xmlrpcerr['server_error'],
701		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
	701	+ PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
702	702	);
703	703	}
704	704
705	705	// If debug level is 3, we should catch all errors generated during
706	706	// processing of user function, and log them as part of response
707		- if ($this->debug > 2) {
	707	+ if ($this->debug>2) {
708	708	self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
709	709	}
710	710
		@@ -717,14 +717,14 @@ discard block
		block discarded – undo
717	717	$r = call_user_func($func, $req);
718	718	}
719	719	if (!is_a($r, 'PhpXmlRpc\Response')) {
720		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
	720	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
721	721	if (is_a($r, 'PhpXmlRpc\Value')) {
722	722	$r = new Response($r);
723	723	} else {
724	724	$r = new Response(
725	725	0,
726	726	PhpXmlRpc::$xmlrpcerr['server_error'],
727		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
	727	+ PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
728	728	);
729	729	}
730	730	}
		@@ -740,7 +740,7 @@ discard block
		block discarded – undo
740	740	// mimic EPI behaviour: if we get an array that looks like an error, make it
741	741	// an error response
742	742	if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
743		- $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
	743	+ $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
744	744	} else {
745	745	// functions using EPI api should NOT return resp objects,
746	746	// so make sure we encode the return type correctly
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	// in the called function, we wrap it in a 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	/**
		@@ -809,9 +809,9 @@ discard block
		block discarded – undo
809	809	protected function xml_header($charsetEncoding = '')
810	810	{
811	811	if ($charsetEncoding != '') {
812		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
	812	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
813	813	} else {
814		- return "<?xml version=\"1.0\"?" . ">\n";
	814	+ return "<?xml version=\"1.0\"?".">\n";
815	815	}
816	816	}
817	817
		@@ -1068,7 +1068,7 @@ discard block
		block discarded – undo
1068	1068	$i++; // for error message, we count params from 1
1069	1069	return static::_xmlrpcs_multicall_error(new Response(0,
1070	1070	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1071		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
	1071	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1072	1072	}
1073	1073	}
1074	1074
		@@ -1145,7 +1145,7 @@ discard block
		block discarded – undo
1145	1145	}
1146	1146	} else {
1147	1147	$numCalls = count($req);
1148		- for ($i = 0; $i < $numCalls; $i++) {
	1148	+ for ($i = 0; $i<$numCalls; $i++) {
1149	1149	$result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1150	1150	}
1151	1151	}

gggeek / phpxmlrpc

Push — master ( 4b184a...e8165e )

Status

Category

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

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

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

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

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

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

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

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

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