gggeek / phpxmlrpc

src/Helper/XMLParser.php

Spacing +30 added lines, -30 removed lines

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

debugger/action.php

Spacing +113 added lines, -113 removed lines

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

Braces +9 added lines, -2 removed lines

@@ -17,7 +17,12 @@ 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSONRPC';
+} else {
+    echo 'XMLRPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <style type="text/css">
         <!--
@@ -366,7 +371,9 @@ 
                                 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) {
                                             $type = $y->scalarval();

debugger/common.php

Spacing +4 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
     // 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();
 }
 
@@ -33,7 +33,7 @@ 
         }
 
         // 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()
@@ -53,8 +53,7 @@ 
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
-            array_map('stripslashes_deep', $value) :
-            stripslashes($value);
+            array_map('stripslashes_deep', $value) : stripslashes($value);
 
         return $value;
     }
@@ -99,7 +98,7 @@ 
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {

debugger/controller.php

Spacing +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@ 
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
 
 // Relative path to the visual xmlrpc editing dialog
 // We allow to easily configure this path via defines
-$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/';
-$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/';
+$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/';
+$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -230,9 +230,9 @@ 
         echo ' document.forms[2].submit();';
     } ?>">
 <h1>XMLRPC
-    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     /
-    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     JSONRPC Debugger (based on the <a href="http://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library)
 </h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
@@ -287,7 +287,7 @@ 
                 </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 class="labelcell">Protocol:</td>
             <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
                     <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option>

Braces +6 added lines, -1 removed lines

@@ -32,7 +32,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSONRPC';
+} else {
+    echo 'XMLRPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <script type="text/javascript" language="Javascript">
         if (window.name != 'frmcontroller')

tests/4ClientTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 
@@ -58,7 +58,7 @@ 
         $this->client->server .= 'XXX';
         $dnsinfo = @dns_get_record($this->client->server);
         if ($dnsinfo) {
-            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found');
+            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found');
         } else {
             $r = $this->client->send($m, 5);
             // make sure there's no freaking catchall DNS in effect
@@ -85,7 +85,7 @@ 
 
         // now test a successful connection
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client->port = $server[1];
         }
         $this->client->server = $server[0];

Braces +6 added lines, -4 removed lines

@@ -24,14 +24,16 @@
         $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80);
         $this->client->setDebug($this->args['DEBUG']);
 
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

tests/5ServerTest.php

Braces +6 added lines, -4 removed lines

@@ -107,14 +107,16 @@
 
         $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
 
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

