Inspection of "update demos to avoid access to private client pro..." - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 182ddb...cf05b0 )

by Gaetano

created 2023-02-01 17:26 UTC

Status

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

@@ -28,7 +28,7 @@
 block discarded – undo
         if ($response->faultCode()) {
             throw new HttpException(502, $response->faultString());
         } else {
-            return new Response("<html><body>State number $stateNo is: " . $response->value()->scalarVal() . '</body></html>');
+            return new Response("<html><body>State number $stateNo is: ".$response->value()->scalarVal().'</body></html>');
         }
     }
 }

Please login to merge, or discard this patch.

demo/server/codegen.php 1 patch

Spacing +17 added lines, -17 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";
 
 /**
  * Demoing the code-generation capabilities of the library: create all that is required to expose as xml-rpc methods
@@ -38,33 +38,33 @@  discard block
 block discarded – undo
 // generate a file with a class definition
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 file_put_contents($targetClassFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     "class MyServerClass\n{\n\n"
 ) || die('uh oh');
 
 // we mangle a bit the code we get from wrapPhpClass to turn it into a php class definition instead of a bunch of functions
 
-foreach($code as $methodName => $methodDef) {
-    file_put_contents($targetClassFile, '  ' . str_replace(array('function ', "\n"), array('public static function ', "\n  "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh');
-    $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function'];
+foreach ($code as $methodName => $methodDef) {
+    file_put_contents($targetClassFile, '  '.str_replace(array('function ', "\n"), array('public static function ', "\n  "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh');
+    $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function'];
     unset($code[$methodName]['source']);
 }
 file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh');
 
 // generate separate files with the xml-rpc server instantiation and its dispatch map
 
-file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n");
+file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n");
 
 file_put_contents($targetControllerFile,
-    "<?php\n\n" .
+    "<?php\n\n".
 
-    "require_once '$autoloader';\n\n" .
+    "require_once '$autoloader';\n\n".
 
-    "require_once '$targetClassFile';\n\n" .
+    "require_once '$targetClassFile';\n\n".
 
     // NB: since we are running the generated code within the same script, the existing CommentManager instance will be
     // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
     //     Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm);
     //     Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm);
 
-    "\$dm = require_once '$targetDispatchMapFile';\n" .
-    '$s = new \PhpXmlRpc\Server($dm, false);' . "\n\n" .
-    '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" .
-    '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" .
-    '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n\n" .
-    '$s->service();' . "\n"
+    "\$dm = require_once '$targetDispatchMapFile';\n".
+    '$s = new \PhpXmlRpc\Server($dm, false);'."\n\n".
+    '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n".
+    '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n".
+    '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n\n".
+    '$s->service();'."\n"
 ) || die('uh oh');
 
 // test that everything worked by running it in realtime (note that this script will return an xml-rpc error message if

Please login to merge, or discard this patch.

src/Server.php 1 patch

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

@@ -260,7 +260,7 @@  discard block
 block discarded – undo
     public function getOptions()
     {
         $values = array();
-        foreach($this->options as $opt) {
+        foreach ($this->options as $opt) {
             $values[$opt] = $this->getOption($opt);
         }
         return $values;
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
      */
     public function setOptions($options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
 
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
      */
     public static function xmlrpc_debugmsg($msg)
     {
-        static::$_xmlrpc_debuginfo .= $msg . "\n";
+        static::$_xmlrpc_debuginfo .= $msg."\n";
     }
 
     /**
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
      */
     public static function error_occurred($msg)
     {
-        static::$_xmlrpcs_occurred_errors .= $msg . "\n";
+        static::$_xmlrpcs_occurred_errors .= $msg."\n";
     }
 
     /**
@@ -344,10 +344,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";
@@ -376,8 +376,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+++");
         }
 
         $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
@@ -394,14 +394,14 @@  discard block
 block discarded – undo
             $resp->raw_data = $rawData;
         }
 
-        if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
-            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
-                static::$_xmlrpcs_occurred_errors . "+++END+++");
+        if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
+            $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
+                static::$_xmlrpcs_occurred_errors."+++END+++");
         }
 
         $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 to build json magic
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
         if (empty($resp->payload)) {
             $resp->serialize($respCharset);
         }
-        $payload = $payload . $resp->payload;
+        $payload = $payload.$resp->payload;
 
         if ($returnPayload) {
             return $payload;
@@ -418,7 +418,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: ' . $resp->content_type);
+            header('Content-Type: '.$resp->content_type);
             // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
             header("Vary: Accept-Charset");
 
@@ -441,10 +441,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()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
         }
 
         print $payload;
@@ -507,9 +507,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') {
@@ -522,10 +522,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;
                     }
@@ -552,10 +552,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()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
         }
 
-        if ($this->debug > 1) {
+        if ($this->debug>1) {
             if (function_exists('getallheaders')) {
                 $this->debugmsg(''); // empty line
                 foreach (getallheaders() as $name => $val) {
@@ -580,13 +580,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'],
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
                     if ($reqEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding);
                     }
                 }
             }
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
             preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches);
             return new Response(
                 0,
-                PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
+                PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
                 $_xh['isf_reason']);
         } elseif ($_xh['isf']) {
             /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs.
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
             return new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['invalid_request'],
-                PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']);
+                PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']);
         } else {
             // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle
             // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals)
@@ -719,20 +719,20 @@  discard block
 block discarded – undo
                     ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals')
                 )
             ) {
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++");
                 }
 
                 return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']);
             } else {
                 // build a Request object with data parsed from xml and add parameters in
                 $req = new Request($_xh['method']);
-                for ($i = 0; $i < count($_xh['params']); $i++) {
+                for ($i = 0; $i<count($_xh['params']); $i++) {
                     $req->addParam($_xh['params'][$i]);
                 }
 
-                if ($this->debug > 1) {
-                    $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
+                if ($this->debug>1) {
+                    $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
                 }
 
                 return $this->execute($req);
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
                 return new Response(
                     0,
                     PhpXmlRpc::$xmlrpcerr['incorrect_params'],
-                    PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
+                    PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
                 );
             }
         }
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
         // build string representation of function 'name'
         if (is_array($func)) {
             if (is_object($func[0])) {
-                $funcName = get_class($func[0]) . '->' . $func[1];
+                $funcName = get_class($func[0]).'->'.$func[1];
             } else {
                 $funcName = implode('::', $func);
             }
@@ -811,23 +811,23 @@  discard block
 block discarded – undo
 
         // verify that function to be invoked is in fact callable
         if (!is_callable($func)) {
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
             return new Response(
                 0,
                 PhpXmlRpc::$xmlrpcerr['server_error'],
-                PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
+                PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
             );
         }
 
         if (isset($dmap[$methodName]['exception_handling'])) {
-            $exception_handling = (int)$dmap[$methodName]['exception_handling'];
+            $exception_handling = (int) $dmap[$methodName]['exception_handling'];
         } else {
             $exception_handling = $this->exception_handling;
         }
 
         // If debug level is 3, we should catch all errors generated during processing of user function, and log them
         // as part of response
-        if ($this->debug > 2) {
+        if ($this->debug>2) {
             self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
         }
 
@@ -841,14 +841,14 @@  discard block
 block discarded – undo
                     $r = call_user_func($func, $req);
                 }
                 if (!is_a($r, 'PhpXmlRpc\Response')) {
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
                     if (is_a($r, 'PhpXmlRpc\Value')) {
                         $r = new 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"
                         );
                     }
                 }
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
                         $r = call_user_func_array($func, array($methodName, $params, $this->user_data));
                         // mimic EPI behaviour: if we get an array that looks like an error, make it an error response
                         if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
-                            $r = new 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
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
             // proper error-response
             switch ($exception_handling) {
                 case 2:
-                    if ($this->debug > 2) {
+                    if ($this->debug>2) {
                         if (self::$_xmlrpcs_prev_ehandler) {
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
                         } else {
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
             // proper error-response
             switch ($exception_handling) {
                 case 2:
-                    if ($this->debug > 2) {
+                    if ($this->debug>2) {
                         if (self::$_xmlrpcs_prev_ehandler) {
                             set_error_handler(self::$_xmlrpcs_prev_ehandler);
                         } else {
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
             }
         }
 
-        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) {
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
      */
     protected function debugmsg($string)
     {
-        $this->debug_info .= $string . "\n";
+        $this->debug_info .= $string."\n";
     }
 
     /**
@@ -1007,9 +1007,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";
         }
     }
 
@@ -1302,7 +1302,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));
             }
         }
 
@@ -1383,7 +1383,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/Encoder.php 1 patch

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

@@ -57,13 +57,13 @@  discard block
 block discarded – undo
                                 'scalar' => $val,
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'base64':
                             $xmlrpcVal = array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $val
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'string':
                             if (isset($options['extension_api_encoding'])) {
                                 // if iconv is not available, we use mb_convert_encoding
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
             case 'msg':
                 $paramCount = $xmlrpcVal->getNumParams();
                 $arr = array();
-                for ($i = 0; $i < $paramCount; $i++) {
+                for ($i = 0; $i<$paramCount; $i++) {
                     $arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
                 }
                 return $arr;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
                 break;
             case 'resource':
                 if (in_array('extension_api', $options)) {
-                    $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
+                    $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
                 } else {
                     $xmlrpcVal = new Value();
                 }
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
                     if ($valEncoding == 'ISO-8859-1') {
                         $xmlVal = utf8_encode($xmlVal);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
                     }
                 }
             }
@@ -333,10 +333,10 @@  discard block
 block discarded – undo
         );
         $_xh = $xmlRpcParser->_xh;
 
-        if ($_xh['isf'] > 1) {
+        if ($_xh['isf']>1) {
             // test that $_xh['value'] is an obj, too???
 
-            $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']);
+            $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']);
 
             return false;
         }
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
 
             case 'methodcall':
                 $req = new Request($_xh['method']);
-                for ($i = 0; $i < count($_xh['params']); $i++) {
+                for ($i = 0; $i<count($_xh['params']); $i++) {
                     $req->addParam($_xh['params'][$i]);
                 }
                 return $req;

Please login to merge, or discard this patch.

src/Request.php 1 patch

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

@@ -57,9 +57,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";
         }
     }
 
@@ -82,16 +82,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";
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
 
             return true;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
             return false;
         }
     }
@@ -213,14 +213,14 @@  discard block
 block discarded – undo
      */
     public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
     {
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $this->getLogger()->debug("---GOT---\n$data\n---END---");
         }
 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -228,12 +228,12 @@  discard block
 block discarded – undo
         if (substr($data, 0, 4) == 'HTTP') {
             $httpParser = new Http();
             try {
-                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
+                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
             } catch (HttpException $e) {
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         } else {
@@ -249,7 +249,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
@@ -258,21 +258,21 @@  discard block
 block discarded – undo
             $data
         );
 
-        if ($this->debug >= 0) {
+        if ($this->debug>=0) {
             $this->httpResponse = $httpResponse;
         } else {
             $httpResponse = null;
         }
 
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 /// @todo what if there is no end tag?
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
             }
         }
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -321,16 +321,16 @@  discard block
 block discarded – undo
             //    there could be proxies meddling with the request, or network data corruption...
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse);
 
