Inspection of "fix error code returned by server for invalid xml..." - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 8b6717...c8a221 )

by Gaetano

created 2025-10-15 10:36 UTC

Status

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

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

Please login to merge, or discard this patch.

demo/server/proxy.php 1 patch

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

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

Please login to merge, or discard this patch.

src/Helper/XMLParser.php 2 patches

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

@@ -187,12 +187,12 @@  discard block
 block discarded – undo
             // q: can php be built without ctype? should we use a regexp?
             if (is_string($key) && !ctype_digit($key)) {
                 /// @todo on invalid options, throw/error-out instead of logging an error message?
-                switch($key) {
+                switch ($key) {
                     case 'target_charset':
                         if (function_exists('mb_convert_encoding')) {
                             $this->current_parsing_options['target_charset'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring");
                         }
                         break;
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
                         if (is_callable($val)) {
                             $this->current_parsing_options['methodname_callback'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
                         }
                         break;
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
                         break;
 
                     default:
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key");
                 }
                 unset($mergedOptions[$key]);
             }
@@ -255,10 +255,10 @@  discard block
 block discarded – undo
 
         try {
             // @see ticket #70 - we have to parse big xml docs 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));
@@ -266,25 +266,25 @@  discard block
 block discarded – undo
                     $this->_xh['isf_reason'] = $errStr;
                 }
                 // no need to parse further if we already have a fatal error
-                if ($this->_xh['isf'] >= 2) {
+                if ($this->_xh['isf']>=2) {
                     break;
                 }
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
         $this->current_parsing_options = array();
 
         // BC
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xml-rpc already detected, skip all processing
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
             if ($acceptSingleVals === false) {
                 $accept = $this->current_parsing_options['accept'];
             } else {
-                $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated');
+                $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated');
                 $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE;
             }
             if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) ||
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
                 $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;
             }
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
 
             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'] = null;
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null;
                 //$this->_xh['ac']='';
                 // Drop trough intentionally
 
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
                     $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8');
                 }
 
-                if ($rebuildXmlrpcvals > 0) {
+                if ($rebuildXmlrpcvals>0) {
                     // build the xml-rpc 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 in the object we're rebuilding
@@ -533,15 +533,15 @@  discard block
 block discarded – undo
                         $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']
                         );
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
                 // 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;
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
                     // log if receiving something strange, even though we set the value to false anyway
                     /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL
                     if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) {
-                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' .
+                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: '.
                             $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                             return;
                         }
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
                 $this->_xh['vt'] = strtolower($name);
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in INT value: ' .
+                    if (!$this->handleParsingError('non numeric data received in INT value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
                     $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'];
                 }
                 break;
 
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
                 $this->_xh['vt'] = Value::$xmlrpcDouble;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' .
+                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (float)$this->_xh['ac'];
+                    $this->_xh['value'] = (float) $this->_xh['ac'];
                 }
                 break;
 
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
                 $this->_xh['vt'] = Value::$xmlrpcDateTime;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('invalid data received in DATETIME value: ' .
+                    if (!$this->handleParsingError('invalid data received in DATETIME value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -647,9 +647,9 @@  discard block
 block discarded – undo
 
                     // the default regex used to validate the date string a few lines above should make this case impossible,
                     // but one never knows...
-                    } catch(\Exception $e) {
+                    } catch (\Exception $e) {
                         // what to do? We can not guarantee that a valid date can be created. We return null...
-                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' .
+                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error '.
                             $e->getMessage(), __METHOD__)) {
                             return;
                         }
@@ -666,14 +666,14 @@  discard block
 block discarded – undo
                     $v = base64_decode($this->_xh['ac'], true);
                     if ($v === false) {
                         $this->_xh['isf'] = 2;
-                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']);
+                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']);
                         return;
                     }
                 } else {
                     $v = base64_decode($this->_xh['ac']);
                     if ($v === '' && $this->_xh['ac'] !== '') {
                         // only the empty string should decode to the empty string
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' .
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '.
                             $this->truncateValueForLog($this->_xh['ac']));
                     }
                 }
@@ -681,20 +681,20 @@  discard block
 block discarded – undo
                 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 or no NAME were found
                 if ($this->_xh['vt']) {
                     $vscount = count($this->_xh['valuestack']);
-                    if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) {
+                    if ($this->_xh['valuestack'][$vscount-1]['name'] === null) {
                         if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) {
                             return;
                         }
-                        $this->_xh['valuestack'][$vscount - 1]['name'] = '';
+                        $this->_xh['valuestack'][$vscount-1]['name'] = '';
                     }
-                    $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 {
                     if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) {
                         return;
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -930,8 +930,8 @@  discard block
 block discarded – undo
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-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._-]*'))/",
+        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));
         }
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
             // 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;
@@ -990,8 +990,8 @@  discard block
 block discarded – undo
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-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._-]*'))/",
+        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)) {
             return true;
         }
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
             $this->_xh['isf_reason'] = ucfirst($message);
             return false;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message);
+            $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message);
             return true;
         }
     }
@@ -1023,8 +1023,8 @@  discard block
 block discarded – undo
      */
     protected function truncateValueForLog($data)
     {
-        if (strlen($data) > $this->maxLogValueLength) {
-            return substr($data, 0, $this->maxLogValueLength - 3) . '...';
+        if (strlen($data)>$this->maxLogValueLength) {
+            return substr($data, 0, $this->maxLogValueLength-3).'...';
         }
 
         return $data;
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
     public function xmlrpc_se_any($parser, $name, $attrs)
     {
         // this will be spamming the log if this method is in use...
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->xmlrpc_se($parser, $name, $attrs, true);
     }
@@ -1055,12 +1055,12 @@  discard block
 block discarded – undo
         switch ($name) {
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -1071,18 +1071,18 @@  discard block
 block discarded – undo
         switch ($name) {
             // this should only ever be called by subclasses which overtook `parse()`
             case 'accept':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->current_parsing_options['accept'] = $value;
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -1090,11 +1090,11 @@  discard block
 block discarded – undo
     {
         switch ($name) {
             case 'accept':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->current_parsing_options['accept']);
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -1106,18 +1106,18 @@  discard block
 block discarded – undo
         switch ($name) {
             // q: does this make sense at all?
             case 'accept':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->current_parsing_options['accept']);
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -272,19 +272,25 @@
 block discarded – undo
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) {
+                xml_parser_free($parser);
+            }
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION < 8) {
+            xml_parser_free($parser);
+        }
         $this->current_parsing_options = array();
 
         // BC

Please login to merge, or discard this patch.

tests/WebTestCase.php 2 patches

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

@@ -41,7 +41,9 @@
 block discarded – undo
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
+        if (PHP_MAJOR_VERSION < 8) {
+            curl_close($ch);
+        }
 
         $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
         if (!$emptyPageOk) {

Please login to merge, or discard this patch.

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 use PhpXmlRpc\Client;
 
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
      */
     protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false)
     {
-        $url = $this->baseUrl . $path;
+        $url = $this->baseUrl.$path;
 
         $ch = curl_init($url);
         curl_setopt_array($ch, array(
@@ -31,21 +31,21 @@  discard block
 block discarded – undo
                 CURLOPT_POSTFIELDS => $payload
             ));
         }
-        $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId;
+        $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId;
         if ($this->collectCodeCoverageInformation)
         {
-            $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId;
+            $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId;
         }
         curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 
-        if ($this->args['DEBUG'] > 0) {
+        if ($this->args['DEBUG']>0) {
             curl_setopt($ch, CURLOPT_VERBOSE, 1);
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
+        if (PHP_MAJOR_VERSION<8) curl_close($ch);
 
-        $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
+        $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']);
         if (!$emptyPageOk) {
             $this->assertNotEquals('', $page, 'Retrieved web page should not be empty');
         }
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
      */
     protected function newClient($path)
     {
-        $client = new Client($this->baseUrl . $path);
+        $client = new Client($this->baseUrl.$path);
         $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);

Please login to merge, or discard this patch.

src/Response.php 1 patch

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

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

Please login to merge, or discard this patch.

src/Helper/Http.php 1 patch

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

@@ -28,12 +28,12 @@  discard block
 block discarded – undo
 
         // read chunk-size, chunk-extension (if any) and crlf
         // get the position of the linebreak
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
+        $chunkEnd = strpos($buffer, "\r\n")+2;
         $temp = substr($buffer, 0, $chunkEnd);
         $chunkSize = hexdec(trim($temp));
         $chunkStart = $chunkEnd;
-        while ($chunkSize > 0) {
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
+        while ($chunkSize>0) {
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
 
             // just in case we got a broken connection
             if ($chunkEnd == false) {
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
             }
 
             // read chunk-data and crlf
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             // append chunk-data to entity-body
             $new .= $chunk;
             // length := length + chunk-size
             $length += strlen($chunk);
             // read chunk-size and crlf
-            $chunkStart = $chunkEnd + 2;
+            $chunkStart = $chunkEnd+2;
 
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
             if ($chunkEnd == false) {
                 break; // just in case we got a broken connection
             }
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             $chunkSize = hexdec(trim($temp));
             $chunkStart = $chunkEnd;
         }
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -134,19 +134,19 @@  discard block
 block discarded – undo
         }
 
         if (!in_array($httpResponse['status_code'], $this->acceptedStatusCodes)) {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
         foreach ($ar as $line) {
             // take care of (multi-line) headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 /// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error
                 ///       400 any messages where a space is present between the header name and colon
                 $headerName = strtolower(trim($arr[0]));
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
                     $cookie = $arr[1];
                     // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
                     if (isset($httpResponse['headers'][$headerName])) {
-                        $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                        $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                     } else {
                         $httpResponse['headers'][$headerName] = trim($cookie);
                     }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
             } elseif (isset($headerName)) {
                 /// @todo improve this: 1. check that the line starts with a space or tab; 2. according to
                 ///       https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -237,19 +237,19 @@  discard block
 block discarded – undo
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
     public function parseAcceptHeader($header)
     {
         $accepted = array();
-        foreach(explode(',', $header) as $c) {
+        foreach (explode(',', $header) as $c) {
             if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) {
                 $c = $matches[1];
                 $w = $matches[2];

Please login to merge, or discard this patch.

debugger/action.php 3 patches

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

@@ -15,7 +15,12 @@  discard block
 block discarded – undo
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <style type="text/css">
         <!--
@@ -404,7 +409,9 @@  discard block
 block discarded – undo
                                 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;
+                                        if ($k == 0) {
+                                            continue;
+                                        }
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype == 1 || $wstype == 2) {
                                             switch($y->scalarval()) {

Please login to merge, or discard this patch.

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

@@ -79,8 +79,8 @@
 block discarded – undo
 <?php
 
 global $inputcharset, $debug, $protocol, $run, $hasjsonrpcclient, $hasjsonrpc2, $wstype, $id, $host, $port, $path, $action,
-       $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
-       $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
+        $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
+        $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
 
 include __DIR__ . '/common.php';
 

Please login to merge, or discard this patch.

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

@@ -82,13 +82,13 @@  discard block
 block discarded – undo
        $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
        $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action) {
 
     // avoid php hanging when using the builtin webserver and sending requests to itself
     $skip = false;
-    if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) {
+    if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) {
         $localHost = explode(':', $_SERVER['HTTP_HOST']);
         /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters,
         ///       and that proxy is us
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
     if (!$skip) {
         // 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 || $wstype == 2) {
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
             $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;
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
             // fall thru intentionally
             case 'describe':
             case 'wrap':
-                $msg[0] = new $requestClass('system.methodHelp', array(), (int)$id);
+                $msg[0] = new $requestClass('system.methodHelp', array(), (int) $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));
                 if ($wstype == 2) {
                     $msg[0]->setJsonRpcVersion('2.0');
@@ -218,10 +218,10 @@  discard block
 block discarded – undo
                     $msg[0]->setJsonRpcVersion('1.0');
                     $msg[1]->setJsonRpcVersion('1.0');
                 }
-                $actionname = 'Description of method "' . $method . '"';
+                $actionname = 'Description of method "'.$method.'"';
                 break;
             case 'list':
-                $msg[0] = new $requestClass('system.listMethods', array(), (int)$id);
+                $msg[0] = new $requestClass('system.listMethods', array(), (int) $id);
                 if ($wstype == 2) {
                     $msg[0]->setJsonRpcVersion('2.0');
                 } elseif ($wstype == 1 && $hasjsonrpc2) {
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
                 // hack! build payload by hand
                 if ($wstype == 2) {
                     $payload = rtrim($payload, "\n");
-                    $payload = "{\n" .
-                        '"jsonrpc": "2.0"' . ",\n" .
-                        '"method": "' . $method . "\",\n\"params\": [\n" .
-                        $payload .
+                    $payload = "{\n".
+                        '"jsonrpc": "2.0"'.",\n".
+                        '"method": "'.$method."\",\n\"params\": [\n".
+                        $payload.
                         "\n]";
                     if ($action == "notification") {
                         $payload .= "\n";
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
                     $msg[0]->setJsonRpcVersion('2.0');
                 } elseif ($wstype == 1) {
                     $payload = rtrim($payload, "\n");
-                    $payload = "{\n" .
-                        '"method": "' . $method . "\",\n\"params\": [\n" .
-                        $payload .
+                    $payload = "{\n".
+                        '"method": "'.$method."\",\n\"params\": [\n".
+                        $payload.
                         "\n],\n\"id\": ";
                     if ($action == "notification") {
                         $payload .= "null\n}";
@@ -281,26 +281,26 @@  discard block
 block discarded – undo
                     }
                 } else {
                     $msg[0]->setPayload(
-                        $msg[0]->xml_header($inputcharset) .
-                        '<methodName>' . $method . "</methodName>\n<params>" .
-                        $payload .
-                        "</params>\n" . $msg[0]->xml_footer()
+                        $msg[0]->xml_header($inputcharset).
+                        '<methodName>'.$method."</methodName>\n<params>".
+                        $payload.
+                        "</params>\n".$msg[0]->xml_footer()
                     );
                 }
                 if ($action == 'notification') {
-                    $actionname = 'Execution of notification ' . $method;
+                    $actionname = 'Execution of notification '.$method;
                 } else {
-                    $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;
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
             break;
         }
     }
-    $time = microtime(true) - $time;
+    $time = microtime(true)-$time;
     if ($debug) {
         echo "</div>\n";
     }
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
             // 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
@@ -349,36 +349,36 @@  discard block
 block discarded – undo
                         $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");
 
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
                     $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 = "-";
@@ -415,24 +415,24 @@  discard block
 block discarded – undo
                     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 || $wstype == 2) {
-                                            switch($y->scalarval()) {
+                                            switch ($y->scalarval()) {
                                                 case 'string':
                                                 case 'dateTime.iso8601':
                                                 case 'base64':
@@ -465,22 +465,22 @@  discard block
 block discarded – undo
                                         } else {
                                             $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 .= ';';
                                             if ($wstype == 1 || $wstype == 2) {
                                                 $payload .= ', ';
@@ -496,63 +496,63 @@  discard block
 block discarded – undo
                             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=\"action\" value=\"wrap\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
+                            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=\"action\" value=\"wrap\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
                             echo "</form></td></tr>\n";
                         }
@@ -564,14 +564,14 @@  discard block
 block discarded – undo
                 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 == '') {
                             $opts = 1; // simple client copy in stub code
@@ -592,12 +592,12 @@  discard block
 block discarded – undo
                             $client,
                             $method,
                             array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true),
-                            str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc
+                            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
@@ -608,11 +608,11 @@  discard block
 block discarded – undo
                     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;
 
                 case 'notification':
-                    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

Please login to merge, or discard this patch.

debugger/controller.php 2 patches

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
     $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
     $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action == '') {
     $action = 'list';
@@ -38,30 +38,30 @@  discard block
 block discarded – undo
     /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
-            __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
-            __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
-            __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
-            __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
+            __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
+            __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
+            __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
         /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly
         ///       at this folder, as in that case the link to the visualeditor will not
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1" || document.frmaction.wstype.value == "2")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -313,16 +313,16 @@  discard block
 block discarded – undo
     } ?>">
 <h1>XML-RPC
 <?php if ($hasjsonrpcclient) {
-    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"' .
+    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'.
         // q: does this check make sense at all?
-        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '') . ' /></form>';
+        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '').' /></form>';
     if ($hasjsonrpc2) {
         echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>JSON-RPC 2.0 ';
     }
     echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>

Please login to merge, or discard this patch.

Braces +13 added lines, -3 removed lines patch added patch discarded remove patch

@@ -71,7 +71,12 @@  discard block
 block discarded – undo
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <script type="text/javascript" language="Javascript">
         if (window.name != 'frmcontroller')
@@ -308,8 +313,10 @@  discard block
 block discarded – undo
     </script>
 </head>
 <body
-    onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
+    onload="<?php if ($hasjsonrpcclient) {
+    echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
         echo ' document.frmaction.submit();';
+}
     } ?>">
 <h1>XML-RPC
 <?php if ($hasjsonrpcclient) {
@@ -322,7 +329,10 @@  discard block
 block discarded – undo
     echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) {
+    echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion);
+}
+?>)</h3>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">

Please login to merge, or discard this patch.

debugger/common.php 1 patch

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
     // assume this is either a standalone install, or installed as Composer dependency
     /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
     ///       debugger include this one, taking care of autoloading?
-    include_once __DIR__ . "/../src/Autoloader.php";
+    include_once __DIR__."/../src/Autoloader.php";
     PhpXmlRpc\Autoloader::register();
 }
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
         }
 
         // Variables that shouldn't be unset
-        $noUnset = array('GLOBALS',  '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
+        $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
 $wstype = defined('DEFAULT_WSTYPE') ? DEFAULT_WSTYPE : 0;
 $id = '';
 if (isset($_GET['action'])) {
-    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2'  || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
-        $wstype = (int)$_GET['wstype'];
+    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
+        $wstype = (int) $_GET['wstype'];
         if ($wstype === 1 || $wstype === 2) {
             if (!$hasjsonrpcclient) {
                 $wstype = 0;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error...
     if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3'
         || $_GET['protocol'] == '4')) {
-        $protocol = (int)$_GET['protocol'];
+        $protocol = (int) $_GET['protocol'];
     }
     if (strpos($host, 'http://') === 0) {
         // NB: if protocol is https or h2, it will override http://
@@ -114,18 +114,18 @@  discard block
 block discarded – undo
             $protocol = 2;
         }
     }
-    $port = isset($_GET['port']) ? (int)$_GET['port'] : '';
+    $port = isset($_GET['port']) ? (int) $_GET['port'] : '';
     if ($port === 0) {
         $port = '';
     }
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xml-rpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
-        $debug = (int)$_GET['debug'];
+        $debug = (int) $_GET['debug'];
     }
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
     /// @todo what about an https proxy?
     $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
-    $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0;
+    $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0;
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
 
-    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1;
+    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1;
 
     if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
-        (int)$requestcompression = $_GET['requestcompression'];
+        (int) $requestcompression = $_GET['requestcompression'];
     } else {
         $requestcompression = 0;
     }
     if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
-        $responsecompression = (int)$_GET['responsecompression'];
+        $responsecompression = (int) $_GET['responsecompression'];
     } else {
         $responsecompression = 0;
     }

Please login to merge, or discard this patch.

		@@ -272,19 +272,25 @@
		block discarded – undo
272	272	}
273	273	/// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
274	274	} catch (\Exception $e) {
275		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	275	+ if (PHP_MAJOR_VERSION < 8) {
	276	+ xml_parser_free($parser);
	277	+ }
276	278	$this->current_parsing_options = array();
277	279	/// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
278	280	throw $e;
279	281	} catch (\Error $e) {
280		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	282	+ if (PHP_MAJOR_VERSION < 8) {
	283	+ xml_parser_free($parser);
	284	+ }
281	285	$this->current_parsing_options = array();
282	286	//$this->accept = $prevAccept;
283	287	/// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
284	288	throw $e;
285	289	}
286	290
287		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	291	+ if (PHP_MAJOR_VERSION < 8) {
	292	+ xml_parser_free($parser);
	293	+ }
288	294	$this->current_parsing_options = array();
289	295
290	296	// BC

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/_prepend.php";
	2	+require_once __DIR__."/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>phpxmlrpc - Getstatename demo</title></head>
		@@ -17,13 +17,13 @@ discard block
		block discarded – undo
17	17	$stateNo = "";
18	18
19	19	if (isset($_POST['stateno']) && $_POST['stateno'] != "") {
20		- $stateNo = (int)$_POST['stateno'];
	20	+ $stateNo = (int) $_POST['stateno'];
21	21	$method = 'examples.getStateName';
22	22	$arguments = array(
23	23	new Value($stateNo, Value::$xmlrpcInt),
24	24	);
25	25	$req = new Request($method, $arguments);
26		- output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) .
	26	+ output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()).
27	27	"\n\n</pre>Debug info of server data follows...\n\n");
28	28	$client = new Client(XMLRPCSERVER);
29	29	$client->setOption(Client::OPT_DEBUG, 1);
		@@ -32,12 +32,12 @@ discard block
		block discarded – undo
32	32	$val = $resp->value();
33	33	// NB: we are _assuming_ that the server did return a scalar xml-rpc value here.
34	34	// If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'`
35		- output('<br/>State number <b>' . $stateNo . '</b> is <b>'
36		- . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>');
	35	+ output('<br/>State number <b>'.$stateNo.'</b> is <b>'
	36	+ . htmlspecialchars($val->scalarVal()).'</b><br/><br/>');
37	37	} else {
38	38	output('An error occurred: ');
39		- output('<pre>Code: ' . htmlspecialchars($resp->faultCode())
40		- . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>");
	39	+ output('<pre>Code: '.htmlspecialchars($resp->faultCode())
	40	+ . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>");
41	41	}
42	42	}
43	43

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

		@@ -187,12 +187,12 @@ discard block
		block discarded – undo
187	187	// q: can php be built without ctype? should we use a regexp?
188	188	if (is_string($key) && !ctype_digit($key)) {
189	189	/// @todo on invalid options, throw/error-out instead of logging an error message?
190		- switch($key) {
	190	+ switch ($key) {
191	191	case 'target_charset':
192	192	if (function_exists('mb_convert_encoding')) {
193	193	$this->current_parsing_options['target_charset'] = $val;
194	194	} else {
195		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring");
	195	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring");
196	196	}
197	197	break;
198	198
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	if (is_callable($val)) {
201	201	$this->current_parsing_options['methodname_callback'] = $val;
202	202	} else {
203		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
	203	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
204	204	}
205	205	break;
206	206
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	break;
212	212
213	213	default:
214		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
	214	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key");
215	215	}
216	216	unset($mergedOptions[$key]);
217	217	}
		@@ -255,10 +255,10 @@ discard block
		block discarded – undo
255	255
256	256	try {
257	257	// @see ticket #70 - we have to parse big xml docs in chunks to avoid errors
258		- for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
	258	+ for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
259	259	$chunk = substr($data, $offset, $this->maxChunkLength);
260	260	// error handling: xml not well formed
261		- if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
	261	+ if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
262	262	$errCode = xml_get_error_code($parser);
263	263	$errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
264	264	xml_get_current_line_number($parser), xml_get_current_column_number($parser));
		@@ -266,25 +266,25 @@ discard block
		block discarded – undo
266	266	$this->_xh['isf_reason'] = $errStr;
267	267	}
268	268	// no need to parse further if we already have a fatal error
269		- if ($this->_xh['isf'] >= 2) {
	269	+ if ($this->_xh['isf']>=2) {
270	270	break;
271	271	}
272	272	}
273	273	/// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
274	274	} catch (\Exception $e) {
275		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	275	+ if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
276	276	$this->current_parsing_options = array();
277	277	/// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
278	278	throw $e;
279	279	} catch (\Error $e) {
280		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	280	+ if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
281	281	$this->current_parsing_options = array();
282	282	//$this->accept = $prevAccept;
283	283	/// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
284	284	throw $e;
285	285	}
286	286
287		- if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
	287	+ if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
288	288	$this->current_parsing_options = array();
289	289
290	290	// BC
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
312	312	{
313	313	// if invalid xml-rpc already detected, skip all processing
314		- if ($this->_xh['isf'] >= 2) {
	314	+ if ($this->_xh['isf']>=2) {
315	315	return;
316	316	}
317	317
		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	if ($acceptSingleVals === false) {
326	326	$accept = $this->current_parsing_options['accept'];
327	327	} else {
328		- $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated');
	328	+ $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated');
329	329	$accept = self::ACCEPT_REQUEST \| self::ACCEPT_RESPONSE \| self::ACCEPT_VALUE;
330	330	}
331	331	if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) \|\|
		@@ -335,7 +335,7 @@ discard block
		block discarded – undo
335	335	$this->_xh['rt'] = strtolower($name);
336	336	} else {
337	337	$this->_xh['isf'] = 2;
338		- $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
	338	+ $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
339	339
340	340	return;
341	341	}
		@@ -440,7 +440,7 @@ discard block
		block discarded – undo
440	440
441	441	case 'MEMBER':
442	442	// set member name to null, in case we do not find in the xml later on
443		- $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null;
	443	+ $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null;
444	444	//$this->_xh['ac']='';
445	445	// Drop trough intentionally
446	446
		@@ -503,7 +503,7 @@ discard block
		block discarded – undo
503	503	*/
504	504	public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
505	505	{
506		- if ($this->_xh['isf'] >= 2) {
	506	+ if ($this->_xh['isf']>=2) {
507	507	return;
508	508	}
509	509
		@@ -525,7 +525,7 @@ discard block
		block discarded – undo
525	525	$this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8');
526	526	}
527	527
528		- if ($rebuildXmlrpcvals > 0) {
	528	+ if ($rebuildXmlrpcvals>0) {
529	529	// build the xml-rpc val out of the data received, and substitute it
530	530	$temp = new Value($this->_xh['value'], $this->_xh['vt']);
531	531	// in case we got info about underlying php class, save it in the object we're rebuilding
		@@ -533,15 +533,15 @@ discard block
		block discarded – undo
533	533	$temp->_php_class = $this->_xh['php_class'];
534	534	}
535	535	$this->_xh['value'] = $temp;
536		- } elseif ($rebuildXmlrpcvals < 0) {
	536	+ } elseif ($rebuildXmlrpcvals<0) {
537	537	if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
538		- $this->_xh['value'] = (object)array(
	538	+ $this->_xh['value'] = (object) array(
539	539	'xmlrpc_type' => 'datetime',
540	540	'scalar' => $this->_xh['value'],
541	541	'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
542	542	);
543	543	} elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
544		- $this->_xh['value'] = (object)array(
	544	+ $this->_xh['value'] = (object) array(
545	545	'xmlrpc_type' => 'base64',
546	546	'scalar' => $this->_xh['value']
547	547	);
		@@ -556,8 +556,8 @@ discard block
		block discarded – undo
556	556	// check if we are inside an array or struct:
557	557	// if value just built is inside an array, let's move it into array on the stack
558	558	$vscount = count($this->_xh['valuestack']);
559		- if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
560		- $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
	559	+ if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
	560	+ $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
561	561	}
562	562	break;
563	563
		@@ -584,7 +584,7 @@ discard block
		block discarded – undo
584	584	// log if receiving something strange, even though we set the value to false anyway
585	585	/// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL
586	586	if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) {
587		- if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' .
	587	+ if (!$this->handleParsingError('invalid data received in BOOLEAN value: '.
588	588	$this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
589	589	return;
590	590	}
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	$this->_xh['vt'] = strtolower($name);
605	605	$this->_xh['lv'] = 3; // indicate we've found a value
606	606	if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) {
607		- if (!$this->handleParsingError('non numeric data received in INT value: ' .
	607	+ if (!$this->handleParsingError('non numeric data received in INT value: '.
608	608	$this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
609	609	return;
610	610	}
		@@ -612,7 +612,7 @@ discard block
		block discarded – undo
612	612	$this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
613	613	} else {
614	614	// it's ok, add it on
615		- $this->_xh['value'] = (int)$this->_xh['ac'];
	615	+ $this->_xh['value'] = (int) $this->_xh['ac'];
616	616	}
617	617	break;
618	618
		@@ -620,7 +620,7 @@ discard block
		block discarded – undo
620	620	$this->_xh['vt'] = Value::$xmlrpcDouble;
621	621	$this->_xh['lv'] = 3; // indicate we've found a value
622	622	if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) {
623		- if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' .
	623	+ if (!$this->handleParsingError('non numeric data received in DOUBLE value: '.
624	624	$this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
625	625	return;
626	626	}
		@@ -628,7 +628,7 @@ discard block
		block discarded – undo
628	628	$this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
629	629	} else {
630	630	// it's ok, add it on
631		- $this->_xh['value'] = (float)$this->_xh['ac'];
	631	+ $this->_xh['value'] = (float) $this->_xh['ac'];
632	632	}
633	633	break;
634	634
		@@ -636,7 +636,7 @@ discard block
		block discarded – undo
636	636	$this->_xh['vt'] = Value::$xmlrpcDateTime;
637	637	$this->_xh['lv'] = 3; // indicate we've found a value
638	638	if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) {
639		- if (!$this->handleParsingError('invalid data received in DATETIME value: ' .
	639	+ if (!$this->handleParsingError('invalid data received in DATETIME value: '.
640	640	$this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
641	641	return;
642	642	}
		@@ -647,9 +647,9 @@ discard block
		block discarded – undo
647	647
648	648	// the default regex used to validate the date string a few lines above should make this case impossible,
649	649	// but one never knows...
650		- } catch(\Exception $e) {
	650	+ } catch (\Exception $e) {
651	651	// what to do? We can not guarantee that a valid date can be created. We return null...
652		- if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' .
	652	+ if (!$this->handleParsingError('invalid data received in DATETIME value. Error '.
653	653	$e->getMessage(), __METHOD__)) {
654	654	return;
655	655	}
		@@ -666,14 +666,14 @@ discard block
		block discarded – undo
666	666	$v = base64_decode($this->_xh['ac'], true);
667	667	if ($v === false) {
668	668	$this->_xh['isf'] = 2;
669		- $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']);
	669	+ $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']);
670	670	return;
671	671	}
672	672	} else {
673	673	$v = base64_decode($this->_xh['ac']);
674	674	if ($v === '' && $this->_xh['ac'] !== '') {
675	675	// only the empty string should decode to the empty string
676		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' .
	676	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '.
677	677	$this->truncateValueForLog($this->_xh['ac']));
678	678	}
679	679	}
		@@ -681,20 +681,20 @@ discard block
		block discarded – undo
681	681	break;
682	682
683	683	case 'NAME':
684		- $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
	684	+ $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
685	685	break;
686	686
687	687	case 'MEMBER':
688	688	// add to array in the stack the last element built, unless no VALUE or no NAME were found
689	689	if ($this->_xh['vt']) {
690	690	$vscount = count($this->_xh['valuestack']);
691		- if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) {
	691	+ if ($this->_xh['valuestack'][$vscount-1]['name'] === null) {
692	692	if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) {
693	693	return;
694	694	}
695		- $this->_xh['valuestack'][$vscount - 1]['name'] = '';
	695	+ $this->_xh['valuestack'][$vscount-1]['name'] = '';
696	696	}
697		- $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
	697	+ $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
698	698	} else {
699	699	if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) {
700	700	return;
		@@ -828,7 +828,7 @@ discard block
		block discarded – undo
828	828	public function xmlrpc_cd($parser, $data)
829	829	{
830	830	// skip processing if xml fault already detected
831		- if ($this->_xh['isf'] >= 2) {
	831	+ if ($this->_xh['isf']>=2) {
832	832	return;
833	833	}
834	834
		@@ -850,7 +850,7 @@ discard block
		block discarded – undo
850	850	public function xmlrpc_dh($parser, $data)
851	851	{
852	852	// skip processing if xml fault already detected
853		- if ($this->_xh['isf'] >= 2) {
	853	+ if ($this->_xh['isf']>=2) {
854	854	return;
855	855	}
856	856
		@@ -930,8 +930,8 @@ discard block
		block discarded – undo
930	930	// SPACE: (#x20 \| #x9 \| #xD \| #xA)+ === [ \x9\xD\xA]+
931	931	// EQ: SPACE?=SPACE? === [ \x9\xD\xA]=[ \x9\xD\xA]
932	932	// We could be stricter on version number: VersionNum ::= '1.' [0-9]+
933		- if (preg_match('/^<\?xml\s+version\s=\s' . "((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))" .
934		- '\s+encoding\s=\s' . "((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
	933	+ if (preg_match('/^<\?xml\s+version\s=\s'."((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))".
	934	+ '\s+encoding\s=\s'."((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
935	935	$xmlChunk, $matches)) {
936	936	return strtoupper(substr($matches[2], 1, -1));
937	937	}
		@@ -949,7 +949,7 @@ discard block
		block discarded – undo
949	949	// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
950	950	// IANA also likes better US-ASCII, so go with it
951	951	if ($enc == 'ASCII') {
952		- $enc = 'US-' . $enc;
	952	+ $enc = 'US-'.$enc;
953	953	}
954	954
955	955	return $enc;
		@@ -990,8 +990,8 @@ discard block
		block discarded – undo
990	990	// SPACE: (#x20 \| #x9 \| #xD \| #xA)+ === [ \x9\xD\xA]+
991	991	// EQ: SPACE?=SPACE? === [ \x9\xD\xA]=[ \x9\xD\xA]
992	992	// We could be stricter on version number: VersionNum ::= '1.' [0-9]+
993		- if (preg_match('/^<\?xml\s+version\s=\s' . "((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))" .
994		- '\s+encoding\s=\s' . "((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
	993	+ if (preg_match('/^<\?xml\s+version\s=\s'."((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))".
	994	+ '\s+encoding\s=\s'."((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
995	995	$xmlChunk)) {
996	996	return true;
997	997	}
		@@ -1011,7 +1011,7 @@ discard block
		block discarded – undo
1011	1011	$this->_xh['isf_reason'] = ucfirst($message);
1012	1012	return false;
1013	1013	} else {
1014		- $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message);
	1014	+ $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message);
1015	1015	return true;
1016	1016	}
1017	1017	}
		@@ -1023,8 +1023,8 @@ discard block
		block discarded – undo
1023	1023	*/
1024	1024	protected function truncateValueForLog($data)
1025	1025	{
1026		- if (strlen($data) > $this->maxLogValueLength) {
1027		- return substr($data, 0, $this->maxLogValueLength - 3) . '...';
	1026	+ if (strlen($data)>$this->maxLogValueLength) {
	1027	+ return substr($data, 0, $this->maxLogValueLength-3).'...';
1028	1028	}
1029	1029
1030	1030	return $data;
		@@ -1045,7 +1045,7 @@ discard block
		block discarded – undo
1045	1045	public function xmlrpc_se_any($parser, $name, $attrs)
1046	1046	{
1047	1047	// this will be spamming the log if this method is in use...
1048		- $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
	1048	+ $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1049	1049
1050	1050	$this->xmlrpc_se($parser, $name, $attrs, true);
1051	1051	}
		@@ -1055,12 +1055,12 @@ discard block
		block discarded – undo
1055	1055	switch ($name) {
1056	1056	case '_xh':
1057	1057	case 'xmlrpc_valid_parents':
1058		- $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated');
	1058	+ $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated');
1059	1059	return $this->$name;
1060	1060	default:
1061	1061	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1062	1062	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1063		- trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	1063	+ trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1064	1064	$result = null;
1065	1065	return $result;
1066	1066	}
		@@ -1071,18 +1071,18 @@ discard block
		block discarded – undo
1071	1071	switch ($name) {
1072	1072	// this should only ever be called by subclasses which overtook `parse()`
1073	1073	case 'accept':
1074		- $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
	1074	+ $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
1075	1075	$this->current_parsing_options['accept'] = $value;
1076	1076	break;
1077	1077	case '_xh':
1078	1078	case 'xmlrpc_valid_parents':
1079		- $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
	1079	+ $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
1080	1080	$this->$name = $value;
1081	1081	break;
1082	1082	default:
1083	1083	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1084	1084	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1085		- trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	1085	+ trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1086	1086	}
1087	1087	}
1088	1088
		@@ -1090,11 +1090,11 @@ discard block
		block discarded – undo
1090	1090	{
1091	1091	switch ($name) {
1092	1092	case 'accept':
1093		- $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
	1093	+ $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
1094	1094	return isset($this->current_parsing_options['accept']);
1095	1095	case '_xh':
1096	1096	case 'xmlrpc_valid_parents':
1097		- $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
	1097	+ $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
1098	1098	return isset($this->$name);
1099	1099	default:
1100	1100	return false;
		@@ -1106,18 +1106,18 @@ discard block
		block discarded – undo
1106	1106	switch ($name) {
1107	1107	// q: does this make sense at all?
1108	1108	case 'accept':
1109		- $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
	1109	+ $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
1110	1110	unset($this->current_parsing_options['accept']);
1111	1111	break;
1112	1112	case '_xh':
1113	1113	case 'xmlrpc_valid_parents':
1114		- $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
	1114	+ $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
1115	1115	unset($this->$name);
1116	1116	break;
1117	1117	default:
1118	1118	/// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
1119	1119	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
1120		- trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
	1120	+ trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
1121	1121	}
1122	1122	}
1123	1123	}

		@@ -41,7 +41,9 @@
		block discarded – undo
41	41	}
42	42	$page = curl_exec($ch);
43	43	$info = curl_getinfo($ch);
44		- if (PHP_MAJOR_VERSION < 8) curl_close($ch);
	44	+ if (PHP_MAJOR_VERSION < 8) {
	45	+ curl_close($ch);
	46	+ }
45	47
46	48	$this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
47	49	if (!$emptyPageOk) {

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/ServerAwareTestCase.php';
	3	+include_once __DIR__.'/ServerAwareTestCase.php';
4	4
5	5	use PhpXmlRpc\Client;
6	6
		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	*/
18	18	protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false)
19	19	{
20		- $url = $this->baseUrl . $path;
	20	+ $url = $this->baseUrl.$path;
21	21
22	22	$ch = curl_init($url);
23	23	curl_setopt_array($ch, array(
		@@ -31,21 +31,21 @@ discard block
		block discarded – undo
31	31	CURLOPT_POSTFIELDS => $payload
32	32	));
33	33	}
34		- $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId;
	34	+ $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId;
35	35	if ($this->collectCodeCoverageInformation)
36	36	{
37		- $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId;
	37	+ $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId;
38	38	}
39	39	curl_setopt($ch, CURLOPT_COOKIE, $cookie);
40	40
41		- if ($this->args['DEBUG'] > 0) {
	41	+ if ($this->args['DEBUG']>0) {
42	42	curl_setopt($ch, CURLOPT_VERBOSE, 1);
43	43	}
44	44	$page = curl_exec($ch);
45	45	$info = curl_getinfo($ch);
46		- if (PHP_MAJOR_VERSION < 8) curl_close($ch);
	46	+ if (PHP_MAJOR_VERSION<8) curl_close($ch);
47	47
48		- $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
	48	+ $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']);
49	49	if (!$emptyPageOk) {
50	50	$this->assertNotEquals('', $page, 'Retrieved web page should not be empty');
51	51	}
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	*/
65	65	protected function newClient($path)
66	66	{
67		- $client = new Client($this->baseUrl . $path);
	67	+ $client = new Client($this->baseUrl.$path);
68	68	$client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId);
69	69	if ($this->collectCodeCoverageInformation) {
70	70	$client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);

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

		@@ -28,12 +28,12 @@ discard block
		block discarded – undo
28	28
29	29	// read chunk-size, chunk-extension (if any) and crlf
30	30	// get the position of the linebreak
31		- $chunkEnd = strpos($buffer, "\r\n") + 2;
	31	+ $chunkEnd = strpos($buffer, "\r\n")+2;
32	32	$temp = substr($buffer, 0, $chunkEnd);
33	33	$chunkSize = hexdec(trim($temp));
34	34	$chunkStart = $chunkEnd;
35		- while ($chunkSize > 0) {
36		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
	35	+ while ($chunkSize>0) {
	36	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
37	37
38	38	// just in case we got a broken connection
39	39	if ($chunkEnd == false) {
		@@ -45,19 +45,19 @@ discard block
		block discarded – undo
45	45	}
46	46
47	47	// read chunk-data and crlf
48		- $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	48	+ $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
49	49	// append chunk-data to entity-body
50	50	$new .= $chunk;
51	51	// length := length + chunk-size
52	52	$length += strlen($chunk);
53	53	// read chunk-size and crlf
54		- $chunkStart = $chunkEnd + 2;
	54	+ $chunkStart = $chunkEnd+2;
55	55
56		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
	56	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
57	57	if ($chunkEnd == false) {
58	58	break; // just in case we got a broken connection
59	59	}
60		- $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	60	+ $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
61	61	$chunkSize = hexdec(trim($temp));
62	62	$chunkStart = $chunkEnd;
63	63	}
		@@ -86,11 +86,11 @@ discard block
		block discarded – undo
86	86	// Look for CR/LF or simple LF as line separator (even though it is not valid http)
87	87	$pos = strpos($data, "\r\n\r\n");
88	88	if ($pos \|\| is_int($pos)) {
89		- $bd = $pos + 4;
	89	+ $bd = $pos+4;
90	90	} else {
91	91	$pos = strpos($data, "\n\n");
92	92	if ($pos \|\| is_int($pos)) {
93		- $bd = $pos + 2;
	93	+ $bd = $pos+2;
94	94	} else {
95	95	// No separation between response headers and body: fault?
96	96	$bd = 0;
		@@ -100,8 +100,8 @@ discard block
		block discarded – undo
100	100	// this filters out all http headers from proxy. maybe we could take them into account, too?
101	101	$data = substr($data, $bd);
102	102	} else {
103		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
104		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
	103	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
	104	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
105	105	}
106	106	}
107	107
		@@ -134,19 +134,19 @@ discard block
		block discarded – undo
134	134	}
135	135
136	136	if (!in_array($httpResponse['status_code'], $this->acceptedStatusCodes)) {
137		- $errstr = substr($data, 0, strpos($data, "\n") - 1);
138		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
139		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
	137	+ $errstr = substr($data, 0, strpos($data, "\n")-1);
	138	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
	139	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
140	140	}
141	141
142	142	// be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
143	143	$pos = strpos($data, "\r\n\r\n");
144	144	if ($pos \|\| is_int($pos)) {
145		- $bd = $pos + 4;
	145	+ $bd = $pos+4;
146	146	} else {
147	147	$pos = strpos($data, "\n\n");
148	148	if ($pos \|\| is_int($pos)) {
149		- $bd = $pos + 2;
	149	+ $bd = $pos+2;
150	150	} else {
151	151	// No separation between response headers and body: fault?
152	152	// we could take some action here instead of going on...
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	foreach ($ar as $line) {
161	161	// take care of (multi-line) headers and cookies
162	162	$arr = explode(':', $line, 2);
163		- if (count($arr) > 1) {
	163	+ if (count($arr)>1) {
164	164	/// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error
165	165	/// 400 any messages where a space is present between the header name and colon
166	166	$headerName = strtolower(trim($arr[0]));
		@@ -168,7 +168,7 @@ discard block
		block discarded – undo
168	168	$cookie = $arr[1];
169	169	// glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
170	170	if (isset($httpResponse['headers'][$headerName])) {
171		- $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
	171	+ $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
172	172	} else {
173	173	$httpResponse['headers'][$headerName] = trim($cookie);
174	174	}
		@@ -199,7 +199,7 @@ discard block
		block discarded – undo
199	199	} elseif (isset($headerName)) {
200	200	/// @todo improve this: 1. check that the line starts with a space or tab; 2. according to
201	201	/// https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages
202		- $httpResponse['headers'][$headerName] .= ' ' . trim($line);
	202	+ $httpResponse['headers'][$headerName] .= ' '.trim($line);
203	203	}
204	204	}
205	205
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	// Decode chunked encoding sent by http 1.1 servers
223	223	if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
224	224	if (!$data = static::decodeChunked($data)) {
225		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
	225	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
226	226	throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
227	227	}
228	228	}
		@@ -237,19 +237,19 @@ discard block
		block discarded – undo
237	237	if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
238	238	$data = $degzdata;
239	239	if ($debug) {
240		- $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	240	+ $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
241	241	}
242	242	} elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
243	243	$data = $degzdata;
244	244	if ($debug) {
245		- $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	245	+ $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
246	246	}
247	247	} else {
248		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
	248	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
249	249	throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
250	250	}
251	251	} else {
252		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
	252	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
253	253	throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
254	254	}
255	255	}
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269	public function parseAcceptHeader($header)
270	270	{
271	271	$accepted = array();
272		- foreach(explode(',', $header) as $c) {
	272	+ foreach (explode(',', $header) as $c) {
273	273	if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) {
274	274	$c = $matches[1];
275	275	$w = $matches[2];

		@@ -15,7 +15,12 @@ discard block
		block discarded – undo
15	15	<html lang="en">
16	16	<head>
17	17	<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
18		- <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 \|\| DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
	18	+ <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 \|\| DEFAULT_WSTYPE == 2)) {
	19	+ echo 'JSON-RPC';
	20	+} else {
	21	+ echo 'XML-RPC';
	22	+}
	23	+?> Debugger</title>
19	24	<meta name="robots" content="index,nofollow"/>
20	25	<style type="text/css">
21	26	<!--
		@@ -404,7 +409,9 @@ discard block
		block discarded – undo
404	409	echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
405	410	if ($x->count() > 1) {
406	411	foreach($x as $k => $y) {
407		- if ($k == 0) continue;
	412	+ if ($k == 0) {
	413	+ continue;
	414	+ }
408	415	echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
409	416	if ($wstype == 1 \|\| $wstype == 2) {
410	417	switch($y->scalarval()) {

		@@ -79,8 +79,8 @@
		block discarded – undo
79	79	<?php
80	80
81	81	global $inputcharset, $debug, $protocol, $run, $hasjsonrpcclient, $hasjsonrpc2, $wstype, $id, $host, $port, $path, $action,
82		- $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
83		- $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
	82	+ $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
	83	+ $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
84	84
85	85	include __DIR__ . '/common.php';
86	86

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	$method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
22	22	$proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
23	23
24		-include __DIR__ . '/common.php';
	24	+include __DIR__.'/common.php';
25	25
26	26	if ($action == '') {
27	27	$action = 'list';
		@@ -38,30 +38,30 @@ discard block
		block discarded – undo
38	38	/// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or
39	39	/// relative to this debugger's folder.
40	40	if (defined('JSXMLRPC_PATH')) {
41		- $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
	41	+ $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
42	42	} else {
43	43	$editorpaths = array(
44		- __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
45		- __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
46		- __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
47		- __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
48		- __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
49		- __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
50		- __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
51		- __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
52		- __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
53		- __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
	44	+ __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
	45	+ __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
	46	+ __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
	47	+ __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
	48	+ __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
	49	+ __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
	50	+ __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
	51	+ __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
	52	+ __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
	53	+ __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
54	54	);
55	55	}
56		- foreach($editorpaths as $editorpath) {
57		- if (is_file(realpath($editorpath . 'visualeditor.html'))) {
	56	+ foreach ($editorpaths as $editorpath) {
	57	+ if (is_file(realpath($editorpath.'visualeditor.html'))) {
58	58	$haseditor = true;
59	59	break;
60	60	}
61	61	}
62	62	if ($haseditor) {
63		- $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
64		- $editorurlpath = $controllerRootUrl . '/' . preg_replace('\|^' . preg_quote(__DIR__, '\|') .'\|', '', $editorpath);
	63	+ $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
	64	+ $editorurlpath = $controllerRootUrl.'/'.preg_replace('\|^'.preg_quote(__DIR__, '\|').'\|', '', $editorpath);
65	65	/// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly
66	66	/// at this folder, as in that case the link to the visualeditor will not
67	67	/// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	}
276	276
277	277	function activateeditor() {
278		- var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>';
	278	+ var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
279	279	if (document.frmaction.wstype.value == "1" \|\| document.frmaction.wstype.value == "2")
280	280	url += '&type=jsonrpc';
281	281	var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
		@@ -313,16 +313,16 @@ discard block
		block discarded – undo
313	313	} ?>">
314	314	<h1>XML-RPC
315	315	<?php if ($hasjsonrpcclient) {
316		- echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"' .
	316	+ echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'.
317	317	// q: does this check make sense at all?
318		- (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '') . ' /></form>';
	318	+ (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '').' /></form>';
319	319	if ($hasjsonrpc2) {
320	320	echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>JSON-RPC 2.0 ';
321	321	}
322	322	echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
323	323	} ?>
324	324	Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
325		-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
	325	+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
326	326	<form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
327	327
328	328	<table id="serverblock">
		@@ -384,7 +384,7 @@ discard block
		block discarded – undo
384	384	</select>
385	385	</td>
386	386	<td class="labelcell">Timeout:</td>
387		- <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
	387	+ <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
388	388	<td></td>
389	389	<td></td>
390	390	</tr>

		@@ -71,7 +71,12 @@ discard block
		block discarded – undo
71	71	<html lang="en">
72	72	<head>
73	73	<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
74		- <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 \|\| DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
	74	+ <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 \|\| DEFAULT_WSTYPE == 2)) {
	75	+ echo 'JSON-RPC';
	76	+} else {
	77	+ echo 'XML-RPC';
	78	+}
	79	+?> Debugger</title>
75	80	<meta name="robots" content="index,nofollow"/>
76	81	<script type="text/javascript" language="Javascript">
77	82	if (window.name != 'frmcontroller')
		@@ -308,8 +313,10 @@ discard block
		block discarded – undo
308	313	</script>
309	314	</head>
310	315	<body
311		- onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
	316	+ onload="<?php if ($hasjsonrpcclient) {
	317	+ echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
312	318	echo ' document.frmaction.submit();';
	319	+}
313	320	} ?>">
314	321	<h1>XML-RPC
315	322	<?php if ($hasjsonrpcclient) {
		@@ -322,7 +329,10 @@ discard block
		block discarded – undo
322	329	echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
323	330	} ?>
324	331	Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
325		-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
	332	+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) {
	333	+ echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion);
	334	+}
	335	+?>)</h3>
326	336	<form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
327	337
328	338	<table id="serverblock">

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	// assume this is either a standalone install, or installed as Composer dependency
21	21	/// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
22	22	/// debugger include this one, taking care of autoloading?
23		- include_once __DIR__ . "/../src/Autoloader.php";
	23	+ include_once __DIR__."/../src/Autoloader.php";
24	24	PhpXmlRpc\Autoloader::register();
25	25	}
26	26
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	}
35	35
36	36	// Variables that shouldn't be unset
37		- $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
	37	+ $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
38	38
39	39	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
40	40	isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
		@@ -86,8 +86,8 @@ discard block
		block discarded – undo
86	86	$wstype = defined('DEFAULT_WSTYPE') ? DEFAULT_WSTYPE : 0;
87	87	$id = '';
88	88	if (isset($_GET['action'])) {
89		- if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' \|\| $_GET['wstype'] == '1' \|\| $_GET['wstype'] == '0')) {
90		- $wstype = (int)$_GET['wstype'];
	89	+ if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' \|\| $_GET['wstype'] == '1' \|\| $_GET['wstype'] == '0')) {
	90	+ $wstype = (int) $_GET['wstype'];
91	91	if ($wstype === 1 \|\| $wstype === 2) {
92	92	if (!$hasjsonrpcclient) {
93	93	$wstype = 0;
		@@ -102,7 +102,7 @@ discard block
		block discarded – undo
102	102	$host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error...
103	103	if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' \|\| $_GET['protocol'] == '2' \|\| $_GET['protocol'] == '3'
104	104	\|\| $_GET['protocol'] == '4')) {
105		- $protocol = (int)$_GET['protocol'];
	105	+ $protocol = (int) $_GET['protocol'];
106	106	}
107	107	if (strpos($host, 'http://') === 0) {
108	108	// NB: if protocol is https or h2, it will override http://
		@@ -114,18 +114,18 @@ discard block
		block discarded – undo
114	114	$protocol = 2;
115	115	}
116	116	}
117		- $port = isset($_GET['port']) ? (int)$_GET['port'] : '';
	117	+ $port = isset($_GET['port']) ? (int) $_GET['port'] : '';
118	118	if ($port === 0) {
119	119	$port = '';
120	120	}
121	121	$path = isset($_GET['path']) ? $_GET['path'] : '';
122	122	// in case user forgot initial '/' in xml-rpc server path, add it back
123	123	if ($path && ($path[0]) != '/') {
124		- $path = '/' . $path;
	124	+ $path = '/'.$path;
125	125	}
126	126
127	127	if (isset($_GET['debug']) && ($_GET['debug'] == '1' \|\| $_GET['debug'] == '2')) {
128		- $debug = (int)$_GET['debug'];
	128	+ $debug = (int) $_GET['debug'];
129	129	}
130	130
131	131	$verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' \|\| $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	/// @todo what about an https proxy?
143	143	$proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
144	144	$proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
145		- $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0;
	145	+ $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0;
146	146	$action = $_GET['action'];
147	147
148	148	$method = isset($_GET['method']) ? $_GET['method'] : '';
		@@ -157,15 +157,15 @@ discard block
		block discarded – undo
157	157	$username = isset($_GET['username']) ? $_GET['username'] : '';
158	158	$password = isset($_GET['password']) ? $_GET['password'] : '';
159	159
160		- $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' \|\| $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1;
	160	+ $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' \|\| $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1;
161	161
162	162	if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' \|\| $_GET['requestcompression'] == '2')) {
163		- (int)$requestcompression = $_GET['requestcompression'];
	163	+ (int) $requestcompression = $_GET['requestcompression'];
164	164	} else {
165	165	$requestcompression = 0;
166	166	}
167	167	if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' \|\| $_GET['responsecompression'] == '2' \|\| $_GET['responsecompression'] == '3')) {
168		- $responsecompression = (int)$_GET['responsecompression'];
	168	+ $responsecompression = (int) $_GET['responsecompression'];
169	169	} else {
170	170	$responsecompression = 0;
171	171	}

gggeek / phpxmlrpc

Push — master ( 8b6717...c8a221 )

Status

Category

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

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

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

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

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

Braces +13 added lines, -3 removed lines patch added patch discarded remove patch

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