Inspection of "debugger nitpicks, hardening" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 7e529d...7a7428 )

by Gaetano

created 2023-01-20 10:27 UTC

Status

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory.
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
         $this->args = argParser::getArgs();
 
         // assumes HTTPURI to be in the form /tests/index.php?etc...
-        $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']);
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
+        $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']);
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testVardemo()

Please login to merge, or discard this patch.

tests/8DebuggerTest.php 1 patch

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for the bundled debugger.
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
         $this->args = argParser::getArgs();
 
         // assumes HTTPURI to be in the form /tests/index.php?etc...
-        $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']);
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
+        $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']);
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testIndex()

Please login to merge, or discard this patch.

demo/vardemo.php 1 patch

Spacing +24 added lines, -24 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,23 +10,23 @@  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: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("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(
@@ -39,7 +39,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(
@@ -59,10 +59,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
 {
@@ -74,49 +74,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/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/proxy.php 1 patch

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

@@ -15,7 +15,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 !!!
@@ -46,7 +46,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));
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -99,7 +99,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);
@@ -107,7 +107,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/discuss.php 1 patch

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

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server();

Please login to merge, or discard this patch.

demo/client/windowscharset.php 1 patch

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,

Please login to merge, or discard this patch.

src/Value.php 1 patch

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

@@ -129,7 +129,7 @@  discard block
 block discarded – undo
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -170,10 +170,10 @@  discard block
 block discarded – undo
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -286,19 +286,19 @@  discard block
 block discarded – undo
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
+                        $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
+                        $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
+                        $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs .= "<{$typ}>" . (int)$val . "</{$typ}>";
+                        $rs .= "<{$typ}>".(int) $val."</{$typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -306,16 +306,16 @@  discard block
 block discarded – undo
                         // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs .= "<{$typ}>{$val}</{$typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
+                            $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
                         } elseif (is_int($val)) {
-                            $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
+                            $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs .= "<{$typ}>{$val}</{$typ}>";
@@ -337,14 +337,14 @@  discard block
 block discarded – undo
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs .= '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs .= "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**

Please login to merge, or discard this patch.

src/Encoder.php 1 patch

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

@@ -90,13 +90,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
@@ -165,7 +165,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;
@@ -291,7 +291,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();
                 }
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
                     if ($valEncoding == 'ISO-8859-1') {
                         $xmlVal = utf8_encode($xmlVal);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
                     }
                 }
             }
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
             $parserOptions
         );
 
-        if ($xmlRpcParser->_xh['isf'] > 1) {
+        if ($xmlRpcParser->_xh['isf']>1) {
             // test that $xmlrpc->_xh['value'] is an obj, too???
 
             $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
 
             case 'methodcall':
                 $req = new Request($xmlRpcParser->_xh['method']);
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
                 return $req;

Please login to merge, or discard this patch.

		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	$this->me['struct'] = $val;
130	130	break;
131	131	default:
132		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
	132	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
133	133	}
134	134	}
135	135	}
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	}
154	154
155	155	if ($typeOf !== 1) {
156		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
	156	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
157	157	return 0;
158	158	}
159	159
		@@ -170,10 +170,10 @@ discard block
		block discarded – undo
170	170
171	171	switch ($this->mytype) {
172	172	case 1:
173		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
	173	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
174	174	return 0;
175	175	case 3:
176		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
	176	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
177	177	return 0;
178	178	case 2:
179	179	// we're adding a scalar value to an array here
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214
215	215	return 1;
216	216	} else {
217		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	217	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
218	218	return 0;
219	219	}
220	220	}
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244
245	245	return 1;
246	246	} else {
247		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	247	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
248	248	return 0;
249	249	}
250	250	}
		@@ -286,19 +286,19 @@ discard block
		block discarded – undo