-            if ($this->debug > 0) {
+            if ($this->debug>0) {
                 $this->getLogger()->debug($_xh['isf_reason']);
             }
         }
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse);
 
             /// @todo echo something for the user? check if it was already done by the parser...
             //if ($this->debug > 0) {
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
         }
         // third error check: parsing of the response has somehow gone boink.
         /// @todo shall we omit this check, since we trust the parsing code?
-        elseif ($_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
+        elseif ($_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
             // something odd has happened and it's time to generate a client side error indicating something odd went on
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
                 '', $httpResponse
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
 
             /// @todo echo something for the user?
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debug(
                     "---PARSED---\n".var_export($_xh['value'], true)."\n---END---"
                 );
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
                 if ($errNo == 0) {
                     // FAULT returned, errno needs to reflect that
                     /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
                     $errNo = -1;
                 }
 

Please login to merge, or discard this patch.

lib/xmlrpc.inc 1 patch

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

@@ -129,7 +129,7 @@  discard block
 block discarded – undo
         $val = reset($ar);
         $typ = key($ar);
 
-        return '<value>' . $this->serializeData($typ, $val) . "</value>\n";
+        return '<value>'.$this->serializeData($typ, $val)."</value>\n";
         //}
     }
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
         // preserve back compatibility
 
         if (is_array($b)) {
-            foreach($b as $id => $cont) {
+            foreach ($b as $id => $cont) {
                 $b[$id] = $cont->scalarVal();
             }
         }
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
         // add support for structures directly encoding php objects
         if (is_object($b)) {
             $t = get_object_vars($b);
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 $t[$id] = $cont->scalarVal();
             }
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 @$b->$id = $cont;
             }
         }
@@ -201,17 +201,17 @@  discard block
 block discarded – undo
 /* Expose as global functions the ones which are now class methods */
 
 /// Wrong speling, but we are adamant on backwards compatibility!
-function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
+function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '')
 {
     return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding);
 }
 
-function iso8601_encode($timeT, $utc=0)
+function iso8601_encode($timeT, $utc = 0)
 {
     return Date::iso8601Encode($timeT, $utc);
 }
 
-function iso8601_decode($iDate, $utc=0)
+function iso8601_decode($iDate, $utc = 0)
 {
     return Date::iso8601Decode($iDate, $utc);
 }
@@ -221,25 +221,25 @@  discard block
 block discarded – undo
     return Http::decodeChunked($buffer);
 }
 
-function php_xmlrpc_decode($xmlrpcVal, $options=array())
+function php_xmlrpc_decode($xmlrpcVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->decode($xmlrpcVal, $options);
 }
 
-function php_xmlrpc_encode($phpVal, $options=array())
+function php_xmlrpc_encode($phpVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->encode($phpVal, $options);
 }
 
-function php_xmlrpc_decode_xml($xmlVal, $options=array())
+function php_xmlrpc_decode_xml($xmlVal, $options = array())
 {
     $encoder = new Encoder();
     return $encoder->decodeXml($xmlVal, $options);
 }
 
-function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
+function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null)
 {
     return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
 }

Please login to merge, or discard this patch.

demo/client/parallel.php 1 patch

Spacing +25 added lines, -25 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";
 
 use PhpXmlRpc\Encoder;
 use PhpXmlRpc\Client;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
         $handles = array();
         $curl = curl_multi_init();
 