Spacing +32 added lines, -32 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestResult;
@@ -42,7 +42,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            for ($i = 0; $i < count($trace); $i++) {
+            for ($i = 0; $i<count($trace); $i++) {
                 if (strpos($trace[$i]['function'], 'test') === 0) {
                     self::$failed_tests[$trace[$i]['function']] = true;
                     break;
@@ -65,7 +65,7 @@ 
      */
     public function _run($result = NULL)
     {
-        $this->testId = get_class($this) . '__' . $this->getName();
+        $this->testId = get_class($this).'__'.$this->getName();
 
         if ($result === NULL) {
             $result = $this->createResult();
@@ -96,7 +96,7 @@ 
         $this->args = argParser::getArgs();
 
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
@@ -106,7 +106,7 @@ 
         $this->client->request_compression = $this->request_compression;
         $this->client->accepted_compression = $this->accepted_compression;
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
 
         if ($this->args['DEBUG'] == 1)
             ob_start();
@@ -143,9 +143,9 @@ 
         }
         $this->validateResponse($r);
         if (is_array($errorCode)) {
-            $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         } else {
-            $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         }
         if (!$r->faultCode()) {
             if ($returnResponse) {
@@ -172,20 +172,20 @@ 
         $query = parse_url($this->client->path, PHP_URL_QUERY);
         parse_str($query, $vars);
         $query = http_build_query(array_merge($vars, $data));
-        $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
+        $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
     }
 
     public function testString()
     {
-        $sendString = "here are 3 \"entities\": < > & " .
-            "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
-            " - isn't that great? \\\"hackery\\\" at it's best " .
-            " also don't want to miss out on \$item[0]. " .
-            "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
-            "a simple CR here" . chr(13) .
-            "a simple LF here" . chr(10) .
-            "and then LFCR" . chr(10) . chr(13) .
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
+        $sendString = "here are 3 \"entities\": < > & ".
+            "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
+            " - isn't that great? \\\"hackery\\\" at it's best ".
+            " also don't want to miss out on \$item[0]. ".
+            "The real weird stuff follows: CRLF here".chr(13).chr(10).
+            "a simple CR here".chr(13).
+            "a simple LF here".chr(10).
+            "and then LFCR".chr(10).chr(13).
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
         $m = new xmlrpcmsg('examples.stringecho', array(
             new xmlrpcval($sendString, 'string'),
         ));
@@ -206,7 +206,7 @@ 
     public function testLatin1String()
     {
         $sendString =
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
         $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
             $sendString.
             '</value></param></params></methodCall>';
@@ -310,7 +310,7 @@ 
     public function testUtf8Method()
     {
         PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
-        $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
+        $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
             new xmlrpcval('hello')
         ));
         $v = $this->send($m);
@@ -332,7 +332,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -344,7 +344,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -378,7 +378,7 @@ 
         if ($v) {
             $sz = $v->arraysize();
             $got = '';
-            for ($i = 0; $i < $sz; $i++) {
+            for ($i = 0; $i<$sz; $i++) {
                 $b = $v->arraymem($i);
                 if ($b->scalarval()) {
                     $got .= '1';
@@ -441,7 +441,7 @@ 
             $got = '';
             $expected = '37210';
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
-            foreach($expect_array as $val) {
+            foreach ($expect_array as $val) {
                 $b = $v->structmem($val);
                 $got .= $b->me['int'];
             }
@@ -894,7 +894,7 @@ 
     {
         // make a 'deep client copy' as the original one might have many properties set
         // also for speed only wrap one method of the whole server
-        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
+        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
         if ($class == '') {
             $this->fail('Registration of remote server failed');
         } else {
@@ -933,9 +933,9 @@ 
         $cookies = array(
             //'c1' => array(),
             'c2' => array('value' => 'c2'),
-            'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
-            'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
-            'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
+            'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
+            'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
+            'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
         );
         $cookiesval = php_xmlrpc_encode($cookies);
         $m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
@@ -983,10 +983,10 @@ 
         $m = new xmlrpcmsg('examples.getcookies', array());
         foreach ($cookies as $cookie => $val) {
             $this->client->setCookie($cookie, $val);
-            $cookies[$cookie] = (string)$cookies[$cookie];
+            $cookies[$cookie] = (string) $cookies[$cookie];
         }
         $r = $this->client->send($m, $this->timeout, $this->method);
-        $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+        $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         if (!$r->faultCode()) {
             $v = $r->value();
             $v = php_xmlrpc_decode($v);

tests/0CharsetTest.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
  * @author JoakimLofgren
  */
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PhpXmlRpc\Helper\Charset;
 
@@ -32,10 +32,10 @@ 
     {
         // construct a latin string with all chars (except control ones)
         $this->latinString = "\n\r\t";
-        for($i = 32; $i < 127; $i++) {
+        for ($i = 32; $i<127; $i++) {
             $this->latinString .= chr($i);
         }
-        for($i = 160; $i < 256; $i++) {
+        for ($i = 160; $i<256; $i++) {
             $this->latinString .= chr($i);
         }
     }

tests/3EncoderTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpcs.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpcs.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 

Braces +6 added lines, -4 removed lines

@@ -21,14 +21,16 @@
     protected function set_up()
     {
         $this->args = argParser::getArgs();
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

tests/2MessageTest.php

Spacing +17 added lines, -17 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpcs.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpcs.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 
@@ -103,7 +103,7 @@ 
 
     public function testI8()
     {
-        if (PHP_INT_SIZE == 4 ) {
+        if (PHP_INT_SIZE == 4) {
             $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode');
             return;
         }
@@ -133,7 +133,7 @@ 
 
     public function testUnicodeInMemberName()
     {
-        $str = "G" . chr(252) . "nter, El" . chr(232) . "ne";
+        $str = "G".chr(252)."nter, El".chr(232)."ne";
         $v = array($str => new xmlrpcval(1));
         $r = new xmlrpcresp(new xmlrpcval($v, 'struct'));
         $r = $r->serialize();
@@ -149,7 +149,7 @@ 
             '<?xml version="1.0"?>
 <!-- $Id -->
 <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments -->
-<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
+<!-- ' . chr(224).chr(252).chr(232).'&#224;&#252;&#232; -->
 <methodResponse>
 <fault>
 <value>
@@ -160,7 +160,7 @@ 
 </member>
 <member>
 <name>faultString</name>
-<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
+<value><string>' . chr(224).chr(252).chr(232).'&#224;&#252;&#232;</string></value>
 </member>
 </struct>
 </value>
@@ -169,7 +169,7 @@ 
         $m = $this->newMsg('dummy');
         $r = $m->parseResponse($response);
         $v = $r->faultString();
-        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
+        $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v);
     }
 
     public function testBrokenRequests()
@@ -409,11 +409,11 @@ 
 
     public function testUTF8Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newMsg('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -421,7 +421,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -437,11 +437,11 @@ 
 
     public function testLatin1Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newMsg('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -449,7 +449,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();

Braces +6 added lines, -4 removed lines

@@ -21,14 +21,16 @@
     protected function set_up()
     {
         $this->args = argParser::getArgs();
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR