Inspection of "fix more php 8.5 deprecations" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 14a6e4...80f46d )

by Gaetano

created 2025-10-02 15:36 UTC

Status

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/Traits/DeprecationLogger.php 1 patch

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

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
             return;
         }
 
-        $this->getLogger()->warning('XML-RPC Deprecated: ' . $message);
+        $this->getLogger()->warning('XML-RPC Deprecated: '.$message);
     }
 
     /**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
             return;
         }
 
-        $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] .
-            ' is only supposed to be called by ' . $expectedCaller);
+        $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function'].
+            ' is only supposed to be called by '.$expectedCaller);
     }
 }

Please login to merge, or discard this patch.

src/Response.php 1 patch

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

@@ -78,7 +78,7 @@  discard block
 block discarded – undo
                 // user declares the type of resp value: we "almost" trust it... but log errors just in case
                 if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) ||
                     ($this->valtyp == 'xml' && (!is_string($this->val)))) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType);
                 }
             }
         }
@@ -165,34 +165,34 @@  discard block
 block discarded – undo
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
 
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding).
                 "</string></value>\n</member>\n</struct>\n</value>\n</fault>";
         } else {
             if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) {
-                $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>";
+                $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>";
             } else if (is_string($this->val) && $this->valtyp == 'xml') {
-                $result .= "<params>\n<param>\n" .
-                    $this->val .
+                $result .= "<params>\n<param>\n".
+                    $this->val.
                     "</param>\n</params>";
             } else if ($this->valtyp == 'phpvals') {
                     $encoder = new Encoder();
                     $val = $encoder->encode($this->val);
-                    $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>";
+                    $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>";
             } else {
                 throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values');
             }
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
     public 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";
         }
     }
 
@@ -229,21 +229,21 @@  discard block
 block discarded – undo
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->$name;
             case 'hdrs':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['headers'];
             case '_cookies':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['cookies'];
             case 'raw_data':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['raw_data'];
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -258,25 +258,25 @@  discard block
 block discarded – undo
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             case 'hdrs':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['headers'] = $value;
                 break;
             case '_cookies':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['cookies'] = $value;
                 break;
             case 'raw_data':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['raw_data'] = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -289,16 +289,16 @@  discard block
 block discarded – undo
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->$name);
             case 'hdrs':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['headers']);
             case '_cookies':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['cookies']);
             case 'raw_data':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['raw_data']);
             default:
                 return false;
@@ -314,25 +314,25 @@  discard block
 block discarded – undo
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             case 'hdrs':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['headers']);
                 break;
             case '_cookies':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['cookies']);
                 break;
             case 'raw_data':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['raw_data']);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

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);
                     }
                 }
             }
@@ -336,10 +336,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;
         }
@@ -360,7 +360,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.

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

Please login to merge, or discard this patch.

demo/client/getstatename.php 1 patch

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

Please login to merge, or discard this patch.

demo/server/proxy.php 1 patch

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

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

Please login to merge, or discard this patch.

demo/server/methodProviders/functions.php 1 patch

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

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

Please login to merge, or discard this patch.

demo/server/methodProviders/validator1.php 1 patch

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcInt, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $numCurly = 0;
@@ -38,13 +38,13 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $moe = $sno["moe"];
             $larry = $sno["larry"];
             $curly = $sno["curly"];
-            $num = $moe->scalarVal() + $larry->scalarVal() + $curly->scalarVal();
+            $num = $moe->scalarVal()+$larry->scalarVal()+$curly->scalarVal();
 
             return new Response(new Value($num, Value::$xmlrpcInt));
         }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcStruct, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
             )
         ),
         "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             return new Response(new Value(
                 array(
@@ -92,14 +92,14 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcString, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $ar = $req->getParam(0);
             $sz = $ar->count();
             $first = $ar[0];
-            $last = $ar[$sz - 1];
+            $last = $ar[$sz-1];
 
-            return new Response(new Value($first->scalarVal() . $last->scalarVal(), Value::$xmlrpcString));
+            return new Response(new Value($first->scalarVal().$last->scalarVal(), Value::$xmlrpcString));
         }
     ),
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcStruct, Value::$xmlrpcInt)
         ),
         "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $v = $sno->scalarVal();
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
             $larry = $fools["larry"];
             $moe = $fools["moe"];
 
-            return new Response(new Value($curly->scalarVal() + $larry->scalarVal() + $moe->scalarVal(), Value::$xmlrpcInt));
+            return new Response(new Value($curly->scalarVal()+$larry->scalarVal()+$moe->scalarVal(), Value::$xmlrpcInt));
         }
     ),
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
             array(Value::$xmlrpcStruct, Value::$xmlrpcString)
         ),
         "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $str = $sno->scalarVal();
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
             $ap = 0;
             $qu = 0;
             $amp = 0;
-            for ($i = 0; $i < strlen($str); $i++) {
+            for ($i = 0; $i<strlen($str); $i++) {
                 $c = substr($str, $i, 1);
                 switch ($c) {
                     case ">":

Please login to merge, or discard this patch.

		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	// user declares the type of resp value: we "almost" trust it... but log errors just in case
79	79	if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) \|\|
80	80	($this->valtyp == 'xml' && (!is_string($this->val)))) {
81		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType);
	81	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType);
82	82	}
83	83	}
84	84	}
		@@ -165,34 +165,34 @@ discard block
		block discarded – undo
165	165	public function serialize($charsetEncoding = '')
166	166	{
167	167	if ($charsetEncoding != '') {
168		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	168	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
169	169	} else {
170	170	$this->content_type = 'text/xml';
171	171	}
172	172
173	173	if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
174		- $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
	174	+ $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
175	175	} else {
176	176	$result = "<methodResponse>\n";
177	177	}
178	178	if ($this->errno) {
179	179	// Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
180		- $result .= "<fault>\n" .
181		- "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
182		- "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
183		- $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) .
	180	+ $result .= "<fault>\n".
	181	+ "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
	182	+ "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
	183	+ $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding).
184	184	"</string></value>\n</member>\n</struct>\n</value>\n</fault>";
185	185	} else {
186	186	if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) {
187		- $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>";
	187	+ $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>";
188	188	} else if (is_string($this->val) && $this->valtyp == 'xml') {
189		- $result .= "<params>\n<param>\n" .
190		- $this->val .
	189	+ $result .= "<params>\n<param>\n".
	190	+ $this->val.
191	191	"</param>\n</params>";
192	192	} else if ($this->valtyp == 'phpvals') {
193	193	$encoder = new Encoder();
194	194	$val = $encoder->encode($this->val);
195		- $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>";
	195	+ $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>";
196	196	} else {
197	197	throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values');
198	198	}
		@@ -211,9 +211,9 @@ discard block
		block discarded – undo
211	211	public function xml_header($charsetEncoding = '')
212	212	{
213	213	if ($charsetEncoding != '') {
214		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
	214	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
215	215	} else {
216		- return "<?xml version=\"1.0\"?" . ">\n";
	216	+ return "<?xml version=\"1.0\"?".">\n";
217	217	}
218	218	}
219	219
		@@ -229,21 +229,21 @@ discard block
		block discarded – undo
229	229	case 'errstr':
230	230	case 'payload':
231	231	case 'content_type':
232		- $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
	232	+ $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
233	233	return $this->$name;
234	234	case 'hdrs':
235		- $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
	235	+ $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
236	236	return $this->httpResponse['headers'];
237	237	case '_cookies':
238		- $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
	238	+ $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
239	239	return $this->httpResponse['cookies'];
240	240	case 'raw_data':
241		- $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
	241	+ $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
242	242	return $this->httpResponse['raw_data'];
243	243	default:
244	244	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
245	245	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
246		- trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	246	+ trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
247	247	$result = null;
248	248	return $result;
249	249	}
		@@ -258,25 +258,25 @@ discard block
		block discarded – undo
258	258	case 'errstr':
259	259	case 'payload':
260	260	case 'content_type':
261		- $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
	261	+ $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
262	262	$this->$name = $value;
263	263	break;
264	264	case 'hdrs':
265		- $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
	265	+ $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
266	266	$this->httpResponse['headers'] = $value;
267	267	break;
268	268	case '_cookies':
269		- $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
	269	+ $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
270	270	$this->httpResponse['cookies'] = $value;
271	271	break;
272	272	case 'raw_data':
273		- $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
	273	+ $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
274	274	$this->httpResponse['raw_data'] = $value;
275	275	break;
276	276	default:
277	277	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
278	278	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
279		- trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	279	+ trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
280	280	}
281	281	}
282	282
		@@ -289,16 +289,16 @@ discard block
		block discarded – undo
289	289	case 'errstr':
290	290	case 'payload':
291	291	case 'content_type':
292		- $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
	292	+ $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
293	293	return isset($this->$name);
294	294	case 'hdrs':
295		- $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
	295	+ $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
296	296	return isset($this->httpResponse['headers']);
297	297	case '_cookies':
298		- $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
	298	+ $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
299	299	return isset($this->httpResponse['cookies']);
300	300	case 'raw_data':
301		- $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
	301	+ $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
302	302	return isset($this->httpResponse['raw_data']);
303	303	default:
304	304	return false;
		@@ -314,25 +314,25 @@ discard block
		block discarded – undo
314	314	case 'errstr':
315	315	case 'payload':
316	316	case 'content_type':
317		- $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
	317	+ $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
318	318	unset($this->$name);
319	319	break;
320	320	case 'hdrs':
321		- $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
	321	+ $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
322	322	unset($this->httpResponse['headers']);
323	323	break;
324	324	case '_cookies':
325		- $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
	325	+ $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
326	326	unset($this->httpResponse['cookies']);
327	327	break;
328	328	case 'raw_data':
329		- $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
	329	+ $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
330	330	unset($this->httpResponse['raw_data']);
331	331	break;
332	332	default:
333	333	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
334	334	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
335		- trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	335	+ trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
336	336	}
337	337	}
338	338	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>phpxmlrpc - Introspect demo</title></head>
		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	function display_error($r)
18	18	{
19	19	output("An error occurred: ");
20		- output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>");
	20	+ output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>");
21	21	}
22	22
23	23	$client = new Client(XMLRPCSERVER);
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	$client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP);
26	26
27	27	// First off, let's retrieve the list of methods available on the remote server
28		-output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n");
	28	+output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n");
29	29	$req = new Request('system.listMethods');
30	30	$resp = $client->send($req);
31	31
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47
48	48	// Then, retrieve the signature and help text of each available method
49	49	foreach ($v as $methodName) {
50		- output("<h4>" . htmlspecialchars($methodName) . "</h4>\n");
	50	+ output("<h4>".htmlspecialchars($methodName)."</h4>\n");
51	51	// build requests first, add params later
52	52	$r1 = new PhpXmlRpc\Request('system.methodHelp');
53	53	$r2 = new PhpXmlRpc\Request('system.methodSignature');
		@@ -83,12 +83,12 @@ discard block
		block discarded – undo
83	83	continue;
84	84	}
85	85	$ret = $sig[0];
86		- output("<code>" . htmlspecialchars($ret) . " "
87		- . htmlspecialchars($methodName) . "(");
88		- if (count($sig) > 1) {
89		- for ($k = 1; $k < count($sig); $k++) {
	86	+ output("<code>".htmlspecialchars($ret)." "
	87	+ . htmlspecialchars($methodName)."(");
	88	+ if (count($sig)>1) {
	89	+ for ($k = 1; $k<count($sig); $k++) {
90	90	output(htmlspecialchars($sig[$k]));
91		- if ($k < count($sig) - 1) {
	91	+ if ($k<count($sig)-1) {
92	92	output(", ");
93	93	}
94	94	}

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	return;
15	15	}
16	16
17		- $this->getLogger()->warning('XML-RPC Deprecated: ' . $message);
	17	+ $this->getLogger()->warning('XML-RPC Deprecated: '.$message);
18	18	}
19	19
20	20	/**
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	return;
35	35	}
36	36
37		- $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] .
38		- ' is only supposed to be called by ' . $expectedCaller);
	37	+ $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function'].
	38	+ ' is only supposed to be called by '.$expectedCaller);
39	39	}
40	40	}

		@@ -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	}
		@@ -336,10 +336,10 @@ discard block
		block discarded – undo
336	336	$_xh = $xmlRpcParser->_xh;
337	337	}
338	338
339		- if ($_xh['isf'] > 1) {
	339	+ if ($_xh['isf']>1) {
340	340	// test that $_xh['value'] is an obj, too???
341	341
342		- $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']);
	342	+ $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']);
343	343
344	344	return false;
345	345	}
		@@ -360,7 +360,7 @@ discard block
		block discarded – undo
360	360
361	361	case 'methodcall':
362	362	$req = new Request($_xh['method']);
363		- for ($i = 0; $i < count($_xh['params']); $i++) {
	363	+ for ($i = 0; $i<count($_xh['params']); $i++) {
364	364	$req->addParam($_xh['params'][$i]);
365	365	}
366	366	return $req;

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

		@@ -54,11 +54,11 @@ discard block
		block discarded – undo
54	54	$snv = $sno->scalarVal();
55	55
56	56	// look it up in our array (zero-based)
57		- if (isset(self::$stateNames[$snv - 1])) {
58		- $stateName = self::$stateNames[$snv - 1];
	57	+ if (isset(self::$stateNames[$snv-1])) {
	58	+ $stateName = self::$stateNames[$snv-1];
59	59	} else {
60	60	// not there, so complain
61		- $err = "I don't have a state for the index '" . $snv . "'";
	61	+ $err = "I don't have a state for the index '".$snv."'";
62	62	}
63	63
64	64	if ($err != '') {
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	$s = $req->getParam(0);
133	133	$t = $req->getParam(1);
134	134
135		- return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcInt));
	135	+ return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcInt));
136	136	}
137	137
138	138	public static $addtwodouble_sig = array(array('double', 'double', 'double'));
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	$s = $req->getParam(0);
143	143	$t = $req->getParam(1);
144	144
145		- return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcDouble));
	145	+ return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcDouble));
146	146	}
147	147
148	148	public static $stringecho_sig = array(array('string', 'string'));
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	/// In fact, we miss some API (or extra data) in the Request...
166	166	//$payload = file_get_contents('php://input');
167	167	$payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding);
168		- $s = "I got the following message:\n" . $payload;
	168	+ $s = "I got the following message:\n".$payload;
169	169
170	170	return new Response(new Value($s));
171	171	}
		@@ -238,17 +238,17 @@ discard block
		block discarded – undo
238	238
239	239	/// @todo in real life, we should check for presence of return characters to avoid header injection!
240	240
241		- $msgHdr = "From: " . $mFrom->scalarVal() . "\n";
242		- $msgHdr .= "To: " . $mTo->scalarVal() . "\n";
	241	+ $msgHdr = "From: ".$mFrom->scalarVal()."\n";
	242	+ $msgHdr .= "To: ".$mTo->scalarVal()."\n";
243	243
244	244	if ($mCc->scalarVal() != "") {
245		- $msgHdr .= "Cc: " . $mCc->scalarVal() . "\n";
	245	+ $msgHdr .= "Cc: ".$mCc->scalarVal()."\n";
246	246	}
247	247	if ($mBcc->scalarVal() != "") {
248		- $msgHdr .= "Bcc: " . $mBcc->scalarVal() . "\n";
	248	+ $msgHdr .= "Bcc: ".$mBcc->scalarVal()."\n";
249	249	}
250	250	if ($mMime->scalarVal() != "") {
251		- $msgHdr .= "Content-type: " . $mMime->scalarVal() . "\n";
	251	+ $msgHdr .= "Content-type: ".$mMime->scalarVal()."\n";
252	252	}
253	253	$msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
254	254

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	array(Value::$xmlrpcInt, Value::$xmlrpcArray)
18	18	),
19	19	"docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.',
20		- "function" => function ($req)
	20	+ "function" => function($req)
21	21	{
22	22	$sno = $req->getParam(0);
23	23	$numCurly = 0;
		@@ -38,13 +38,13 @@ discard block
		block discarded – undo
38	38	array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
39	39	),
40	40	"docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.',
41		- "function" => function ($req)
	41	+ "function" => function($req)
42	42	{
43	43	$sno = $req->getParam(0);
44	44	$moe = $sno["moe"];
45	45	$larry = $sno["larry"];
46	46	$curly = $sno["curly"];
47		- $num = $moe->scalarVal() + $larry->scalarVal() + $curly->scalarVal();
	47	+ $num = $moe->scalarVal()+$larry->scalarVal()+$curly->scalarVal();
48	48
49	49	return new Response(new Value($num, Value::$xmlrpcInt));
50	50	}
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	array(Value::$xmlrpcStruct, Value::$xmlrpcStruct)
56	56	),
57	57	"docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.',
58		- "function" => function ($req)
	58	+ "function" => function($req)
59	59	{
60	60	$sno = $req->getParam(0);
61	61
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	)
72	72	),
73	73	"docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.',
74		- "function" => function ($req)
	74	+ "function" => function($req)
75	75	{
76	76	return new Response(new Value(
77	77	array(
		@@ -92,14 +92,14 @@ discard block
		block discarded – undo
92	92	array(Value::$xmlrpcString, Value::$xmlrpcArray)
93	93	),
94	94	"docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.',
95		- "function" => function ($req)
	95	+ "function" => function($req)
96	96	{
97	97	$ar = $req->getParam(0);
98	98	$sz = $ar->count();
99	99	$first = $ar[0];
100		- $last = $ar[$sz - 1];
	100	+ $last = $ar[$sz-1];
101	101
102		- return new Response(new Value($first->scalarVal() . $last->scalarVal(), Value::$xmlrpcString));
	102	+ return new Response(new Value($first->scalarVal().$last->scalarVal(), Value::$xmlrpcString));
103	103	}
104	104	),
105	105
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	array(Value::$xmlrpcStruct, Value::$xmlrpcInt)
109	109	),
110	110	"docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.',
111		- "function" => function ($req)
	111	+ "function" => function($req)
112	112	{
113	113	$sno = $req->getParam(0);
114	114	$v = $sno->scalarVal();
		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
130	130	),
131	131	"docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.',
132		- "function" => function ($req)
	132	+ "function" => function($req)
133	133	{
134	134	$sno = $req->getParam(0);
135	135
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140	$larry = $fools["larry"];
141	141	$moe = $fools["moe"];
142	142
143		- return new Response(new Value($curly->scalarVal() + $larry->scalarVal() + $moe->scalarVal(), Value::$xmlrpcInt));
	143	+ return new Response(new Value($curly->scalarVal()+$larry->scalarVal()+$moe->scalarVal(), Value::$xmlrpcInt));
144	144	}
145	145	),
146	146
		@@ -149,7 +149,7 @@ discard block
		block discarded – undo
149	149	array(Value::$xmlrpcStruct, Value::$xmlrpcString)
150	150	),
151	151	"docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely <, >, & \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.',
152		- "function" => function ($req)
	152	+ "function" => function($req)
153	153	{
154	154	$sno = $req->getParam(0);
155	155	$str = $sno->scalarVal();
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	$ap = 0;
159	159	$qu = 0;
160	160	$amp = 0;
161		- for ($i = 0; $i < strlen($str); $i++) {
	161	+ for ($i = 0; $i<strlen($str); $i++) {
162	162	$c = substr($str, $i, 1);
163	163	switch ($c) {
164	164	case ">":

gggeek / phpxmlrpc

Push — master ( 14a6e4...80f46d )

Status

Category

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

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

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

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

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

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

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

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

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