-        foreach($requests as $k => $req) {
+        foreach ($requests as $k => $req) {
             $req->setDebug($this->debug);
             $handle = $this->createCurlHandle($req, $method, $this->server, $this->port, $this->path, $opts);
             curl_multi_add_handle($curl, $handle);
@@ -43,20 +43,20 @@  discard block
 block discarded – undo
         $running = 0;
         do {
             curl_multi_exec($curl, $running);
-        } while($running > 0);
+        } while ($running>0);
 
         $responses = array();
         $errors = array();
-        foreach($handles as $k => $h) {
+        foreach ($handles as $k => $h) {
             $responses[$k] = curl_multi_getcontent($handles[$k]);
 
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $message = "---CURL INFO---\n";
                 foreach (curl_getinfo($h) as $name => $val) {
                     if (is_array($val)) {
                         $val = implode("\n", $val);
                     }
-                    $message .= $name . ': ' . $val . "\n";
+                    $message .= $name.': '.$val."\n";
                 }
                 $message .= '---END---';
                 $this->getLogger()->debugMessage($message);
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
         }
         curl_multi_close($curl);
 
-        foreach($responses as $k => $resp) {
+        foreach ($responses as $k => $resp) {
             if (!$resp) {
-                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . $errors[$k]);
+                $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.$errors[$k]);
             } else {
                 $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type);
             }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 $value = $encoder->encode($data, array('auto_dates'));
 $req = new Request('interopEchoTests.echoValue', array($value));
 $reqs = array();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $reqs[] = $req;
 }
 
@@ -102,40 +102,40 @@  discard block
 block discarded – undo
 // avoid storing http info in the responses, to make the checksums comparable
 $client->setDebug(-1);
 
-echo "Making $num_tests calls to method interopEchoTests.echoValue on server " . XMLRPCSERVER . " ...\n";
+echo "Making $num_tests calls to method interopEchoTests.echoValue on server ".XMLRPCSERVER." ...\n";
 flush();
 
-$client->setOption(Client::OPT_NO_MULTICALL,  true);
+$client->setOption(Client::OPT_NO_MULTICALL, true);
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
-echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n";
-echo "Response checksum: " . md5(var_export($resp, true)) . "\n";
+$t = microtime(true)-$t;
+echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n";
+echo "Response checksum: ".md5(var_export($resp, true))."\n";
 flush();
 
 if (strpos(XMLRPCSERVER, 'http://') === 0) {
-    $client->setOption(Client::OPT_USE_CURL,  Client::USE_CURL_ALWAYS);
+    $client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_ALWAYS);
     $t = microtime(true);
     $resp = $client->send($reqs);
-    $t = microtime(true) - $t;
-    echo "Sequential send, curl (w. keepalive): " . sprintf('%.3f', $t) . " secs.\n";
-    echo "Response checksum: " . md5(var_export($resp, true)) . "\n";
+    $t = microtime(true)-$t;
+    echo "Sequential send, curl (w. keepalive): ".sprintf('%.3f', $t)." secs.\n";
+    echo "Response checksum: ".md5(var_export($resp, true))."\n";
     flush();
 }
 
 $t = microtime(true);
 $resp = $client->sendParallel($reqs);
-$t = microtime(true) - $t;
-echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n";
-echo "Response checksum: " . md5(var_export($resp, true)) . "\n";
+$t = microtime(true)-$t;
+echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n";
+echo "Response checksum: ".md5(var_export($resp, true))."\n";
 flush();
 
 $client->setOption(Client::OPT_NO_MULTICALL, false);
 // make sure we don't reuse the keepalive handle
-$client->setOption(Client::OPT_USE_CURL,  Client::USE_CURL_NEVER);
+$client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER);
 $t = microtime(true);
 $resp = $client->send($reqs);
-$t = microtime(true) - $t;
-echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n";
-echo "Response checksum: " . md5(var_export($resp, true)) . "\n";
+$t = microtime(true)-$t;
+echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n";
+echo "Response checksum: ".md5(var_export($resp, true))."\n";
 flush();

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>phpxmlrpc - Introspect demo</title></head>
@@ -17,7 +17,7 @@  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 Client(XMLRPCSERVER);
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 $client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP);
 
 // First off, let's retrieve the list of methods available on the remote server
-output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n");
+output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n");
 $req = new Request('system.listMethods');
 $resp = $client->send($req);
 
@@ -47,7 +47,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) . "</h4>\n");
+        output("<h4>".htmlspecialchars($methodName)."</h4>\n");
         // build requests first, add params later
         $r1 = new PhpXmlRpc\Request('system.methodHelp');
         $r2 = new PhpXmlRpc\Request('system.methodSignature');
@@ -83,12 +83,12 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $ret = $sig[0];
-                    output("<code>" . htmlspecialchars($ret) . " "
-                        . htmlspecialchars($methodName) . "(");
-                    if (count($sig) > 1) {
-                        for ($k = 1; $k < count($sig); $k++) {
+                    output("<code>".htmlspecialchars($ret)." "
+                        . htmlspecialchars($methodName)."(");
+                    if (count($sig)>1) {
+                        for ($k = 1; $k<count($sig); $k++) {
                             output(htmlspecialchars($sig[$k]));
-                            if ($k < count($sig) - 1) {
+                            if ($k<count($sig)-1) {
                                 output(", ");
                             }
                         }

Please login to merge, or discard this patch.

src/Client.php 2 patches

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

@@ -2011,9 +2011,9 @@
 block discarded – undo
      * @return false|\CurlHandle|resource
      */
     protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
-         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
-         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
-         $keyPass = '', $sslVersion = 0)
+            $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
+            $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
+            $keyPass = '', $sslVersion = 0)
     {
         $this->logDeprecationUnlessCalledBy('sendViaCURL');
 

Please login to merge, or discard this patch.

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

@@ -354,10 +354,10 @@  discard block
 block discarded – undo
             $server = $parts['host'];
             $path = isset($parts['path']) ? $parts['path'] : '';
             if (isset($parts['query'])) {
-                $path .= '?' . $parts['query'];
+                $path .= '?'.$parts['query'];
             }
             if (isset($parts['fragment'])) {
-                $path .= '#' . $parts['fragment'];
+                $path .= '#'.$parts['fragment'];
             }
             if (isset($parts['port'])) {
                 $port = $parts['port'];
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
             }
         }
         if ($path == '' || $path[0] != '/') {
-            $this->path = '/' . $path;
+            $this->path = '/'.$path;
         } else {
             $this->path = $path;
         }
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
         //$this->accepted_charset_encodings = $ch->knownCharsets();
 
         // initialize user_agent string
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
     }
 
     /**
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
      */
     public function setSSLVerifyPeer($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifypeer = $i;
         return $this;
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
      */
     public function setSSLVerifyHost($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->verifyhost = $i;
         return $this;
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
      */
     public function setSSLVersion($i)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->sslversion = $i;
         return $this;
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
      */
     public function setRequestCompression($compMethod)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->request_compression = $compMethod;
         return $this;
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
      */
     public function setCurlOptions($options)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->extracurlopts = $options;
         return $this;
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
      */
     public function setUseCurl($useCurlMode)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->use_curl = $useCurlMode;
         return $this;
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
      */
     public function setUserAgent($agentString)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->user_agent = $agentString;
         return $this;
@@ -935,12 +935,12 @@  discard block
 block discarded – undo
             }
         }
 
-        $url = $this->method . '://' . $this->server;
+        $url = $this->method.'://'.$this->server;
         if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) ||
             ($this->port == 443 && in_array($this->method, array('https', 'h2')))) {
-            return $url . $this->path;
+            return $url.$this->path;
         } else {
-            return $url . ':' . $this->port . $this->path;
+            return $url.':'.$this->port.$this->path;
         }
     }
 
