gggeek / phpxmlrpc

src/Helper/XMLParser.php

Spacing +29 added lines, -29 removed lines

@@ -154,10 +154,10 @@ 
         $this->accept = $accept;
 
         // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors
-        for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
+        for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
             $chunk = substr($data, $offset, $this->maxChunkLength);
             // error handling: xml not well formed
-            if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
+            if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
                 $errCode = xml_get_error_code($parser);
                 $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
                     xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -182,7 +182,7 @@ 
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xmlrpc already detected, skip all processing
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
 
             // check for correct element nesting
             if (count($this->_xh['stack']) == 0) {
@@ -202,7 +202,7 @@ 
                     $this->_xh['rt'] = strtolower($name);
                 } else {
                     $this->_xh['isf'] = 2;
-                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
+                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
 
                     return;
                 }
@@ -296,7 +296,7 @@ 
                     break;
                 case 'MEMBER':
                     // set member name to null, in case we do not find in the xml later on
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
                     //$this->_xh['ac']='';
                 // Drop trough intentionally
                 case 'PARAM':
@@ -357,7 +357,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // push this element name from stack
             // NB: if XML validates, correct opening/closing is guaranteed and
             // we do not have to check for $name == $currElem.
@@ -372,7 +372,7 @@ 
                         $this->_xh['vt'] = Value::$xmlrpcString;
                     }
 
-                    if ($rebuildXmlrpcvals > 0) {
+                    if ($rebuildXmlrpcvals>0) {
                         // build the xmlrpc val out of the data received, and substitute it
                         $temp = new Value($this->_xh['value'], $this->_xh['vt']);
                         // in case we got info about underlying php class, save it
@@ -381,15 +381,15 @@ 
                             $temp->_php_class = $this->_xh['php_class'];
                         }
                         $this->_xh['value'] = $temp;
-                    } elseif ($rebuildXmlrpcvals < 0) {
+                    } elseif ($rebuildXmlrpcvals<0) {
                         if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
-                            $this->_xh['value'] = (object)array(
+                            $this->_xh['value'] = (object) array(
                                 'xmlrpc_type' => 'datetime',
                                 'scalar' => $this->_xh['value'],
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
                             );
                         } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
-                            $this->_xh['value'] = (object)array(
+                            $this->_xh['value'] = (object) array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $this->_xh['value']
                             );
@@ -405,8 +405,8 @@ 
                     // check if we are inside an array or struct:
                     // if value just built is inside an array, let's move it into array on the stack
                     $vscount = count($this->_xh['valuestack']);
-                    if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
-                        $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
+                    if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
+                        $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
                     }
                     break;
                 case 'BOOLEAN':
@@ -425,7 +425,7 @@ 
                         $this->_xh['value'] = $this->_xh['ac'];
                     } elseif ($name == 'DATETIME.ISO8601') {
                         if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
                         }
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -444,7 +444,7 @@ 
                         } else {
                             // log if receiving something strange, even though we set the value to false anyway
                             if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
-                                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
+                                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
                             }
                             $this->_xh['value'] = false;
                         }
@@ -454,37 +454,37 @@ 
                         // NOTE: regexp could be much stricter than this...
                         if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
                             /// @todo: find a better way of throwing an error than this!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                         } else {
                             // it's ok, add it on
-                            $this->_xh['value'] = (double)$this->_xh['ac'];
+                            $this->_xh['value'] = (double) $this->_xh['ac'];
                         }
                     } else {
                         // we have an I4/I8/INT
                         // we must check that only 0123456789-<space> are characters here
                         if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
                             /// @todo find a better way of throwing an error than this!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                         } else {
                             // it's ok, add it on
-                            $this->_xh['value'] = (int)$this->_xh['ac'];
+                            $this->_xh['value'] = (int) $this->_xh['ac'];
                         }
                     }
                     $this->_xh['lv'] = 3; // indicate we've found a value
                     break;
                 case 'NAME':
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
                     break;
                 case 'MEMBER':
                     // add to array in the stack the last element built,
                     // unless no VALUE was found
                     if ($this->_xh['vt']) {
                         $vscount = count($this->_xh['valuestack']);
-                        $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
+                        $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
                     }
                     break;
                 case 'DATA':
@@ -507,7 +507,7 @@ 
                         $this->_xh['params'][] = $this->_xh['value'];
                         $this->_xh['pt'][] = $this->_xh['vt'];
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
                     }
                     break;
                 case 'METHODNAME':
