Inspection of "Fix one PHP 8 undefined array key "error"" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#98)

unknown

created 2022-02-15 17:37 UTC

Status

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

@@ -1,4 +1,4 @@  discard block
 block discarded – undo
-<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en">
+<?php require_once __DIR__."/_prepend.php"; ?><html lang="en">
 <head><title>xmlrpc - Mail demo</title></head>
 <body>
 <h1>Mail demo</h1>
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
         print "<font color=\"red\">";
         print "Mail send failed<br/>\n";
         print "Fault: ";
-        print "Code: " . htmlspecialchars($resp->faultCode()) .
-            " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>";
+        print "Code: ".htmlspecialchars($resp->faultCode()).
+            " Reason: '".htmlspecialchars($resp->faultString())."'<br/>";
         print "</font><br/>";
     }
 }
@@ -53,4 +53,4 @@  discard block
 block discarded – undo
     <input type="Submit" value="Send"/>
 </form>
 </body>
-</html><?php require_once __DIR__ . "/_append.php"; ?>
+</html><?php require_once __DIR__."/_append.php"; ?>

Please login to merge, or discard this patch.

lib/xmlrpcs.inc 1 patch

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

@@ -54,7 +54,7 @@  discard block
 block discarded – undo
      */
     public function echoInput()
     {
-        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
+        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
         print $r->serialize();
     }
 
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
      */
     public function __get($name)
     {
-        switch($name) {
+        switch ($name) {
             case 'dmap':
                 return $this->dmap;
             default:
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' .
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.
                     $trace[0]['line'], E_USER_NOTICE);
                 return null;
         }
@@ -96,30 +96,30 @@  discard block
 block discarded – undo
     Server::xmlrpc_debugmsg($m);
 }
 
-function _xmlrpcs_getCapabilities($server, $m=null)
+function _xmlrpcs_getCapabilities($server, $m = null)
 {
     return Server::_xmlrpcs_getCapabilities($server, $m);
 }
 
-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
 {
     return Server::_xmlrpcs_listMethods($server, $m);
 }
 
-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
-$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
+$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
 function _xmlrpcs_methodSignature($server, $m)
 {
     return Server::_xmlrpcs_methodSignature($server, $m);
 }
 
-$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
+$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
 function _xmlrpcs_methodHelp($server, $m)
 {
     return Server::_xmlrpcs_methodHelp($server, $m);

Please login to merge, or discard this patch.

lib/xmlrpc.inc 1 patch

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

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

Please login to merge, or discard this patch.

demo/vardemo.php 1 patch

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

@@ -1,4 +1,4 @@  discard block
 block discarded – undo
-<?php require_once __DIR__ . "/client/_prepend.php"; ?><html lang="en">
+<?php require_once __DIR__."/client/_prepend.php"; ?><html lang="en">
 <head><title>xmlrpc</title></head>
 <body>
 <?php
@@ -8,9 +8,9 @@  discard block
 block discarded – undo
 print "<h3>Testing value serialization</h3>\n";
 
 $v = new PhpXmlRpc\Value(23, "int");
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 $v = new PhpXmlRpc\Value("What are you saying? >> << &&");
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
     "array"
 );
 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
     "struct"
 );
 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
 
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
 
 $w = new PhpXmlRpc\Value("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -65,29 +65,29 @@  discard block
 block discarded – undo
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 );
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
+print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
 
 $req->method('');
 $req->addParam(new PhpXmlRpc\Value("41", "int"));
 
 print "<h3>Testing request serialization</h3>\n";
 $op = $req->serialize();
-print "<PRE>" . htmlentities($op) . "</PRE>";
+print "<PRE>".htmlentities($op)."</PRE>";
 
 print "<h3>Testing ISO date format</h3><pre>\n";
 
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 print "Now is $t --> $date\n";
-print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n";
+print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n";
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 print "That is to say $date --> $tb\n";
-print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n";
-print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n";
+print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n";
+print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n";
 
 print "</pre>\n";
 
 ?>
 </body>