286	286	case 1:
287	287	switch ($typ) {
288	288	case static::$xmlrpcBase64:
289		- $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
	289	+ $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>";
290	290	break;
291	291	case static::$xmlrpcBoolean:
292		- $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
	292	+ $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
293	293	break;
294	294	case static::$xmlrpcString:
295	295	// Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
296		- $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
	296	+ $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
297	297	break;
298	298	case static::$xmlrpcInt:
299	299	case static::$xmlrpcI4:
300	300	case static::$xmlrpcI8:
301		- $rs .= "<{$typ}>" . (int)$val . "</{$typ}>";
	301	+ $rs .= "<{$typ}>".(int) $val."</{$typ}>";
302	302	break;
303	303	case static::$xmlrpcDouble:
304	304	// avoid using standard conversion of float to string because it is locale-dependent,
		@@ -306,16 +306,16 @@ discard block
		block discarded – undo
306	306	// sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
307	307	// The code below tries its best at keeping max precision while avoiding exp notation,
308	308	// but there is of course no limit in the number of decimal places to be used...
309		- $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
	309	+ $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
310	310	break;
311	311	case static::$xmlrpcDateTime:
312	312	if (is_string($val)) {
313	313	$rs .= "<{$typ}>{$val}</{$typ}>";
314	314	// DateTimeInterface is not present in php 5.4...
315	315	} elseif (is_a($val, 'DateTimeInterface') \|\| is_a($val, 'DateTime')) {
316		- $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
	316	+ $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
317	317	} elseif (is_int($val)) {
318		- $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
	318	+ $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
319	319	} else {
320	320	// not really a good idea here: but what should we output anyway? left for backward compat...
321	321	$rs .= "<{$typ}>{$val}</{$typ}>";
		@@ -337,14 +337,14 @@ discard block
		block discarded – undo
337	337	case 3:
338	338	// struct
339	339	if ($this->_php_class) {
340		- $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
	340	+ $rs .= '<struct php_class="'.$this->_php_class."\">\n";
341	341	} else {
342	342	$rs .= "<struct>\n";
343	343	}
344	344	$charsetEncoder = $this->getCharsetEncoder();
345	345	/** @var Value $val2 */
346	346	foreach ($val as $key2 => $val2) {
347		- $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
	347	+ $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
348	348	//$rs.=$this->serializeval($val2);
349	349	$rs .= $val2->serialize($charsetEncoding);
350	350	$rs .= "</member>\n";
		@@ -379,7 +379,7 @@ discard block
		block discarded – undo
379	379	$val = reset($this->me);
380	380	$typ = key($this->me);
381	381
382		- return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
	382	+ return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
383	383	}
384	384
385	385	/**

		@@ -90,13 +90,13 @@ discard block
		block discarded – undo
90	90	'scalar' => $val,
91	91	'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
92	92	);
93		- return (object)$xmlrpcVal;
	93	+ return (object) $xmlrpcVal;
94	94	case 'base64':
95	95	$xmlrpcVal = array(
96	96	'xmlrpc_type' => 'base64',
97	97	'scalar' => $val
98	98	);
99		- return (object)$xmlrpcVal;
	99	+ return (object) $xmlrpcVal;
100	100	case 'string':
101	101	if (isset($options['extension_api_encoding'])) {
102	102	// if iconv is not available, we use mb_convert_encoding
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	case 'msg':
166	166	$paramCount = $xmlrpcVal->getNumParams();
167	167	$arr = array();
168		- for ($i = 0; $i < $paramCount; $i++) {
	168	+ for ($i = 0; $i<$paramCount; $i++) {
169	169	$arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
170	170	}
171	171	return $arr;
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	break;
292	292	case 'resource':
293	293	if (in_array('extension_api', $options)) {
294		- $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
	294	+ $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
295	295	} else {
296	296	$xmlrpcVal = new Value();
297	297	}
		@@ -340,7 +340,7 @@ discard block
		block discarded – undo
340	340	if ($valEncoding == 'ISO-8859-1') {
341	341	$xmlVal = utf8_encode($xmlVal);
342	342	} else {
343		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
	343	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
344	344	}
345	345	}
346	346	}
		@@ -362,7 +362,7 @@ discard block
		block discarded – undo
362	362	$parserOptions
363	363	);
364	364
365		- if ($xmlRpcParser->_xh['isf'] > 1) {
	365	+ if ($xmlRpcParser->_xh['isf']>1) {
366	366	// test that $xmlrpc->_xh['value'] is an obj, too???
367	367
368	368	$this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
		@@ -386,7 +386,7 @@ discard block
		block discarded – undo
386	386
387	387	case 'methodcall':
388	388	$req = new Request($xmlRpcParser->_xh['method']);
389		- for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
	389	+ for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
390	390	$req->addParam($xmlRpcParser->_xh['params'][$i]);
391	391	}
392	392	return $req;

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/WebTestCase.php';
	3	+include_once __DIR__.'/WebTestCase.php';
4	4
5	5	/**
6	6	* Tests for php files in the 'demo' directory.
		@@ -12,8 +12,8 @@ discard block
		block discarded – undo
12	12	$this->args = argParser::getArgs();
13	13
14	14	// assumes HTTPURI to be in the form /tests/index.php?etc...
15		- $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('\|\?.+\|', '', $this->args['HTTPURI']);
16		- $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('\|/tests/index\.php(\?.*)?\|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
	15	+ $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('\|\?.+\|', '', $this->args['HTTPURI']);
	16	+ $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('\|/tests/index\.php(\?.*)?\|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
17	17	}
18	18
19	19	public function testVardemo()

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/client/_prepend.php";
	2	+require_once __DIR__."/client/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>phpxmlrpc</title></head>
		@@ -10,23 +10,23 @@ discard block
		block discarded – undo
10	10	output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n");
11	11
12	12	$v = new PhpXmlRpc\Value(1234, 'int');
13		-output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	13	+output("Int: <PRE>".htmlentities($v->serialize())."</PRE>");
14	14
15	15	$v = new PhpXmlRpc\Value('Are the following characters escaped? < & >');
16		-output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	16	+output("String <PRE>".htmlentities($v->serialize())."</PRE>");
17	17
18	18	$v = new PhpXmlRpc\Value(true, 'boolean');
19		-output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	19	+output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>");
20	20
21	21	$v = new PhpXmlRpc\Value(1234.5678, 'double');
22		-output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	22	+output("Double: <PRE>".htmlentities($v->serialize())."</PRE>");
23	23
24	24	$v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601');
25		-output("Datetime: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	25	+output("Datetime: <PRE>".htmlentities($v->serialize())."</PRE>");
26	26
27	27	$v = new PhpXmlRpc\Value('hello world', 'base64');
28		-output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
29		-output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>");
	28	+output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>");
	29	+output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>");
30	30
31	31	$v = new PhpXmlRpc\Value(
32	32	array(
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	),
40	40	"array"
41	41	);
42		-output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	42	+output("Array: <PRE>".htmlentities($v->serialize())."</PRE>");
43	43
44	44	$v = new PhpXmlRpc\Value(
45	45	array(
		@@ -59,10 +59,10 @@ discard block
		block discarded – undo
59	59	),
60	60	"struct"
61	61	);
62		-output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	62	+output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>");
63	63
64	64	$w = new PhpXmlRpc\Value(array($v), 'array');
65		-output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
	65	+output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>");
66	66
67	67	class MyClass
68	68	{
		@@ -74,49 +74,49 @@ discard block
		block discarded – undo
74	74	// the public property is the only one which will be serialized. As such, it has to be of type Value
75	75	$myObject->public = new \PhpXmlRpc\Value('a public property, wrapped');
76	76	$w = new PhpXmlRpc\Value($myObject, 'struct');
77		-output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
	77	+output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>");
78	78
79	79	output("<h3>Testing value serialization - xml-rpc extensions</h3>\n");
80	80	$v = new PhpXmlRpc\Value(1234, 'i8');
81		-output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	81	+output("I8: <PRE>".htmlentities($v->serialize())."</PRE>");
82	82	$v = new PhpXmlRpc\Value(null, 'null');
83		-output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	83	+output("Null: <PRE>".htmlentities($v->serialize())."</PRE>");
84	84	\PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true;
85		-output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	85	+output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>");
86	86
87	87	output("<h3>Testing value serialization - character encoding</h3>\n");
88	88	// The greek word 'kosme'
89	89	$v = new PhpXmlRpc\Value('κόσμε');
90		-output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
91		-output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>");
	90	+output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>");
	91	+output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>");
92	92	if (function_exists('mb_convert_encoding')) {
93		- output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>");
	93	+ output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>");
94	94	}
95	95
96	96	output("<h3>Testing request serialization</h3>\n");
97	97	$req = new PhpXmlRpc\Request('examples.getStateName');
98	98	$req->method('examples.getStateName');
99	99	$req->addParam(new PhpXmlRpc\Value(42, 'int'));
100		-output("<PRE>" . htmlentities($req->serialize()) . "</PRE>");
	100	+output("<PRE>".htmlentities($req->serialize())."</PRE>");
101	101
102	102	output("<h3>Testing response serialization</h3>\n");
103	103	$resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life'));
104		-output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>");
	104	+output("<PRE>".htmlentities($resp->serialize())."</PRE>");
105	105
106	106	output("<h3>Testing ISO date formatting</h3><pre>\n");
107	107	$t = time();
108	108	$date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
109	109	output("Now is $t --> $date\n");
110		-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
	110	+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
111	111	$tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
112	112	output("That is to say $date --> $tb\n");
113		-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
114		-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
	113	+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
	114	+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
115	115	output("</pre>\n");
116	116
117	117	output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n");
118	118	$v = new PhpXmlRpc\Value(1234.56789, 'double');
119	119	\PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2;
120		-output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	120	+output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>");
121	121
122	122	output('</body></html>');

		@@ -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

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

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	* `$functions_parameters_type` and `$exception_handling`
9	9	*/
10	10
11		-require_once __DIR__ . "/_prepend.php";
	11	+require_once __DIR__."/_prepend.php";
12	12
13	13	require_once __DIR__.'/methodProviders/CommentManager.php';
14	14
		@@ -19,12 +19,12 @@ discard block
		block discarded – undo
19	19
20	20	$addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
21	21
22		-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
	22	+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
23	23	'and the third is the comment itself. Returns the number of comments against that ID.';
24	24
25	25	$getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
26	26
27		-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
	27	+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
28	28	'containing name and comment text.';
29	29
30	30	$srv = new Server();

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	/**
5	5	* Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,

gggeek / phpxmlrpc

Push — master ( 7e529d...7a7428 )

Status

Category

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

Spacing +3 added lines, -3 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 +5 added lines, -5 removed lines patch added patch discarded remove patch

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

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

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

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