@@ -566,7 +566,7 @@ 
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // "lookforvalue==3" means that we've found an entire value
             // and should discard any further character data
             if ($this->_xh['lv'] != 3) {
@@ -585,7 +585,7 @@ 
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
                 $this->_xh['ac'] .= $data;
             }
@@ -659,8 +659,8 @@ 
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return strtoupper(substr($matches[2], 1, -1));
         }
@@ -678,7 +678,7 @@ 
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
             // IANA also likes better US-ASCII, so go with it
             if ($enc == 'ASCII') {
-                $enc = 'US-' . $enc;
+                $enc = 'US-'.$enc;
             }
 
             return $enc;
@@ -713,8 +713,8 @@ 
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return true;
         }

src/Helper/Charset.php

Spacing +19 added lines, -19 removed lines

@@ -68,14 +68,14 @@ 
                 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 @@ 
                 break;*/
 
             default:
-                throw new \Exception('Unsupported table: ' . $tableName);
+                throw new \Exception('Unsupported table: '.$tableName);
         }
     }
 
@@ -146,7 +146,7 @@ 
             $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 @@ 
                 // 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 @@ 
                     } // 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 @@ 
 
             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 @@ 
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new \Exception('Unsupported charset: ' . $charset);
+                throw new \Exception('Unsupported charset: '.$charset);
         }
     }
 }

debugger/action.php

Spacing +113 added lines, -113 removed lines

@@ -92,13 +92,13 @@ 
 <body>
 <?php
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action) {
 
     // make sure the script waits long enough for the call to complete...
     if ($timeout) {
-        set_time_limit($timeout + 10);
+        set_time_limit($timeout+10);
     }
 
     if ($wstype == 1) {
@@ -123,13 +123,13 @@ 
         $server = "$host$path";
     }
     if ($protocol == 2 || $protocol == 3) {
-        $server = 'https://' . $server;
+        $server = 'https://'.$server;
     } else {
-        $server = 'http://' . $server;
+        $server = 'http://'.$server;
     }
     if ($proxy != '') {
         $pproxy = explode(':', $proxy);
-        if (count($pproxy) > 1) {
+        if (count($pproxy)>1) {
             $pport = $pproxy[1];
         } else {
             $pport = 8080;
@@ -204,9 +204,9 @@ 
         case 'wrap':
             $msg[0] = new $requestClass('system.methodHelp', array(), $id);
             $msg[0]->addparam(new PhpXmlRpc\Value($method));
-            $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1);
+            $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1);
             $msg[1]->addparam(new PhpXmlRpc\Value($method));
-            $actionname = 'Description of method "' . $method . '"';
+            $actionname = 'Description of method "'.$method.'"';
             break;
         case 'list':
             $msg[0] = new $requestClass('system.listMethods', array(), $id);
@@ -219,9 +219,9 @@ 
             $msg[0] = new $requestClass($method, array(), $id);
             // hack! build xml payload by hand
             if ($wstype == 1) {
-                $msg[0]->payload = "{\n" .
-                    '"method": "' . $method . "\",\n\"params\": [" .
-                    $payload .
+                $msg[0]->payload = "{\n".
+                    '"method": "'.$method."\",\n\"params\": [".
+                    $payload.
                     "\n],\n\"id\": ";
                 // fix: if user gave an empty string, use NULL, or we'll break json syntax
                 if ($id == "") {
@@ -234,20 +234,20 @@ 
                     }
                 }
             } else {
-                $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
-                    '<methodName>' . $method . "</methodName>\n<params>" .
-                    $payload .
-                    "</params>\n" . $msg[0]->xml_footer();
+                $msg[0]->payload = $msg[0]->xml_header($inputcharset).
+                    '<methodName>'.$method."</methodName>\n<params>".
+                    $payload.
+                    "</params>\n".$msg[0]->xml_footer();
             }
-            $actionname = 'Execution of method ' . $method;
+            $actionname = 'Execution of method '.$method;
             break;
         default: // give a warning
-            $actionname = '[ERROR: unknown action] "' . $action . '"';
+            $actionname = '[ERROR: unknown action] "'.$action.'"';
     }
 
     // Before calling execute, echo out brief description of action taken + date and time ???
     // this gives good user feedback for long-running methods...
-    echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n";
+    echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n";
     flush();
 
     $response = null;
@@ -265,7 +265,7 @@ 
             break;
         }
     }
-    $time = microtime(true) - $time;
+    $time = microtime(true)-$time;
     if ($debug) {
         echo "</div>\n";
     }