-</html><?php require_once __DIR__ . "/client/_append.php"; ?>
+</html><?php require_once __DIR__."/client/_append.php"; ?>

Please login to merge, or discard this patch.

src/Helper/Date.php 1 patch

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

		@@ -29,7 +29,7 @@
		block discarded – undo
29	29	// gmstrftime doesn't exist in some versions of PHP
30	30	$t = gmstrftime("%Y%m%dT%H:%M:%S", $timet);
31	31	} else {
32		- $t = strftime("%Y%m%dT%H:%M:%S", $timet - date('Z'));
	32	+ $t = strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));
33	33	}
34	34	}
35	35

Please login to merge, or discard this patch.

src/Encoder.php 1 patch

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

@@ -76,13 +76,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'])) {
                                 $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val);
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
 
             case 'array':
                 $arr = array();
-                foreach($xmlrpcVal as $value) {
+                foreach ($xmlrpcVal as $value) {
                     $arr[] = $this->decode($value, $options);
                 }
                 return $arr;
@@ -145,7 +145,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;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
 
                 } else {
                     $arr = array();
-                    foreach($phpVal as $k => $v) {
+                    foreach ($phpVal as $k => $v) {
                         $arr[$k] = $this->encode($v, $options);
                     }
                     $xmlrpcVal = new Value($arr, Value::$xmlrpcStruct);
@@ -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();
                 }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
                     if (extension_loaded('mbstring')) {
                         $xmlVal = mb_convert_encoding($xmlVal, 'UTF-8', $valEncoding);
                     } 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);
                     }
                 }
             }
@@ -331,7 +331,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']);
@@ -355,7 +355,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.

src/Helper/Charset.php 2 patches

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

@@ -63,19 +63,19 @@  discard block
 block discarded – undo
      */
     protected function buildConversionTable($tableName)
     {
-        switch($tableName) {
+        switch ($tableName) {
             case 'xml_iso88591_Entities':
                 if (count($this->xml_iso88591_Entities['in'])) {
                     return;
                 }
-                for ($i = 0; $i < 32; $i++) {
+                for ($i = 0; $i<32; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
 
                 /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
 
-                for ($i = 160; $i < 256; $i++) {
+                for ($i = 160; $i<256; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
                 break;*/
 
             default:
-                throw new \Exception('Unsupported table: ' . $tableName);
+                throw new \Exception('Unsupported table: '.$tableName);
         }
     }
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
             $destEncoding = 'US-ASCII';
         }
 
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
 
         // list ordered with (expected) most common scenarios first
         switch ($conversion) {
@@ -164,20 +164,20 @@  discard block
 block discarded – undo
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
                 $escapedData = '';
                 // be kind to users creating string xmlrpc values out of different php types
-                $data = (string)$data;
+                $data = (string) $data;
                 $ns = strlen($data);
-                for ($nn = 0; $nn < $ns; $nn++) {
+                for ($nn = 0; $nn<$ns; $nn++) {
                     $ch = $data[$nn];
                     $ii = ord($ch);
                     // 7 bits in 1 byte: 0bbbbbbb (127)
-                    if ($ii < 32) {
+                    if ($ii<32) {
                         if ($conversion == 'UTF-8_US-ASCII') {
                             $escapedData .= sprintf('&#%d;', $ii);
                         } else {
                             $escapedData .= $ch;
                         }
                     }
-                    else if ($ii < 128) {
+                    else if ($ii<128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {
@@ -202,25 +202,25 @@  discard block
 block discarded – undo
                     } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
                     elseif ($ii >> 5 == 6) {
                         $b1 = ($ii & 31);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $ii = ($b1 * 64) + $b2;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $ii = ($b1 * 64)+$b2;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 1;
                     } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 4 == 14) {
                         $b1 = ($ii & 15);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 2;
                     } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 3 == 30) {
                         $b1 = ($ii & 7);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $b4 = (ord($data[$nn + 3]) & 63);
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $b4 = (ord($data[$nn+3]) & 63);
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 3;
                     }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
 
             default:
                 $escapedData = '';
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
         }
 
         return $escapedData;
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new \Exception('Unsupported charset: ' . $charset);
+                throw new \Exception('Unsupported charset: '.$charset);
         }
     }
 }

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -176,8 +176,7 @@
 block discarded – undo
                         } else {
                             $escapedData .= $ch;
                         }
-                    }
-                    else if ($ii < 128) {
+                    } else if ($ii < 128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {

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

@@ -119,7 +119,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)");
             }
         }
     }