@@ -980,7 +980,7 @@  discard block
 block discarded – undo
     public function send($req, $timeout = 0, $method = '')
     {
         if ($method !== '' || $timeout !== 0) {
-            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated');
+            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated');
         }
 
         // if user does not specify http protocol, use native method of this client
@@ -1105,16 +1105,16 @@  discard block
 block discarded – undo
         // thanks to Grant Rauscher <[email protected]> for this
         $credentials = '';
         if ($opts['username'] != '') {
-            $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n";
+            $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n";
             if ($opts['authtype'] != 1) {
                 /// @todo make this a proper error, i.e. return a failure
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
             }
         }
 
         $acceptedEncoding = '';
         if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) {
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n";
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n";
         }
 
         if ($port == 0) {
@@ -1130,14 +1130,14 @@  discard block
 block discarded – undo
             $connectPort = $opts['proxyport'];
             $transport = 'tcp';
             /// @todo check: should we not use https in some cases?
-            $uri = 'http://' . $server . ':' . $port . $path;
+            $uri = 'http://'.$server.':'.$port.$path;
             if ($opts['proxy_user'] != '') {
                 if ($opts['proxy_authtype'] != 1) {
                     /// @todo make this a proper error, i.e. return a failure
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
                 }
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' .
-                    $opts['proxy_pass']) . "\r\n";
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'.
+                    $opts['proxy_pass'])."\r\n";
             }
         } else {
             $connectServer = $server;
@@ -1153,32 +1153,32 @@  discard block
 block discarded – undo
             $version = '';
             foreach ($opts['cookies'] as $name => $cookie) {
                 /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments
-                $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
+                $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
             }
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
         }
 
         // omit port if default
         if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) {
             $port = '';
         } else {
-            $port = ':' . $port;
+            $port = ':'.$port;
         }
 
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
-            'User-Agent: ' . $opts['user_agent'] . "\r\n" .
-            'Host: ' . $server . $port . "\r\n" .
-            $credentials .
-            $proxyCredentials .
-            $acceptedEncoding .
-            $encodingHdr .
-            'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" .
-            $cookieHeader .
-            'Content-Type: ' . $req->content_type . "\r\nContent-Length: " .
-            strlen($payload) . "\r\n\r\n" .
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
+            'User-Agent: '.$opts['user_agent']."\r\n".
+            'Host: '.$server.$port."\r\n".
+            $credentials.
+            $proxyCredentials.
+            $acceptedEncoding.
+            $encodingHdr.
+            'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n".
+            $cookieHeader.
+            'Content-Type: '.$req->content_type."\r\nContent-Length: ".
+            strlen($payload)."\r\n\r\n".
             $payload;
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$op\n---END---");
         }
 
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
 
         $context = stream_context_create($contextOptions);
 
-        if ($opts['timeout'] <= 0) {
+        if ($opts['timeout']<=0) {
             $connectTimeout = ini_get('default_socket_timeout');
         } else {
             $connectTimeout = $opts['timeout'];
@@ -1217,7 +1217,7 @@  discard block
 block discarded – undo
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
             STREAM_CLIENT_CONNECT, $context);
         if ($fp) {
-            if ($opts['timeout'] > 0) {
+            if ($opts['timeout']>0) {
                 stream_set_timeout($fp, $opts['timeout'], 0);
             }
         } else {
@@ -1226,8 +1226,8 @@  discard block
 block discarded – undo
                 $this->errstr = $err['message'];
             }
 
-            $this->errstr = 'Connect error: ' . $this->errstr;
-            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
+            $this->errstr = 'Connect error: '.$this->errstr;
+            $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
 
             return $r;
         }
@@ -1294,19 +1294,19 @@  discard block
 block discarded – undo
             $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']);
 
         if (!$curl) {
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
                 ': error during curl initialization. Check php error log for details');
         }
 
         $result = curl_exec($curl);
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $message = "---CURL INFO---\n";
             foreach (curl_getinfo($curl) as $name => $val) {
                 if (is_array($val)) {
                     $val = implode("\n", $val);
                 }
-                $message .= $name . ': ' . $val . "\n";
+                $message .= $name.': '.$val."\n";
             }
             $message .= '---END---';
             $this->getLogger()->debug($message);
@@ -1316,8 +1316,8 @@  discard block
 block discarded – undo
             /// @todo we should use a better check here - what if we get back '' or '0'?
 
             $this->errstr = 'no response';
-            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
-                ': ' . curl_error($curl));
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
+                ': '.curl_error($curl));
             curl_close($curl);
             if ($opts['keepalive']) {
                 $this->xmlrpc_curl_handle = null;
@@ -1393,12 +1393,12 @@  discard block
 block discarded – undo
                     // http, https
                     $protocol = $method;
                     if (strpos($protocol, ':') !== false) {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
                         return false;
                     }
                 }
             }
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $path);
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$path);
             if (!$curl) {
                 return false;
             }
@@ -1412,7 +1412,7 @@  discard block
 block discarded – undo
         // results into variable
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             curl_setopt($curl, CURLOPT_VERBOSE, true);
             /// @todo redirect curlopt_stderr to some stream which can be piped to the logger
         }
@@ -1437,7 +1437,7 @@  discard block
 block discarded – undo
             }
         }
         // extra headers
-        $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']));
+        $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings']));
         // if no keepalive is wanted, let the server know it in advance
         if (!$opts['keepalive']) {
             $headers[] = 'Connection: close';
@@ -1454,7 +1454,7 @@  discard block
 block discarded – undo
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
         // timeout is borked
         if ($opts['timeout']) {
-            curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout'] - 1);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $opts['timeout'] == 1 ? 1 : $opts['timeout']-1);
         }
 
         switch ($method) {
@@ -1469,7 +1469,7 @@  discard block
 block discarded – undo
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
                     /// @todo make this a proper error, i.e. return a failure
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
                 }
                 break;
             case 'h2':
@@ -1478,12 +1478,12 @@  discard block
 block discarded – undo
         }
 
         if ($opts['username'] && $opts['password']) {
-            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']);
+            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']);
             if (defined('CURLOPT_HTTPAUTH')) {
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
             } elseif ($opts['authtype'] != 1) {
                 /// @todo make this a proper error, i.e. return a failure
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
             }
         }
 
@@ -1526,14 +1526,14 @@  discard block
 block discarded – undo
             if ($opts['proxyport'] == 0) {
                 $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080
             }
-            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']);
+            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']);
             if ($opts['proxy_user']) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']);
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']);
                 if (defined('CURLOPT_PROXYAUTH')) {
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
                 } elseif ($opts['proxy_authtype'] != 1) {
                     /// @todo make this a proper error, i.e. return a failure
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
                 }
             }
         }
@@ -1543,7 +1543,7 @@  discard block
 block discarded – undo
         if (count($opts['cookies'])) {
             $cookieHeader = '';
             foreach ($opts['cookies'] as $name => $cookie) {
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
             }
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
         }
@@ -1552,7 +1552,7 @@  discard block
 block discarded – undo
             curl_setopt($curl, $opt, $val);
         }
 