@@ -275,8 +275,8 @@ 
             // call failed! echo out error msg!
             //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
             echo "<h3>$protoName call FAILED!</h3>\n";
-            echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n";
+            echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n";
             echo(date("d/M/Y:H:i:s\n"));
         } else {
             // call succeeded: parse results
@@ -292,36 +292,36 @@ 
                         $max = $v->count();
                         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
                         echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-                        foreach($v as $i => $rec) {
+                        foreach ($v as $i => $rec) {
                             if ($i % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
+                            echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
                                 "<input type=\"submit\" value=\"Describe\" /></form></td>");
                             //echo("</tr>\n");
 
@@ -348,7 +348,7 @@ 
                     $r2 = $resp[1]->value();
 
                     echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-                    echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
+                    echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
                     $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                     if ($desc == "") {
                         $desc = "-";
@@ -358,41 +358,41 @@ 
                     if ($r2->kindOf() != "array") {
                         echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
                     } else {
-                        foreach($r2 as $i => $x) {
+                        foreach ($r2 as $i => $x) {
                             $payload = "";
                             $alt_payload = "";
-                            if ($i + 1 % 2) {
+                            if ($i+1 % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo "<tr><td$class>Signature&nbsp;" . ($i + 1) . "</td><td$class>";
+                            echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
                             if ($x->kindOf() == "array") {
                                 $ret = $x[0];
-                                echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
-                                if ($x->count() > 1) {
-                                    foreach($x as $k => $y) {
+                                echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: (";
+                                if ($x->count()>1) {
+                                    foreach ($x as $k => $y) {
                                         if ($k == 0) continue;
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype != 1) {
                                             $type = $y->scalarval();
                                             $payload .= '<param><value>';
-                                            switch($type) {
+                                            switch ($type) {
                                                 case 'undefined':
                                                     break;
                                                 case 'null';
                                                     $type = 'nil';
                                                     // fall thru intentionally
                                                 default:
-                                                    $payload .= '<' .
-                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                                                        '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
+                                                    $payload .= '<'.
+                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                                                        '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
                                                         '>';
                                             }
                                             $payload .= "</value></param>\n";
                                         }
                                         $alt_payload .= $y->scalarval();
-                                        if ($k < $x->count() - 1) {
+                                        if ($k<$x->count()-1) {
                                             $alt_payload .= ';';
                                             echo ", ";
                                         }
@@ -405,63 +405,63 @@ 
                             echo '</td>';
                             // button to test this method
                             //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>";
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
                                 "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
                             if ($wstype != 1) {
                                 echo "<input type=\"submit\" value=\"Load method synopsis\" />";
                             }
                             echo "</form></td>\n";
 
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />".
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
                             echo "</form></td></tr>\n";
                         }
@@ -473,14 +473,14 @@ 
                 case 'wrap':
                     $r1 = $resp[0]->value();
                     $r2 = $resp[1]->value();
-                    if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) {
+                    if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) {
                         echo "Error: signature unknown\n";
                     } else {
                         $mdesc = $r1->scalarval();
                         $encoder = new PhpXmlRpc\Encoder();
                         $msig = $encoder->decode($r2);
                         $msig = $msig[$methodsig];
-                        $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) );
+                        $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : '')));
                         if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
                             $clientcookies == ''
                         ) {
@@ -494,11 +494,11 @@ 
                             $prefix = 'xmlrpc';
                         }
                         $wrapper = new PhpXmlRpc\Wrapper();
-                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc);
+                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc);
                         //if ($code)
                         //{
                         echo "<div id=\"phpcode\">\n";
-                        highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>');
+                        highlight_string("<?php\n".$code['docstring'].$code['source'].'?>');
                         echo "\n</div>";
                         //}
                         //else
@@ -509,7 +509,7 @@ 
                     break;
 
                 case 'execute':
-                    echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>';
+                    echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>';
                     break;
 
                 default: // give a warning

pakefile.php

Spacing +18 added lines, -18 removed lines

@@ -63,9 +63,9 @@ 
         );
     }
 
-    public static function getOpts($args=array(), $cliOpts=array())
+    public static function getOpts($args = array(), $cliOpts = array())
     {
-        if (count($args) > 0)
+        if (count($args)>0)
         //    throw new \Exception('Missing library version argument');
             self::$libVersion = $args[0];
 
@@ -168,17 +168,17 @@ 
         $out = '';
         while (($start = strpos($content, $startTag, $last)) !== false) {
             $end = strpos($content, $endTag, $start);
-            $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag));
-            if ($code[strlen($code) - 1] == "\n") {
+            $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag));
+            if ($code[strlen($code)-1] == "\n") {
                 $code = substr($code, 0, -1);
             }
 
             $code = str_replace(array('&gt;', '&lt;'), array('>', '<'), $code);
-            $code = highlight_string('<?php ' . $code, true);
+            $code = highlight_string('<?php '.$code, true);
             $code = str_replace('<span style="color: #0000BB">&lt;?php&nbsp;<br />', '<span style="color: #0000BB">', $code);
 
-            $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag;
-            $last = $end + strlen($endTag);
+            $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag;
+            $last = $end+strlen($endTag);
         }
         $out .= substr($content, $last, strlen($content));
 
@@ -192,7 +192,7 @@ 
 
 use PhpXmlRpc\Builder;
 
-function run_default($task=null, $args=array(), $cliOpts=array())
+function run_default($task = null, $args = array(), $cliOpts = array())
 {
     echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n";
     echo "\n";
@@ -210,7 +210,7 @@ 
     echo "      --zip=ZIP        Location of the zip tool\n";
 }
 
-function run_getopts($task=null, $args=array(), $cliOpts=array())
+function run_getopts($task = null, $args = array(), $cliOpts = array())
 {
     Builder::getOpts($args, $cliOpts);
 }
@@ -219,7 +219,7 @@ 
  * Downloads source code in the build workspace directory, optionally checking out the given branch/tag
  * @todo allow using current installation / dir as source, bypassing git clone in workspace - at least for doc generation
  */
-function run_init($task=null, $args=array(), $cliOpts=array())
+function run_init($task = null, $args = array(), $cliOpts = array())
 {
     // download the current version into the workspace
     $targetDir = Builder::workspaceDir();
@@ -247,7 +247,7 @@ 
  *
  * (does nothing by itself, as all the steps are managed via task dependencies)
  */
-function run_build($task=null, $args=array(), $cliOpts=array())
+function run_build($task = null, $args = array(), $cliOpts = array())
 {
 }
 
@@ -263,7 +263,7 @@ 
 /**
  * Generates documentation in all formats
  */
-function run_doc($task=null, $args=array(), $cliOpts=array())
+function run_doc($task = null, $args = array(), $cliOpts = array())
 {
     // in
     $srcDir = Builder::workspaceDir();
@@ -274,7 +274,7 @@ 
 
     // from phpdoc comments using phpdocumentor
     $cmd = Builder::tool('php');
-    pake_sh("$cmd " . Builder::toolsDir(). "/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC');
+    pake_sh("$cmd ".Builder::toolsDir()."/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC');
 
     // from phpdoc comments using Sami
     // deprecated on 2021/12, as Sami is abandonware
@@ -355,7 +355,7 @@ 
 /**
  * Creates the tarballs for a release
  */
-function run_dist($task=null, $args=array(), $cliOpts=array())
+function run_dist($task = null, $args = array(), $cliOpts = array())
 {
     // copy workspace dir into dist dir, without git
     pake_mkdirs(Builder::distDir());
@@ -370,7 +370,7 @@ 
     // create tarballs
     $cwd = getcwd();
     chdir(dirname(Builder::distDir()));
-    foreach(Builder::distFiles() as $distFile) {
+    foreach (Builder::distFiles() as $distFile) {
         // php can not really create good zip files via phar: they are not compressed!
         if (substr($distFile, -4) == '.zip') {
             $cmd = Builder::tool('zip');
@@ -388,7 +388,7 @@ 
     chdir($cwd);
 }
 
-function run_clean_workspace($task=null, $args=array(), $cliOpts=array())
+function run_clean_workspace($task = null, $args = array(), $cliOpts = array())
 {
     if (realpath(__DIR__) === realpath(Builder::workspaceDir())) {
         throw new \Exception("Can not remove workspace dir, as it is where pakefile is located!");
@@ -400,13 +400,13 @@ 
  * Cleans up the whole build directory
  * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources
  */
-function run_clean($task=null, $args=array(), $cliOpts=array())
+function run_clean($task = null, $args = array(), $cliOpts = array())
 {
     pake_remove_dir(Builder::buildDir());
 }
 
 // helper task: display help text
-pake_task( 'default' );
+pake_task('default');
 // internal task: parse cli options
 pake_task('getopts');
 pake_task('init', 'getopts');