@@ -144,7 +144,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;
         }
 
@@ -161,10 +161,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
@@ -206,7 +206,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;
         }
     }
@@ -237,7 +237,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;
         }
     }
@@ -279,19 +279,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,
@@ -299,15 +299,15 @@  discard block
 block discarded – undo
                         // sprintf('%F') could be most likely ok but it fails eg. 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}>";
                         } elseif (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}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>";
+                            $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
                         } else {
                             // not really a good idea here: but what shall we output anyway? left for backward compat...
                             $rs .= "<${typ}>${val}</${typ}>";
@@ -329,14 +329,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";
@@ -372,7 +372,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.

demo/server/methodProviders/wrapper.php 1 patch

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

@@ -27,11 +27,11 @@  discard block
 block discarded – undo
 {
     global $stateNames;
 
-    if (isset($stateNames[$stateNo - 1])) {
-        return $stateNames[$stateNo - 1];
+    if (isset($stateNames[$stateNo-1])) {
+        return $stateNames[$stateNo-1];
     } else {
         // not, there so complain
-        throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
+        throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
     }
 }
 
@@ -125,13 +125,13 @@  discard block
 block discarded – undo
 
 $findstate10_sig = array(
     /// @todo add a demo/test with a closure
-    "function" => function ($req) { return findState($req); },
+    "function" => function($req) { return findState($req); },
     "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
-    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
+    "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
         'index of that state name in an alphabetic order.',
 );
 
-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
 
 /// @todo do we really need a new instance ?
 $c = new xmlrpcServerMethodsContainer();
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
 
 $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
 
-$returnObj_sig =  $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
 
 return array_merge(
     array(

Please login to merge, or discard this patch.

		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	$val = reset($ar);
108	108	$typ = key($ar);
109	109
110		- return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
	110	+ return '<value>'.$this->serializedata($typ, $val)."</value>\n";
111	111	//}
112	112	}
113	113
		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	// preserve back compatibility
127	127
128	128	if (is_array($b)) {
129		- foreach($b as $id => $cont) {
	129	+ foreach ($b as $id => $cont) {
130	130	$b[$id] = $cont->scalarval();
131	131	}
132	132	}
		@@ -134,10 +134,10 @@ discard block
		block discarded – undo
134	134	// add support for structures directly encoding php objects
135	135	if (is_object($b)) {
136	136	$t = get_object_vars($b);
137		- foreach($t as $id => $cont) {
	137	+ foreach ($t as $id => $cont) {
138	138	$t[$id] = $cont->scalarval();
139	139	}
140		- foreach($t as $id => $cont) {
	140	+ foreach ($t as $id => $cont) {
141	141	@$b->$id = $cont;
142	142	}
143	143	}
		@@ -179,17 +179,17 @@ discard block
		block discarded – undo
179	179	/* Expose as global functions the ones which are now class methods */
180	180
181	181	/// Wrong speling, but we are adamant on backwards compatibility!
182		-function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
	182	+function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '')
183	183	{
184	184	return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding);
185	185	}
186	186
187		-function iso8601_encode($timeT, $utc=0)
	187	+function iso8601_encode($timeT, $utc = 0)
188	188	{
189	189	return Date::iso8601Encode($timeT, $utc);
190	190	}
191	191
192		-function iso8601_decode($iDate, $utc=0)
	192	+function iso8601_decode($iDate, $utc = 0)
193	193	{
194	194	return Date::iso8601Decode($iDate, $utc);
195	195	}
		@@ -199,25 +199,25 @@ discard block
		block discarded – undo
199	199	return Http::decodeChunked($buffer);
200	200	}
201	201
202		-function php_xmlrpc_decode($xmlrpcVal, $options=array())
	202	+function php_xmlrpc_decode($xmlrpcVal, $options = array())
203	203	{
204	204	$encoder = new Encoder();
205	205	return $encoder->decode($xmlrpcVal, $options);
206	206	}
207	207
208		-function php_xmlrpc_encode($phpVal, $options=array())
	208	+function php_xmlrpc_encode($phpVal, $options = array())
209	209	{
210	210	$encoder = new Encoder();
211	211	return $encoder->encode($phpVal, $options);
212	212	}
213	213
214		-function php_xmlrpc_decode_xml($xmlVal, $options=array())
	214	+function php_xmlrpc_decode_xml($xmlVal, $options = array())
215	215	{
216	216	$encoder = new Encoder();
217	217	return $encoder->decodeXml($xmlVal, $options);
218	218	}
219	219
220		-function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
	220	+function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null)
221	221	{
222	222	return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
223	223	}

		@@ -63,19 +63,19 @@ discard block
		block discarded – undo
63	63	*/
64	64	protected function buildConversionTable($tableName)
65	65	{
66		- switch($tableName) {
	66	+ switch ($tableName) {
67	67	case 'xml_iso88591_Entities':
68	68	if (count($this->xml_iso88591_Entities['in'])) {
69	69	return;
70	70	}
71		- for ($i = 0; $i < 32; $i++) {
	71	+ for ($i = 0; $i<32; $i++) {
72	72	$this->xml_iso88591_Entities["in"][] = chr($i);
73	73	$this->xml_iso88591_Entities["out"][] = "&#{$i};";
74	74	}
75	75
76	76	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
77	77
78		- for ($i = 160; $i < 256; $i++) {
	78	+ for ($i = 160; $i<256; $i++) {
79	79	$this->xml_iso88591_Entities["in"][] = chr($i);
80	80	$this->xml_iso88591_Entities["out"][] = "&#{$i};";
81	81	}
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	break;*/
104	104
105	105	default:
106		- throw new \Exception('Unsupported table: ' . $tableName);
	106	+ throw new \Exception('Unsupported table: '.$tableName);
107	107	}
108	108	}
109	109
		@@ -146,7 +146,7 @@ discard block
		block discarded – undo
146	146	$destEncoding = 'US-ASCII';
147	147	}
148	148
149		- $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
	149	+ $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
150	150
151	151	// list ordered with (expected) most common scenarios first
152	152	switch ($conversion) {
		@@ -164,20 +164,20 @@ discard block
		block discarded – undo
164	164	// NB: this will choke on invalid UTF-8, going most likely beyond EOF
165	165	$escapedData = '';
166	166	// be kind to users creating string xmlrpc values out of different php types
167		- $data = (string)$data;
	167	+ $data = (string) $data;
168	168	$ns = strlen($data);
169		- for ($nn = 0; $nn < $ns; $nn++) {
	169	+ for ($nn = 0; $nn<$ns; $nn++) {
170	170	$ch = $data[$nn];
171	171	$ii = ord($ch);
172	172	// 7 bits in 1 byte: 0bbbbbbb (127)
173		- if ($ii < 32) {
	173	+ if ($ii<32) {
174	174	if ($conversion == 'UTF-8_US-ASCII') {
175	175	$escapedData .= sprintf('&#%d;', $ii);
176	176	} else {
177	177	$escapedData .= $ch;
178	178	}
179	179	}
180		- else if ($ii < 128) {
	180	+ else if ($ii<128) {
181	181	/// @todo shall we replace this with a (supposedly) faster str_replace?
182	182	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
183	183	switch ($ii) {
		@@ -202,25 +202,25 @@ discard block
		block discarded – undo
202	202	} // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
203	203	elseif ($ii >> 5 == 6) {
204	204	$b1 = ($ii & 31);
205		- $b2 = (ord($data[$nn + 1]) & 63);
206		- $ii = ($b1 * 64) + $b2;
	205	+ $b2 = (ord($data[$nn+1]) & 63);
	206	+ $ii = ($b1 * 64)+$b2;
207	207	$escapedData .= sprintf('&#%d;', $ii);
208	208	$nn += 1;
209	209	} // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
210	210	elseif ($ii >> 4 == 14) {
211	211	$b1 = ($ii & 15);
212		- $b2 = (ord($data[$nn + 1]) & 63);
213		- $b3 = (ord($data[$nn + 2]) & 63);
214		- $ii = ((($b1 * 64) + $b2) * 64) + $b3;
	212	+ $b2 = (ord($data[$nn+1]) & 63);
	213	+ $b3 = (ord($data[$nn+2]) & 63);
	214	+ $ii = ((($b1 * 64)+$b2) * 64)+$b3;
215	215	$escapedData .= sprintf('&#%d;', $ii);
216	216	$nn += 2;
217	217	} // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
218	218	elseif ($ii >> 3 == 30) {
219	219	$b1 = ($ii & 7);
220		- $b2 = (ord($data[$nn + 1]) & 63);
221		- $b3 = (ord($data[$nn + 2]) & 63);
222		- $b4 = (ord($data[$nn + 3]) & 63);
223		- $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
	220	+ $b2 = (ord($data[$nn+1]) & 63);
	221	+ $b3 = (ord($data[$nn+2]) & 63);
	222	+ $b4 = (ord($data[$nn+3]) & 63);
	223	+ $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
224	224	$escapedData .= sprintf('&#%d;', $ii);
225	225	$nn += 3;
226	226	}
		@@ -268,7 +268,7 @@ discard block
		block discarded – undo
268	268
269	269	default:
270	270	$escapedData = '';
271		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
	271	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
272	272	}
273	273
274	274	return $escapedData;
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	case 'iso88591':
323	323	return $this->xml_iso88591_Entities;
324	324	default:
325		- throw new \Exception('Unsupported charset: ' . $charset);
	325	+ throw new \Exception('Unsupported charset: '.$charset);
326	326	}
327	327	}
328	328	}

		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	$this->me['struct'] = $val;
120	120	break;
121	121	default:
122		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
	122	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
123	123	}
124	124	}
125	125	}
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	}
145	145
146	146	if ($typeOf !== 1) {
147		- $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
	147	+ $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
148	148	return 0;
149	149	}
150	150
		@@ -161,10 +161,10 @@ discard block
		block discarded – undo
161	161
162	162	switch ($this->mytype) {
163	163	case 1:
164		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
	164	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
165	165	return 0;
166	166	case 3:
167		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
	167	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
168	168	return 0;
169	169	case 2:
170	170	// we're adding a scalar value to an array here
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206
207	207	return 1;
208	208	} else {
209		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	209	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
210	210	return 0;
211	211	}
212	212	}
		@@ -237,7 +237,7 @@ discard block
		block discarded – undo
237	237
238	238	return 1;
239	239	} else {
240		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
	240	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
241	241	return 0;
242	242	}
243	243	}
		@@ -279,19 +279,19 @@ discard block
		block discarded – undo