-        if ($opts['debug'] > 1) {
+        if ($opts['debug']>1) {
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
         }
 
@@ -1643,7 +1643,7 @@  discard block
 block discarded – undo
             $call['methodName'] = new Value($req->method(), 'string');
             $numParams = $req->getNumParams();
             $params = array();
-            for ($i = 0; $i < $numParams; $i++) {
+            for ($i = 0; $i<$numParams; $i++) {
                 $params[$i] = $req->getParam($i);
             }
             $call['params'] = new Value($params, 'array');
@@ -1665,7 +1665,7 @@  discard block
 block discarded – undo
         $response = array();
 
         if ($this->return_type == 'xml') {
-            for ($i = 0; $i < count($reqs); $i++) {
+            for ($i = 0; $i<count($reqs); $i++) {
                 $response[] = new Response($rets, 0, '', 'xml', $result->httpResponse());
             }
 
@@ -1673,21 +1673,21 @@  discard block
 block discarded – undo
             if (!is_array($rets)) {
                 // bad return type from system.multicall
                 return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse());
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse());
             }
             $numRets = count($rets);
             if ($numRets != count($reqs)) {
                 // wrong number of return values.
                 return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals',
                     $result->httpResponse());
             }
 
-            for ($i = 0; $i < $numRets; $i++) {
+            for ($i = 0; $i<$numRets; $i++) {
                 $val = $rets[$i];
                 if (!is_array($val)) {
                     return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                        PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
+                        PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
                         'phpvals', $result->httpResponse());
                 }
                 switch (count($val)) {
@@ -1695,7 +1695,7 @@  discard block
 block discarded – undo
                         if (!isset($val[0])) {
                             // Bad value
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value",
                                 'phpvals', $result->httpResponse());
                         }
                         // Normal return value
@@ -1707,20 +1707,20 @@  discard block
 block discarded – undo
                         if (!is_int($code)) {
                             /// @todo should we check that it is != 0?
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'phpvals', $result->httpResponse());
                         }
                         $str = @$val['faultString'];
                         if (!is_string($str)) {
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString",
                                 'phpvals', $result->httpResponse());
                         }
                         $response[$i] = new Response(0, $code, $str, 'phpvals', $result->httpResponse());
                         break;
                     default:
                         return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                             'phpvals', $result->httpResponse());
                 }
             }
@@ -1729,14 +1729,14 @@  discard block
 block discarded – undo
             // return type == 'xmlrpcvals'
             if ($rets->kindOf() != 'array') {
                 return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals',
                     $result->httpResponse());
             }
             $numRets = $rets->count();
             if ($numRets != count($reqs)) {
                 // wrong number of return values.
                 return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals',
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals',
                     $result->httpResponse());
             }
 
@@ -1745,7 +1745,7 @@  discard block
 block discarded – undo
                     case 'array':
                         if ($val->count() != 1) {
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                                 'phpvals', $result->httpResponse());
                         }
                         // Normal return value
@@ -1754,28 +1754,28 @@  discard block
 block discarded – undo
                     case 'struct':
                         if ($val->count() != 2) {
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
                                 'phpvals', $result->httpResponse());
                         }
                         /** @var Value $code */
                         $code = $val['faultCode'];
                         if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') {
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'xmlrpcvals', $result->httpResponse());
                         }
                         /** @var Value $str */
                         $str = $val['faultString'];
                         if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') {
                             return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
                                 'xmlrpcvals', $result->httpResponse());
                         }
                         $response[] = new Response(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse());
                         break;
                     default:
                         return new Response(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
                             'xmlrpcvals', $result->httpResponse());
                 }
             }
@@ -1808,7 +1808,7 @@  discard block
 block discarded – undo
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
         $method = 'http')
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null,
             null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method);
@@ -1844,7 +1844,7 @@  discard block
 block discarded – undo
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
         $sslVersion = 0)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->sendPayloadCURL($req, $server, $port, $timeout, $username,
             $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort,

Please login to merge, or discard this patch.

		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	$val = reset($ar);
130	130	$typ = key($ar);
131	131
132		- return '<value>' . $this->serializeData($typ, $val) . "</value>\n";
	132	+ return '<value>'.$this->serializeData($typ, $val)."</value>\n";
133	133	//}
134	134	}
135	135
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	// preserve back compatibility
149	149
150	150	if (is_array($b)) {
151		- foreach($b as $id => $cont) {
	151	+ foreach ($b as $id => $cont) {
152	152	$b[$id] = $cont->scalarVal();
153	153	}
154	154	}
		@@ -156,10 +156,10 @@ discard block
		block discarded – undo
156	156	// add support for structures directly encoding php objects
157	157	if (is_object($b)) {
158	158	$t = get_object_vars($b);
159		- foreach($t as $id => $cont) {
	159	+ foreach ($t as $id => $cont) {
160	160	$t[$id] = $cont->scalarVal();
161	161	}
162		- foreach($t as $id => $cont) {
	162	+ foreach ($t as $id => $cont) {
163	163	@$b->$id = $cont;
164	164	}
165	165	}
		@@ -201,17 +201,17 @@ discard block
		block discarded – undo
201	201	/* Expose as global functions the ones which are now class methods */
202	202
203	203	/// Wrong speling, but we are adamant on backwards compatibility!
204		-function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
	204	+function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '')
205	205	{
206	206	return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding);
207	207	}
208	208
209		-function iso8601_encode($timeT, $utc=0)
	209	+function iso8601_encode($timeT, $utc = 0)
210	210	{
211	211	return Date::iso8601Encode($timeT, $utc);
212	212	}
213	213
214		-function iso8601_decode($iDate, $utc=0)
	214	+function iso8601_decode($iDate, $utc = 0)
215	215	{
216	216	return Date::iso8601Decode($iDate, $utc);
217	217	}
		@@ -221,25 +221,25 @@ discard block
		block discarded – undo
221	221	return Http::decodeChunked($buffer);
222	222	}
223	223
224		-function php_xmlrpc_decode($xmlrpcVal, $options=array())
	224	+function php_xmlrpc_decode($xmlrpcVal, $options = array())
225	225	{
226	226	$encoder = new Encoder();
227	227	return $encoder->decode($xmlrpcVal, $options);
228	228	}
229	229
230		-function php_xmlrpc_encode($phpVal, $options=array())
	230	+function php_xmlrpc_encode($phpVal, $options = array())
231	231	{
232	232	$encoder = new Encoder();
233	233	return $encoder->encode($phpVal, $options);
234	234	}
235	235
236		-function php_xmlrpc_decode_xml($xmlVal, $options=array())
	236	+function php_xmlrpc_decode_xml($xmlVal, $options = array())
237	237	{
238	238	$encoder = new Encoder();
239	239	return $encoder->decodeXml($xmlVal, $options);
240	240	}
241	241
242		-function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
	242	+function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null)
243	243	{
244	244	return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
245	245	}

		@@ -2011,9 +2011,9 @@
		block discarded – undo
2011	2011	* @return false\|\CurlHandle\|resource
2012	2012	*/
2013	2013	protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
2014		- $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
2015		- $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
2016		- $keyPass = '', $sslVersion = 0)
	2014	+ $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
	2015	+ $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
	2016	+ $keyPass = '', $sslVersion = 0)