279	279	case 1:
280	280	switch ($typ) {
281	281	case static::$xmlrpcBase64:
282		- $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
	282	+ $rs .= "<${typ}>".base64_encode($val)."</${typ}>";
283	283	break;
284	284	case static::$xmlrpcBoolean:
285		- $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
	285	+ $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>";
286	286	break;
287	287	case static::$xmlrpcString:
288	288	// Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
289		- $rs .= "<${typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>";
	289	+ $rs .= "<${typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>";
290	290	break;
291	291	case static::$xmlrpcInt:
292	292	case static::$xmlrpcI4:
293	293	case static::$xmlrpcI8:
294		- $rs .= "<${typ}>" . (int)$val . "</${typ}>";
	294	+ $rs .= "<${typ}>".(int) $val."</${typ}>";
295	295	break;
296	296	case static::$xmlrpcDouble:
297	297	// avoid using standard conversion of float to string because it is locale-dependent,
		@@ -299,15 +299,15 @@ discard block
		block discarded – undo
299	299	// sprintf('%F') could be most likely ok but it fails eg. on 2e-14.
300	300	// The code below tries its best at keeping max precision while avoiding exp notation,
301	301	// but there is of course no limit in the number of decimal places to be used...
302		- $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</${typ}>";
	302	+ $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</${typ}>";
303	303	break;
304	304	case static::$xmlrpcDateTime:
305	305	if (is_string($val)) {
306	306	$rs .= "<${typ}>${val}</${typ}>";
307	307	} elseif (is_a($val, 'DateTime')) {
308		- $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>";
	308	+ $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";
309	309	} elseif (is_int($val)) {
310		- $rs .= "<${typ}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>";
	310	+ $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
311	311	} else {
312	312	// not really a good idea here: but what shall we output anyway? left for backward compat...
313	313	$rs .= "<${typ}>${val}</${typ}>";
		@@ -329,14 +329,14 @@ discard block
		block discarded – undo
329	329	case 3:
330	330	// struct
331	331	if ($this->_php_class) {
332		- $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
	332	+ $rs .= '<struct php_class="'.$this->_php_class."\">\n";
333	333	} else {
334	334	$rs .= "<struct>\n";
335	335	}
336	336	$charsetEncoder = $this->getCharsetEncoder();
337	337	/** @var Value $val2 */
338	338	foreach ($val as $key2 => $val2) {
339		- $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
	339	+ $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
340	340	//$rs.=$this->serializeval($val2);
341	341	$rs .= $val2->serialize($charsetEncoding);
342	342	$rs .= "</member>\n";
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372	$val = reset($this->me);
373	373	$typ = key($this->me);
374	374
375		- return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
	375	+ return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
376	376	}
377	377
378	378	/**

		@@ -1,4 +1,4 @@ discard block
		block discarded – undo
1		-<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en">
	1	+<?php require_once __DIR__."/_prepend.php"; ?><html lang="en">
2	2	<head><title>xmlrpc - Mail demo</title></head>
3	3	<body>
4	4	<h1>Mail demo</h1>
		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	print "<font color=\"red\">";
35	35	print "Mail send failed<br/>\n";
36	36	print "Fault: ";
37		- print "Code: " . htmlspecialchars($resp->faultCode()) .
38		- " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>";
	37	+ print "Code: ".htmlspecialchars($resp->faultCode()).
	38	+ " Reason: '".htmlspecialchars($resp->faultString())."'<br/>";
39	39	print "</font><br/>";
40	40	}
41	41	}
		@@ -53,4 +53,4 @@ discard block
		block discarded – undo
53	53	<input type="Submit" value="Send"/>
54	54	</form>
55	55	</body>
56		-</html><?php require_once __DIR__ . "/_append.php"; ?>
	56	+</html><?php require_once __DIR__."/_append.php"; ?>

		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	*/
55	55	public function echoInput()
56	56	{
57		- $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
	57	+ $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
58	58	print $r->serialize();
59	59	}
60	60
		@@ -65,11 +65,11 @@ discard block
		block discarded – undo
65	65	*/
66	66	public function __get($name)
67	67	{
68		- switch($name) {
	68	+ switch ($name) {
69	69	case 'dmap':
70	70	return $this->dmap;
71	71	default:
72		- trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' .
	72	+ trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.
73	73	$trace[0]['line'], E_USER_NOTICE);
74	74	return null;
75	75	}
		@@ -96,30 +96,30 @@ discard block
		block discarded – undo
96	96	Server::xmlrpc_debugmsg($m);
97	97	}
98	98
99		-function _xmlrpcs_getCapabilities($server, $m=null)
	99	+function _xmlrpcs_getCapabilities($server, $m = null)
100	100	{
101	101	return Server::_xmlrpcs_getCapabilities($server, $m);
102	102	}
103	103
104		-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
105		-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
106		-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
107		-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
	104	+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
	105	+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
	106	+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
	107	+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
108	108	{
109	109	return Server::_xmlrpcs_listMethods($server, $m);
110	110	}
111	111
112		-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
113		-$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
114		-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
	112	+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
	113	+$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
	114	+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
115	115	function _xmlrpcs_methodSignature($server, $m)
116	116	{
117	117	return Server::_xmlrpcs_methodSignature($server, $m);
118	118	}
119	119
120		-$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
121		-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
122		-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
	120	+$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
	121	+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
	122	+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
123	123	function _xmlrpcs_methodHelp($server, $m)
124	124	{
125	125	return Server::_xmlrpcs_methodHelp($server, $m);

		@@ -1,4 +1,4 @@ discard block
		block discarded – undo
1		-<?php require_once __DIR__ . "/client/_prepend.php"; ?><html lang="en">
	1	+<?php require_once __DIR__."/client/_prepend.php"; ?><html lang="en">
2	2	<head><title>xmlrpc</title></head>
3	3	<body>
4	4	<?php
		@@ -8,9 +8,9 @@ discard block
		block discarded – undo
8	8	print "<h3>Testing value serialization</h3>\n";
9	9
10	10	$v = new PhpXmlRpc\Value(23, "int");
11		-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
	11	+print "<PRE>".htmlentities($v->serialize())."</PRE>";
12	12	$v = new PhpXmlRpc\Value("What are you saying? >> << &&");
13		-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
	13	+print "<PRE>".htmlentities($v->serialize())."</PRE>";
14	14
15	15	$v = new PhpXmlRpc\Value(
16	16	array(
		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	"array"
22	22	);
23	23
24		-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
	24	+print "<PRE>".htmlentities($v->serialize())."</PRE>";
25	25
26	26	$v = new PhpXmlRpc\Value(
27	27	array(
		@@ -49,11 +49,11 @@ discard block
		block discarded – undo
49	49	"struct"
50	50	);
51	51
52		-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
	52	+print "<PRE>".htmlentities($v->serialize())."</PRE>";
53	53
54	54	$w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
55	55
56		-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
	56	+print "<PRE>".htmlentities($w->serialize())."</PRE>";
57	57
58	58	$w = new PhpXmlRpc\Value("Mary had a little lamb,
59	59	Whose fleece was white as snow,
		@@ -65,29 +65,29 @@ discard block
		block discarded – undo
65	65	Ten thousand volts went down its back
66	66	And turned it into nylon", "base64"
67	67	);
68		-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
69		-print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
	68	+print "<PRE>".htmlentities($w->serialize())."</PRE>";
	69	+print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
70	70
71	71	$req->method('');
72	72	$req->addParam(new PhpXmlRpc\Value("41", "int"));
73	73
74	74	print "<h3>Testing request serialization</h3>\n";
75	75	$op = $req->serialize();
76		-print "<PRE>" . htmlentities($op) . "</PRE>";
	76	+print "<PRE>".htmlentities($op)."</PRE>";
77	77
78	78	print "<h3>Testing ISO date format</h3><pre>\n";
79	79
80	80	$t = time();
81	81	$date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
82	82	print "Now is $t --> $date\n";
83		-print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n";
	83	+print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n";
84	84	$tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
85	85	print "That is to say $date --> $tb\n";
86		-print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n";
87		-print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n";
	86	+print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n";
	87	+print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n";
88	88
89	89	print "</pre>\n";
90	90
91	91	?>
92	92	</body>
93		-</html><?php require_once __DIR__ . "/client/_append.php"; ?>
	93	+</html><?php require_once __DIR__."/client/_append.php"; ?>

		@@ -76,13 +76,13 @@ discard block
		block discarded – undo
76	76	'scalar' => $val,
77	77	'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
78	78	);
79		- return (object)$xmlrpcVal;
	79	+ return (object) $xmlrpcVal;
80	80	case 'base64':
81	81	$xmlrpcVal = array(
82	82	'xmlrpc_type' => 'base64',
83	83	'scalar' => $val
84	84	);
85		- return (object)$xmlrpcVal;
	85	+ return (object) $xmlrpcVal;
86	86	case 'string':
87	87	if (isset($options['extension_api_encoding'])) {
88	88	$dval = @iconv('UTF-8', $options['extension_api_encoding'], $val);
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116
117	117	case 'array':
118	118	$arr = array();
119		- foreach($xmlrpcVal as $value) {
	119	+ foreach ($xmlrpcVal as $value) {
120	120	$arr[] = $this->decode($value, $options);
121	121	}
122	122	return $arr;
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	case 'msg':
146	146	$paramCount = $xmlrpcVal->getNumParams();
147	147	$arr = array();
148		- for ($i = 0; $i < $paramCount; $i++) {
	148	+ for ($i = 0; $i<$paramCount; $i++) {
149	149	$arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
150	150	}
151	151	return $arr;
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239
240	240	} else {
241	241	$arr = array();
242		- foreach($phpVal as $k => $v) {
	242	+ foreach ($phpVal as $k => $v) {
243	243	$arr[$k] = $this->encode($v, $options);
244	244	}
245	245	$xmlrpcVal = new Value($arr, Value::$xmlrpcStruct);
		@@ -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	}
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	if (extension_loaded('mbstring')) {
310	310	$xmlVal = mb_convert_encoding($xmlVal, 'UTF-8', $valEncoding);
311	311	} else {
312		- $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
	312	+ $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
313	313	}
314	314	}
315	315	}
		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	$parserOptions
332	332	);
333	333
334		- if ($xmlRpcParser->_xh['isf'] > 1) {
	334	+ if ($xmlRpcParser->_xh['isf']>1) {
335	335	// test that $xmlrpc->_xh['value'] is an obj, too???
336	336
337	337	$this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
		@@ -355,7 +355,7 @@ discard block
		block discarded – undo
355	355
356	356	case 'methodcall':
357	357	$req = new Request($xmlRpcParser->_xh['method']);
358		- for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
	358	+ for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
359	359	$req->addParam($xmlRpcParser->_xh['params'][$i]);
360	360	}
361	361	return $req;

		@@ -176,8 +176,7 @@
		block discarded – undo
176	176	} else {
177	177	$escapedData .= $ch;
178	178	}
179		- }
180		- else if ($ii < 128) {
	179	+ } else if ($ii < 128) {
181	180	/// @todo shall we replace this with a (supposedly) faster str_replace?
182	181	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
183	182	switch ($ii) {

		@@ -27,11 +27,11 @@ discard block
		block discarded – undo
27	27	{
28	28	global $stateNames;
29	29
30		- if (isset($stateNames[$stateNo - 1])) {
31		- return $stateNames[$stateNo - 1];
	30	+ if (isset($stateNames[$stateNo-1])) {
	31	+ return $stateNames[$stateNo-1];
32	32	} else {
33	33	// not, there so complain
34		- throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
	34	+ throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
35	35	}
36	36	}
37	37
		@@ -125,13 +125,13 @@ discard block
		block discarded – undo
125	125
126	126	$findstate10_sig = array(
127	127	/// @todo add a demo/test with a closure
128		- "function" => function ($req) { return findState($req); },
	128	+ "function" => function($req) { return findState($req); },
129	129	"signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)),
130		- "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' .
	130	+ "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '.
131	131	'index of that state name in an alphabetic order.',
132	132	);
133	133
134		-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); });
	134	+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); });
135	135
136	136	/// @todo do we really need a new instance ?
137	137	$c = new xmlrpcServerMethodsContainer();
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140
141	141	$namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static'));
142	142
143		-$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
	143	+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
144	144
145	145	return array_merge(
146	146	array(

gggeek / phpxmlrpc

Pull Request — master (#98)

Status

Category

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

Spacing +14 added lines, -14 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

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

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

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

Braces +1 added lines, -2 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