2017	2017	{
2018	2018	$this->logDeprecationUnlessCalledBy('sendViaCURL');
2019	2019

		@@ -28,7 +28,7 @@
		block discarded – undo
28	28	if ($response->faultCode()) {
29	29	throw new HttpException(502, $response->faultString());
30	30	} else {
31		- return new Response("<html><body>State number $stateNo is: " . $response->value()->scalarVal() . '</body></html>');
	31	+ return new Response("<html><body>State number $stateNo is: ".$response->value()->scalarVal().'</body></html>');
32	32	}
33	33	}
34	34	}

		@@ -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	/**
5	5	* Demoing the code-generation capabilities of the library: create all that is required to expose as xml-rpc methods
		@@ -38,33 +38,33 @@ discard block
		block discarded – undo
38	38	// generate a file with a class definition
39	39
40	40	// the generated code does not have an autoloader included - we need to add in one
41		-$autoloader = __DIR__ . "/_prepend.php";
	41	+$autoloader = __DIR__."/_prepend.php";
42	42
43	43	file_put_contents($targetClassFile,
44		- "<?php\n\n" .
45		- "require_once '$autoloader';\n\n" .
	44	+ "<?php\n\n".
	45	+ "require_once '$autoloader';\n\n".
46	46	"class MyServerClass\n{\n\n"
47	47	) \|\| die('uh oh');
48	48
49	49	// we mangle a bit the code we get from wrapPhpClass to turn it into a php class definition instead of a bunch of functions
50	50
51		-foreach($code as $methodName => $methodDef) {
52		- file_put_contents($targetClassFile, ' ' . str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source']) . "\n\n", FILE_APPEND) \|\| die('uh oh');
53		- $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function'];
	51	+foreach ($code as $methodName => $methodDef) {
	52	+ file_put_contents($targetClassFile, ' '.str_replace(array('function ', "\n"), array('public static function ', "\n "), $methodDef['source'])."\n\n", FILE_APPEND) \|\| die('uh oh');
	53	+ $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function'];
54	54	unset($code[$methodName]['source']);
55	55	}
56	56	file_put_contents($targetClassFile, "}\n", FILE_APPEND) \|\| die('uh oh');
57	57
58	58	// generate separate files with the xml-rpc server instantiation and its dispatch map
59	59
60		-file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n");
	60	+file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n");
61	61
62	62	file_put_contents($targetControllerFile,
63		- "<?php\n\n" .
	63	+ "<?php\n\n".
64	64
65		- "require_once '$autoloader';\n\n" .
	65	+ "require_once '$autoloader';\n\n".
66	66
67		- "require_once '$targetClassFile';\n\n" .
	67	+ "require_once '$targetClassFile';\n\n".
68	68
69	69	// NB: since we are running the generated code within the same script, the existing CommentManager instance will be
70	70	// available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder
		@@ -74,12 +74,12 @@ discard block
		block discarded – undo
74	74	// Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm);
75	75	// Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm);
76	76
77		- "\$dm = require_once '$targetDispatchMapFile';\n" .
78		- '$s = new \PhpXmlRpc\Server($dm, false);' . "\n\n" .
79		- '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" .
80		- '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" .
81		- '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n\n" .
82		- '$s->service();' . "\n"
	77	+ "\$dm = require_once '$targetDispatchMapFile';\n".
	78	+ '$s = new \PhpXmlRpc\Server($dm, false);'."\n\n".
	79	+ '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n".
	80	+ '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n".
	81	+ '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n\n".
	82	+ '$s->service();'."\n"
83	83	) \|\| die('uh oh');
84	84
85	85	// test that everything worked by running it in realtime (note that this script will return an xml-rpc error message if

		@@ -260,7 +260,7 @@ discard block
		block discarded – undo
260	260	public function getOptions()
261	261	{
262	262	$values = array();
263		- foreach($this->options as $opt) {
	263	+ foreach ($this->options as $opt) {
264	264	$values[$opt] = $this->getOption($opt);
265	265	}
266	266	return $values;
		@@ -273,7 +273,7 @@ discard block
		block discarded – undo
273	273	*/
274	274	public function setOptions($options)
275	275	{
276		- foreach($options as $name => $value) {
	276	+ foreach ($options as $name => $value) {
277	277	$this->setOption($name, $value);
278	278	}
279	279
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	*/
312	312	public static function xmlrpc_debugmsg($msg)
313	313	{
314		- static::$_xmlrpc_debuginfo .= $msg . "\n";
	314	+ static::$_xmlrpc_debuginfo .= $msg."\n";
315	315	}
316	316
317	317	/**
		@@ -323,7 +323,7 @@ discard block
		block discarded – undo
323	323	*/
324	324	public static function error_occurred($msg)
325	325	{
326		- static::$_xmlrpcs_occurred_errors .= $msg . "\n";
	326	+ static::$_xmlrpcs_occurred_errors .= $msg."\n";
327	327	}
328	328
329	329	/**
		@@ -344,10 +344,10 @@ discard block
		block discarded – undo
344	344	// user debug info should be encoded by the end user using the INTERNAL_ENCODING
345	345	$out = '';
346	346	if ($this->debug_info != '') {
347		- $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n";
	347	+ $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
348	348	}
349	349	if (static::$_xmlrpc_debuginfo != '') {
350		- $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n";
	350	+ $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n";
351	351	// NB: a better solution MIGHT be to use CDATA, but we need to insert it
352	352	// into return payload AFTER the beginning tag
353	353	//$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n";
		@@ -376,8 +376,8 @@ discard block
		block discarded – undo
376	376	$this->debug_info = '';
377	377
378	378	// Save what we received, before parsing it
379		- if ($this->debug > 1) {
380		- $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
	379	+ if ($this->debug>1) {
	380	+ $this->debugmsg("+++GOT+++\n".$data."\n+++END+++");
381	381	}
382	382
383	383	$resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding);
		@@ -394,14 +394,14 @@ discard block
		block discarded – undo
394	394	$resp->raw_data = $rawData;
395	395	}
396	396
397		- if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') {
398		- $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
399		- static::$_xmlrpcs_occurred_errors . "+++END+++");
	397	+ if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') {
	398	+ $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".
	399	+ static::$_xmlrpcs_occurred_errors."+++END+++");
400	400	}
401	401
402	402	$payload = $this->xml_header($respCharset);
403		- if ($this->debug > 0) {
404		- $payload = $payload . $this->serializeDebug($respCharset);
	403	+ if ($this->debug>0) {
	404	+ $payload = $payload.$this->serializeDebug($respCharset);
405	405	}
406	406
407	407	// Do not create response serialization if it has already happened. Helps to build json magic
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409	if (empty($resp->payload)) {
410	410	$resp->serialize($respCharset);
411	411	}
412		- $payload = $payload . $resp->payload;
	412	+ $payload = $payload.$resp->payload;
413	413
414	414	if ($returnPayload) {
415	415	return $payload;
		@@ -418,7 +418,7 @@ discard block
		block discarded – undo
418	418	// if we get a warning/error that has output some text before here, then we cannot
419	419	// add a new header. We cannot say we are sending xml, either...
420	420	if (!headers_sent()) {
421		- header('Content-Type: ' . $resp->content_type);
	421	+ header('Content-Type: '.$resp->content_type);
422	422	// we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did
423	423	header("Vary: Accept-Charset");
424	424
		@@ -441,10 +441,10 @@ discard block
		block discarded – undo
441	441	// Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for
442	442	// responses up to 8000 bytes
443	443	if ($phpNoSelfCompress) {
444		- header('Content-Length: ' . (int)strlen($payload));
	444	+ header('Content-Length: '.(int) strlen($payload));
445	445	}
446	446	} else {
447		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages');
	447	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
448	448	}
449	449
450	450	print $payload;
		@@ -507,9 +507,9 @@ discard block
		block discarded – undo
507	507	$numParams = count($in);
508	508	}
509	509	foreach ($sigs as $curSig) {
510		- if (count($curSig) == $numParams + 1) {
	510	+ if (count($curSig) == $numParams+1) {
511	511	$itsOK = 1;
512		- for ($n = 0; $n < $numParams; $n++) {
	512	+ for ($n = 0; $n<$numParams; $n++) {
513	513	if (is_object($in)) {
514	514	$p = $in->getParam($n);
515	515	if ($p->kindOf() == 'scalar') {
		@@ -522,10 +522,10 @@ discard block
		block discarded – undo
522	522	}
523	523
524	524	// param index is $n+1, as first member of sig is return type
525		- if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) {
	525	+ if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) {
526	526	$itsOK = 0;
527		- $pno = $n + 1;
528		- $wanted = $curSig[$n + 1];
	527	+ $pno = $n+1;
	528	+ $wanted = $curSig[$n+1];
529	529	$got = $pt;
530	530	break;
531	531	}
		@@ -552,10 +552,10 @@ discard block
		block discarded – undo
552	552	// check if $_SERVER is populated: it might have been disabled via ini file
553	553	// (this is true even when in CLI mode)
554	554	if (count($_SERVER) == 0) {
555		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated');
	555	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
556	556	}
557	557
558		- if ($this->debug > 1) {
	558	+ if ($this->debug>1) {
559	559	if (function_exists('getallheaders')) {
560	560	$this->debugmsg(''); // empty line
561	561	foreach (getallheaders() as $name => $val) {
		@@ -580,13 +580,13 @@ discard block
		block discarded – undo
580	580	if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) {
581	581	if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) {
582	582	$data = $degzdata;
583		- if ($this->debug > 1) {
584		- $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	583	+ if ($this->debug>1) {
	584	+ $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
585	585	}
586	586	} elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
587	587	$data = $degzdata;
588		- if ($this->debug > 1) {
589		- $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++");
	588	+ if ($this->debug>1) {
	589	+ $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");
590	590	}
591	591	} else {
592	592	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'],
		@@ -673,7 +673,7 @@ discard block
		block discarded – undo
673	673	if ($reqEncoding == 'ISO-8859-1') {
674	674	$data = utf8_encode($data);
675	675	} else {
676		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding);
	676	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding);
677	677	}
678	678	}
679	679	}
		@@ -701,7 +701,7 @@ discard block
		block discarded – undo
701	701	preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches);
702	702	return new Response(
703	703	0,
704		- PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1],
	704	+ PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1],
705	705	$_xh['isf_reason']);
706	706	} elseif ($_xh['isf']) {
707	707	/// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs.
		@@ -709,7 +709,7 @@ discard block
		block discarded – undo
709	709	return new Response(
710	710	0,
711	711	PhpXmlRpc::$xmlrpcerr['invalid_request'],
712		- PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']);
	712	+ PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']);
713	713	} else {
714	714	// small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle
715	715	// this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals)
		@@ -719,20 +719,20 @@ discard block
		block discarded – undo
719	719	($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals')
720	720	)
721	721	) {
722		- if ($this->debug > 1) {
723		- $this->debugmsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++");
	722	+ if ($this->debug>1) {
	723	+ $this->debugmsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++");
724	724	}
725	725
726	726	return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']);
727	727	} else {
728	728	// build a Request object with data parsed from xml and add parameters in
729	729	$req = new Request($_xh['method']);
730		- for ($i = 0; $i < count($_xh['params']); $i++) {
	730	+ for ($i = 0; $i<count($_xh['params']); $i++) {
731	731	$req->addParam($_xh['params'][$i]);
732	732	}
733	733
734		- if ($this->debug > 1) {
735		- $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++");
	734	+ if ($this->debug>1) {
	735	+ $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++");
736	736	}
737	737
738	738	return $this->execute($req);
		@@ -784,7 +784,7 @@ discard block
		block discarded – undo
784	784	return new Response(
785	785	0,
786	786	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
787		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}"
	787	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}"
788	788	);
789	789	}
790	790	}
		@@ -799,7 +799,7 @@ discard block
		block discarded – undo
799	799	// build string representation of function 'name'
800	800	if (is_array($func)) {
801	801	if (is_object($func[0])) {
802		- $funcName = get_class($func[0]) . '->' . $func[1];
	802	+ $funcName = get_class($func[0]).'->'.$func[1];
803	803	} else {
804	804	$funcName = implode('::', $func);
805	805	}
		@@ -811,23 +811,23 @@ discard block
		block discarded – undo
811	811
812	812	// verify that function to be invoked is in fact callable
813	813	if (!is_callable($func)) {
814		- $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable");
	814	+ $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable");
815	815	return new Response(
816	816	0,
817	817	PhpXmlRpc::$xmlrpcerr['server_error'],
818		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method"
	818	+ PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method"
819	819	);
820	820	}
821	821
822	822	if (isset($dmap[$methodName]['exception_handling'])) {
823		- $exception_handling = (int)$dmap[$methodName]['exception_handling'];
	823	+ $exception_handling = (int) $dmap[$methodName]['exception_handling'];
824	824	} else {
825	825	$exception_handling = $this->exception_handling;
826	826	}
827	827
828	828	// If debug level is 3, we should catch all errors generated during processing of user function, and log them
829	829	// as part of response
830		- if ($this->debug > 2) {
	830	+ if ($this->debug>2) {
831	831	self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
832	832	}
833	833
		@@ -841,14 +841,14 @@ discard block
		block discarded – undo
841	841	$r = call_user_func($func, $req);
842	842	}
843	843	if (!is_a($r, 'PhpXmlRpc\Response')) {
844		- $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r));
	844	+ $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r));
845	845	if (is_a($r, 'PhpXmlRpc\Value')) {
846	846	$r = new Response($r);
847	847	} else {
848	848	$r = new Response(
849	849	0,
850	850	PhpXmlRpc::$xmlrpcerr['server_error'],
851		- PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object"
	851	+ PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object"
852	852	);
853	853	}
854	854	}
		@@ -863,7 +863,7 @@ discard block
		block discarded – undo
863	863	$r = call_user_func_array($func, array($methodName, $params, $this->user_data));
864	864	// mimic EPI behaviour: if we get an array that looks like an error, make it an error response
865	865	if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
866		- $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
	866	+ $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']);
867	867	} else {
868	868	// functions using EPI api should NOT return resp objects, so make sure we encode the
869	869	// return type correctly
		@@ -888,7 +888,7 @@ discard block
		block discarded – undo
888	888	// proper error-response
889	889	switch ($exception_handling) {
890	890	case 2:
891		- if ($this->debug > 2) {
	891	+ if ($this->debug>2) {
892	892	if (self::$_xmlrpcs_prev_ehandler) {
893	893	set_error_handler(self::$_xmlrpcs_prev_ehandler);
894	894	} else {
		@@ -911,7 +911,7 @@ discard block
		block discarded – undo
911	911	// proper error-response
912	912	switch ($exception_handling) {
913	913	case 2:
914		- if ($this->debug > 2) {
	914	+ if ($this->debug>2) {
915	915	if (self::$_xmlrpcs_prev_ehandler) {
916	916	set_error_handler(self::$_xmlrpcs_prev_ehandler);
917	917	} else {
		@@ -931,7 +931,7 @@ discard block
		block discarded – undo
931	931	}
932	932	}
933	933
934		- if ($this->debug > 2) {
	934	+ if ($this->debug>2) {
935	935	// note: restore the error handler we found before calling the user func, even if it has been changed
936	936	// inside the func itself
937	937	if (self::$_xmlrpcs_prev_ehandler) {
		@@ -997,7 +997,7 @@ discard block
		block discarded – undo
997	997	*/
998	998	protected function debugmsg($string)
999	999	{
1000		- $this->debug_info .= $string . "\n";
	1000	+ $this->debug_info .= $string."\n";
1001	1001	}
1002	1002
1003	1003	/**
		@@ -1007,9 +1007,9 @@ discard block
		block discarded – undo
1007	1007	protected function xml_header($charsetEncoding = '')
1008	1008	{
1009	1009	if ($charsetEncoding != '') {
1010		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
	1010	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
1011	1011	} else {
1012		- return "<?xml version=\"1.0\"?" . ">\n";
	1012	+ return "<?xml version=\"1.0\"?".">\n";
1013	1013	}
1014	1014	}
1015	1015
		@@ -1302,7 +1302,7 @@ discard block
		block discarded – undo
1302	1302	$i++; // for error message, we count params from 1
1303	1303	return static::_xmlrpcs_multicall_error(new Response(0,
1304	1304	PhpXmlRpc::$xmlrpcerr['incorrect_params'],
1305		- PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i));
	1305	+ PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i));
1306	1306	}
1307	1307	}
1308	1308
		@@ -1383,7 +1383,7 @@ discard block
		block discarded – undo
1383	1383	}
1384	1384	} else {
1385	1385	$numCalls = count($req);
1386		- for ($i = 0; $i < $numCalls; $i++) {
	1386	+ for ($i = 0; $i<$numCalls; $i++) {
1387	1387	$result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]);
1388	1388	}
1389	1389	}

		@@ -57,13 +57,13 @@ discard block
		block discarded – undo
57	57	'scalar' => $val,
58	58	'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
59	59	);
60		- return (object)$xmlrpcVal;
	60	+ return (object) $xmlrpcVal;
61	61	case 'base64':
62	62	$xmlrpcVal = array(
63	63	'xmlrpc_type' => 'base64',
64	64	'scalar' => $val
65	65	);
66		- return (object)$xmlrpcVal;
	66	+ return (object) $xmlrpcVal;
67	67	case 'string':
68	68	if (isset($options['extension_api_encoding'])) {
69	69	// if iconv is not available, we use mb_convert_encoding
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	case 'msg':
137	137	$paramCount = $xmlrpcVal->getNumParams();
138	138	$arr = array();
139		- for ($i = 0; $i < $paramCount; $i++) {
	139	+ for ($i = 0; $i<$paramCount; $i++) {
140	140	$arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
141	141	}
142	142	return $arr;
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	break;
262	262	case 'resource':
263	263	if (in_array('extension_api', $options)) {
264		- $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
	264	+ $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
265	265	} else {
266	266	$xmlrpcVal = new Value();
267	267	}
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	if ($valEncoding == 'ISO-8859-1') {
311	311	$xmlVal = utf8_encode($xmlVal);
312	312	} else {
313		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
	313	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
314	314	}
315	315	}
316	316	}
		@@ -333,10 +333,10 @@ discard block
		block discarded – undo
333	333	);
334	334	$_xh = $xmlRpcParser->_xh;
335	335
336		- if ($_xh['isf'] > 1) {
	336	+ if ($_xh['isf']>1) {
337	337	// test that $_xh['value'] is an obj, too???
338	338
339		- $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']);
	339	+ $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']);
340	340
341	341	return false;
342	342	}
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357
358	358	case 'methodcall':
359	359	$req = new Request($_xh['method']);
360		- for ($i = 0; $i < count($_xh['params']); $i++) {
	360	+ for ($i = 0; $i<count($_xh['params']); $i++) {
361	361	$req->addParam($_xh['params'][$i]);
362	362	}
363	363	return $req;

		@@ -57,9 +57,9 @@ discard block
		block discarded – undo
57	57	public function xml_header($charsetEncoding = '')
58	58	{
59	59	if ($charsetEncoding != '') {
60		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
	60	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
61	61	} else {
62		- return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
	62	+ return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
63	63	}
64	64	}
65	65
		@@ -82,16 +82,16 @@ discard block
		block discarded – undo
82	82	public function createPayload($charsetEncoding = '')
83	83	{
84	84	if ($charsetEncoding != '') {
85		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	85	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
86	86	} else {
87	87	$this->content_type = 'text/xml';
88	88	}
89	89	$this->payload = $this->xml_header($charsetEncoding);
90		- $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
91		- $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
	90	+ $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
	91	+ $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
92	92	$this->payload .= "<params>\n";
93	93	foreach ($this->params as $p) {
94		- $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
	94	+ $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
95	95	"</param>\n";
96	96	}
97	97	$this->payload .= "</params>\n";
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141
142	142	return true;
143	143	} else {
144		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
	144	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
145	145	return false;
146	146	}
147	147	}
		@@ -213,14 +213,14 @@ discard block
		block discarded – undo
213	213	*/
214	214	public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
215	215	{
216		- if ($this->debug > 0) {
	216	+ if ($this->debug>0) {
217	217	$this->getLogger()->debug("---GOT---\n$data\n---END---");
218	218	}
219	219
220	220	$this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
221	221
222	222	if ($data == '') {
223		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
	223	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
224	224	return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
225	225	}
226	226
		@@ -228,12 +228,12 @@ discard block
		block discarded – undo
228	228	if (substr($data, 0, 4) == 'HTTP') {
229	229	$httpParser = new Http();
230	230	try {
231		- $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
	231	+ $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
232	232	} catch (HttpException $e) {
233	233	// failed processing of HTTP response headers
234	234	// save into response obj the full payload received, for debugging
235	235	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
236		- } catch(\Exception $e) {
	236	+ } catch (\Exception $e) {
237	237	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
238	238	}
239	239	} else {
		@@ -249,7 +249,7 @@ discard block
		block discarded – undo
249	249	// idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
250	250	$pos = strrpos($data, '</methodResponse>');
251	251	if ($pos !== false) {
252		- $data = substr($data, 0, $pos + 17);
	252	+ $data = substr($data, 0, $pos+17);
253	253	}
254	254
255	255	// try to 'guestimate' the character encoding of the received response
		@@ -258,21 +258,21 @@ discard block
		block discarded – undo
258	258	$data
259	259	);
260	260
261		- if ($this->debug >= 0) {
	261	+ if ($this->debug>=0) {
262	262	$this->httpResponse = $httpResponse;
263	263	} else {
264	264	$httpResponse = null;
265	265	}
266	266
267		- if ($this->debug > 0) {
	267	+ if ($this->debug>0) {
268	268	$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
269	269	if ($start) {
270	270	$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
271	271	/// @todo what if there is no end tag?
272	272	$end = strpos($data, '-->', $start);
273		- $comments = substr($data, $start, $end - $start);
274		- $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t" .
275		- str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
	273	+ $comments = substr($data, $start, $end-$start);
	274	+ $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t".
	275	+ str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
276	276	}
277	277	}
278	278
		@@ -294,7 +294,7 @@ discard block
		block discarded – undo
294	294	if ($respEncoding == 'ISO-8859-1') {
295	295	$data = utf8_encode($data);
296	296	} else {
297		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
	297	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
298	298	}
299	299	}
300	300	}
		@@ -321,16 +321,16 @@ discard block
		block discarded – undo
321	321	// there could be proxies meddling with the request, or network data corruption...
322	322
323	323	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
324		- PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
	324	+ PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse);
325	325
326		- if ($this->debug > 0) {
	326	+ if ($this->debug>0) {
327	327	$this->getLogger()->debug($_xh['isf_reason']);
328	328	}
329	329	}
330	330	// second error check: xml well-formed but not xml-rpc compliant
331	331	elseif ($_xh['isf'] == 2) {
332	332	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
333		- PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
	333	+ PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse);
334	334
335	335	/// @todo echo something for the user? check if it was already done by the parser...
336	336	//if ($this->debug > 0) {
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	}
340	340	// third error check: parsing of the response has somehow gone boink.
341	341	/// @todo shall we omit this check, since we trust the parsing code?
342		- elseif ($_xh['isf'] > 3 \|\| $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
	342	+ elseif ($_xh['isf']>3 \|\| $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
343	343	// something odd has happened and it's time to generate a client side error indicating something odd went on
344	344	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
345	345	'', $httpResponse
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347
348	348	/// @todo echo something for the user?
349	349	} else {
350		- if ($this->debug > 1) {
	350	+ if ($this->debug>1) {
351	351	$this->getLogger()->debug(
352	352	"---PARSED---\n".var_export($_xh['value'], true)."\n---END---"
353	353	);
		@@ -371,7 +371,7 @@ discard block
		block discarded – undo
371	371	if ($errNo == 0) {
372	372	// FAULT returned, errno needs to reflect that
373	373	/// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
374		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
	374	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
375	375	$errNo = -1;
376	376	}
377	377

gggeek / phpxmlrpc

Push — master ( 182ddb...cf05b0 )

Status

Category

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

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

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

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

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

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

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

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

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

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