| @@ -57,9 +57,9 @@ discard block | ||
| 57 | 57 | ); | 
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | - public static function getOpts($args=array(), $cliOpts=array()) | |
| 60 | + public static function getOpts($args = array(), $cliOpts = array()) | |
| 61 | 61 |      { | 
| 62 | - if (count($args) > 0) | |
| 62 | + if (count($args)>0) | |
| 63 | 63 |          //    throw new \Exception('Missing library version argument'); | 
| 64 | 64 | self::$libVersion = $args[0]; | 
| 65 | 65 | |
| @@ -157,17 +157,17 @@ discard block | ||
| 157 | 157 | $out = ''; | 
| 158 | 158 |          while (($start = strpos($content, $startTag, $last)) !== false) { | 
| 159 | 159 | $end = strpos($content, $endTag, $start); | 
| 160 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); | |
| 161 | -            if ($code[strlen($code) - 1] == "\n") { | |
| 160 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); | |
| 161 | +            if ($code[strlen($code)-1] == "\n") { | |
| 162 | 162 | $code = substr($code, 0, -1); | 
| 163 | 163 | } | 
| 164 | 164 | |
| 165 | 165 |              $code = str_replace(array('>', '<'), array('>', '<'), $code); | 
| 166 | -            $code = highlight_string('<?php ' . $code, true); | |
| 166 | +            $code = highlight_string('<?php '.$code, true); | |
| 167 | 167 |              $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); | 
| 168 | 168 | |
| 169 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; | |
| 170 | - $last = $end + strlen($endTag); | |
| 169 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; | |
| 170 | + $last = $end+strlen($endTag); | |
| 171 | 171 | } | 
| 172 | 172 | $out .= substr($content, $last, strlen($content)); | 
| 173 | 173 | |
| @@ -181,7 +181,7 @@ discard block | ||
| 181 | 181 | |
| 182 | 182 | use PhpXmlRpc\Builder; | 
| 183 | 183 | |
| 184 | -function run_default($task=null, $args=array(), $cliOpts=array()) | |
| 184 | +function run_default($task = null, $args = array(), $cliOpts = array()) | |
| 185 | 185 |  { | 
| 186 | 186 |      echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; | 
| 187 | 187 | echo "\n"; | 
| @@ -198,7 +198,7 @@ discard block | ||
| 198 | 198 | echo " --zip=ZIP Location of the zip tool\n"; | 
| 199 | 199 | } | 
| 200 | 200 | |
| 201 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) | |
| 201 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) | |
| 202 | 202 |  { | 
| 203 | 203 | Builder::getOpts($args, $cliOpts); | 
| 204 | 204 | } | 
| @@ -206,7 +206,7 @@ discard block | ||
| 206 | 206 | /** | 
| 207 | 207 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag | 
| 208 | 208 | */ | 
| 209 | -function run_init($task=null, $args=array(), $cliOpts=array()) | |
| 209 | +function run_init($task = null, $args = array(), $cliOpts = array()) | |
| 210 | 210 |  { | 
| 211 | 211 | // download the current version into the workspace | 
| 212 | 212 | $targetDir = Builder::workspaceDir(); | 
| @@ -234,7 +234,7 @@ discard block | ||
| 234 | 234 | * | 
| 235 | 235 | * (does nothing by itself, as all the steps are managed via task dependencies) | 
| 236 | 236 | */ | 
| 237 | -function run_build($task=null, $args=array(), $cliOpts=array()) | |
| 237 | +function run_build($task = null, $args = array(), $cliOpts = array()) | |
| 238 | 238 |  { | 
| 239 | 239 | } | 
| 240 | 240 | |
| @@ -250,7 +250,7 @@ discard block | ||
| 250 | 250 | /** | 
| 251 | 251 | * Generates documentation in all formats | 
| 252 | 252 | */ | 
| 253 | -function run_doc($task=null, $args=array(), $cliOpts=array()) | |
| 253 | +function run_doc($task = null, $args = array(), $cliOpts = array()) | |
| 254 | 254 |  { | 
| 255 | 255 | $docDir = Builder::workspaceDir().'/doc'; | 
| 256 | 256 | |
| @@ -318,7 +318,7 @@ discard block | ||
| 318 | 318 | /** | 
| 319 | 319 | * Creates the tarballs for a release | 
| 320 | 320 | */ | 
| 321 | -function run_dist($task=null, $args=array(), $cliOpts=array()) | |
| 321 | +function run_dist($task = null, $args = array(), $cliOpts = array()) | |
| 322 | 322 |  { | 
| 323 | 323 | // copy workspace dir into dist dir, without git | 
| 324 | 324 | pake_mkdirs(Builder::distDir()); | 
| @@ -332,7 +332,7 @@ discard block | ||
| 332 | 332 | // create tarballs | 
| 333 | 333 | $cwd = getcwd(); | 
| 334 | 334 | chdir(dirname(Builder::distDir())); | 
| 335 | -    foreach(Builder::distFiles() as $distFile) { | |
| 335 | +    foreach (Builder::distFiles() as $distFile) { | |
| 336 | 336 | // php can not really create good zip files via phar: they are not compressed! | 
| 337 | 337 |          if (substr($distFile, -4) == '.zip') { | 
| 338 | 338 |              $cmd = Builder::tool('zip'); | 
| @@ -350,7 +350,7 @@ discard block | ||
| 350 | 350 | chdir($cwd); | 
| 351 | 351 | } | 
| 352 | 352 | |
| 353 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) | |
| 353 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) | |
| 354 | 354 |  { | 
| 355 | 355 | pake_remove_dir(Builder::workspaceDir()); | 
| 356 | 356 | } | 
| @@ -359,13 +359,13 @@ discard block | ||
| 359 | 359 | * Cleans up the whole build directory | 
| 360 | 360 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources | 
| 361 | 361 | */ | 
| 362 | -function run_clean($task=null, $args=array(), $cliOpts=array()) | |
| 362 | +function run_clean($task = null, $args = array(), $cliOpts = array()) | |
| 363 | 363 |  { | 
| 364 | 364 | pake_remove_dir(Builder::buildDir()); | 
| 365 | 365 | } | 
| 366 | 366 | |
| 367 | 367 | // helper task: display help text | 
| 368 | -pake_task( 'default' ); | |
| 368 | +pake_task('default'); | |
| 369 | 369 | // internal task: parse cli options | 
| 370 | 370 |  pake_task('getopts'); | 
| 371 | 371 |  pake_task('init', 'getopts'); | 
| @@ -15,7 +15,7 @@ discard block | ||
| 15 | 15 | // make sure we set the correct charset type for output, so that we can display all characters | 
| 16 | 16 |  header('Content-Type: text/html; charset=utf-8'); | 
| 17 | 17 | |
| 18 | -include __DIR__ . '/common.php'; | |
| 18 | +include __DIR__.'/common.php'; | |
| 19 | 19 |  if ($action == '') { | 
| 20 | 20 | $action = 'list'; | 
| 21 | 21 | } | 
| @@ -284,7 +284,7 @@ discard block | ||
| 284 | 284 | </select> | 
| 285 | 285 | </td> | 
| 286 | 286 | <td class="labelcell">Timeout:</td> | 
| 287 | -            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> | |
| 287 | +            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> | |
| 288 | 288 | <td class="labelcell">Protocol:</td> | 
| 289 | 289 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> | 
| 290 | 290 |                      <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> | 
| @@ -15,8 +15,7 @@ discard block | ||
| 15 | 15 | function stripslashes_deep($value) | 
| 16 | 16 |      { | 
| 17 | 17 | $value = is_array($value) ? | 
| 18 | -            array_map('stripslashes_deep', $value) : | |
| 19 | - stripslashes($value); | |
| 18 | +            array_map('stripslashes_deep', $value) : stripslashes($value); | |
| 20 | 19 | |
| 21 | 20 | return $value; | 
| 22 | 21 | } | 
| @@ -60,7 +59,7 @@ discard block | ||
| 60 | 59 | $path = isset($_GET['path']) ? $_GET['path'] : ''; | 
| 61 | 60 | // in case user forgot initial '/' in xmlrpc server path, add it back | 
| 62 | 61 |      if ($path && ($path[0]) != '/') { | 
| 63 | - $path = '/' . $path; | |
| 62 | + $path = '/'.$path; | |
| 64 | 63 | } | 
| 65 | 64 | |
| 66 | 65 |      if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { | 
| @@ -91,15 +91,15 @@ discard block | ||
| 91 | 91 | <body> | 
| 92 | 92 | <?php | 
| 93 | 93 | |
| 94 | -include __DIR__ . '/common.php'; | |
| 94 | +include __DIR__.'/common.php'; | |
| 95 | 95 |  if ($action) { | 
| 96 | 96 | |
| 97 | - include_once __DIR__ . "/../src/Autoloader.php"; | |
| 97 | + include_once __DIR__."/../src/Autoloader.php"; | |
| 98 | 98 | PhpXmlRpc\Autoloader::register(); | 
| 99 | 99 | |
| 100 | 100 | // make sure the script waits long enough for the call to complete... | 
| 101 | 101 |      if ($timeout) { | 
| 102 | - set_time_limit($timeout + 10); | |
| 102 | + set_time_limit($timeout+10); | |
| 103 | 103 | } | 
| 104 | 104 | |
| 105 | 105 |      if ($wstype == 1) { | 
| @@ -124,13 +124,13 @@ discard block | ||
| 124 | 124 | $server = "$host$path"; | 
| 125 | 125 | } | 
| 126 | 126 |      if ($protocol == 2) { | 
| 127 | - $server = 'https://' . $server; | |
| 127 | + $server = 'https://'.$server; | |
| 128 | 128 |      } else { | 
| 129 | - $server = 'http://' . $server; | |
| 129 | + $server = 'http://'.$server; | |
| 130 | 130 | } | 
| 131 | 131 |      if ($proxy != '') { | 
| 132 | 132 |          $pproxy = explode(':', $proxy); | 
| 133 | -        if (count($pproxy) > 1) { | |
| 133 | +        if (count($pproxy)>1) { | |
| 134 | 134 | $pport = $pproxy[1]; | 
| 135 | 135 |          } else { | 
| 136 | 136 | $pport = 8080; | 
| @@ -199,9 +199,9 @@ discard block | ||
| 199 | 199 | case 'wrap': | 
| 200 | 200 |              $msg[0] = new $requestClass('system.methodHelp', array(), $id); | 
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); | 
| 202 | -            $msg[1] = new $requestClass('system.methodSignature', array(), $id + 1); | |
| 202 | +            $msg[1] = new $requestClass('system.methodSignature', array(), $id+1); | |
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); | 
| 204 | - $actionname = 'Description of method "' . $method . '"'; | |
| 204 | + $actionname = 'Description of method "'.$method.'"'; | |
| 205 | 205 | break; | 
| 206 | 206 | case 'list': | 
| 207 | 207 |              $msg[0] = new $requestClass('system.listMethods', array(), $id); | 
| @@ -214,9 +214,9 @@ discard block | ||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); | 
| 215 | 215 | // hack! build xml payload by hand | 
| 216 | 216 |              if ($wstype == 1) { | 
| 217 | -                $msg[0]->payload = "{\n" . | |
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . | |
| 219 | - $payload . | |
| 217 | +                $msg[0]->payload = "{\n". | |
| 218 | + '"method": "'.$method."\",\n\"params\": [". | |
| 219 | + $payload. | |
| 220 | 220 | "\n],\n\"id\": "; | 
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax | 
| 222 | 222 |                  if ($id == "") { | 
| @@ -229,20 +229,20 @@ discard block | ||
| 229 | 229 | } | 
| 230 | 230 | } | 
| 231 | 231 |              } else { | 
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . | |
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . | |
| 234 | - $payload . | |
| 235 | - "</params>\n" . $msg[0]->xml_footer(); | |
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). | |
| 233 | + '<methodName>'.$method."</methodName>\n<params>". | |
| 234 | + $payload. | |
| 235 | + "</params>\n".$msg[0]->xml_footer(); | |
| 236 | 236 | } | 
| 237 | - $actionname = 'Execution of method ' . $method; | |
| 237 | + $actionname = 'Execution of method '.$method; | |
| 238 | 238 | break; | 
| 239 | 239 | default: // give a warning | 
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; | |
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; | |
| 241 | 241 | } | 
| 242 | 242 | |
| 243 | 243 | // Before calling execute, echo out brief description of action taken + date and time ??? | 
| 244 | 244 | // this gives good user feedback for long-running methods... | 
| 245 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; | |
| 245 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; | |
| 246 | 246 | flush(); | 
| 247 | 247 | |
| 248 | 248 | $response = null; | 
| @@ -260,7 +260,7 @@ discard block | ||
| 260 | 260 | break; | 
| 261 | 261 | } | 
| 262 | 262 | } | 
| 263 | - $time = microtime(true) - $time; | |
| 263 | + $time = microtime(true)-$time; | |
| 264 | 264 |      if ($debug) { | 
| 265 | 265 | echo "</div>\n"; | 
| 266 | 266 | } | 
| @@ -270,8 +270,8 @@ discard block | ||
| 270 | 270 | // call failed! echo out error msg! | 
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; | 
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; | 
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . | |
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; | |
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). | |
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; | |
| 275 | 275 |              echo(strftime("%d/%b/%Y:%H:%M:%S\n")); | 
| 276 | 276 |          } else { | 
| 277 | 277 | // call succeeded: parse results | 
| @@ -287,36 +287,36 @@ discard block | ||
| 287 | 287 | $max = $v->count(); | 
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; | 
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; | 
| 290 | -                        foreach($v as $i => $rec) { | |
| 290 | +                        foreach ($v as $i => $rec) { | |
| 291 | 291 |                              if ($i % 2) { | 
| 292 | 292 | $class = ' class="oddrow"'; | 
| 293 | 293 |                              } else { | 
| 294 | 294 | $class = ' class="evenrow"'; | 
| 295 | 295 | } | 
| 296 | -                            echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . | |
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . | |
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . | |
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . | |
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . | |
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . | |
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . | |
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . | |
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . | |
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . | |
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . | |
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . | |
| 296 | +                            echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". | |
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". | |
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". | |
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". | |
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". | |
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". | |
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". | |
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". | |
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". | |
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". | |
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". | |
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". | |
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". | |
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". | |
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". | |
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". | |
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". | |
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". | |
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". | |
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". | |
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". | |
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". | |
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". | |
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". | |
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); | 
| 321 | 321 |                              //echo("</tr>\n"); | 
| 322 | 322 | |
| @@ -343,7 +343,7 @@ discard block | ||
| 343 | 343 | $r2 = $resp[1]->value(); | 
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; | 
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; | |
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; | |
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); | 
| 348 | 348 |                      if ($desc == "") { | 
| 349 | 349 | $desc = "-"; | 
| @@ -353,41 +353,41 @@ discard block | ||
| 353 | 353 |                      if ($r2->kindOf() != "array") { | 
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; | 
| 355 | 355 |                      } else { | 
| 356 | -                        foreach($r2 as $i => $x) { | |
| 356 | +                        foreach ($r2 as $i => $x) { | |
| 357 | 357 | $payload = ""; | 
| 358 | 358 | $alt_payload = ""; | 
| 359 | -                            if ($i + 1 % 2) { | |
| 359 | +                            if ($i+1 % 2) { | |
| 360 | 360 | $class = ' class="oddrow"'; | 
| 361 | 361 |                              } else { | 
| 362 | 362 | $class = ' class="evenrow"'; | 
| 363 | 363 | } | 
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; | |
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; | |
| 365 | 365 |                              if ($x->kindOf() == "array") { | 
| 366 | 366 | $ret = $x[0]; | 
| 367 | -                                echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; | |
| 368 | -                                if ($x->count() > 1) { | |
| 369 | -                                    foreach($x as $k => $y) { | |
| 367 | +                                echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; | |
| 368 | +                                if ($x->count()>1) { | |
| 369 | +                                    foreach ($x as $k => $y) { | |
| 370 | 370 | if ($k == 0) continue; | 
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); | 
| 372 | 372 |                                          if ($wstype != 1) { | 
| 373 | 373 | $type = $y->scalarval(); | 
| 374 | 374 | $payload .= '<param><value>'; | 
| 375 | -                                            switch($type) { | |
| 375 | +                                            switch ($type) { | |
| 376 | 376 | case 'undefined': | 
| 377 | 377 | break; | 
| 378 | 378 | case 'null'; | 
| 379 | 379 | $type = 'nil'; | 
| 380 | 380 | // fall thru intentionally | 
| 381 | 381 | default: | 
| 382 | - $payload .= '<' . | |
| 383 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . | |
| 384 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . | |
| 382 | + $payload .= '<'. | |
| 383 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). | |
| 384 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). | |
| 385 | 385 | '>'; | 
| 386 | 386 | } | 
| 387 | 387 | $payload .= "</value></param>\n"; | 
| 388 | 388 | } | 
| 389 | 389 | $alt_payload .= $y->scalarval(); | 
| 390 | -                                        if ($k < $x->count() - 1) { | |
| 390 | +                                        if ($k<$x->count()-1) { | |
| 391 | 391 | $alt_payload .= ';'; | 
| 392 | 392 | echo ", "; | 
| 393 | 393 | } | 
| @@ -400,63 +400,63 @@ discard block | ||
| 400 | 400 | echo '</td>'; | 
| 401 | 401 | // button to test this method | 
| 402 | 402 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; | 
| 403 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . | |
| 404 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 405 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 406 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 407 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 408 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . | |
| 409 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 410 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 411 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . | |
| 412 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . | |
| 413 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . | |
| 414 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 415 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 416 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 417 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 418 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . | |
| 419 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . | |
| 420 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 421 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . | |
| 422 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 423 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 424 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 425 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 426 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . | |
| 403 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". | |
| 404 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". | |
| 405 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". | |
| 406 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". | |
| 407 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". | |
| 408 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". | |
| 409 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". | |
| 410 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". | |
| 411 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". | |
| 412 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". | |
| 413 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". | |
| 414 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". | |
| 415 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". | |
| 416 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". | |
| 417 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". | |
| 418 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". | |
| 419 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". | |
| 420 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". | |
| 421 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". | |
| 422 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". | |
| 423 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". | |
| 424 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". | |
| 425 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". | |
| 426 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". | |
| 427 | 427 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; | 
| 428 | 428 |                              if ($wstype != 1) { | 
| 429 | 429 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; | 
| 430 | 430 | } | 
| 431 | 431 | echo "</form></td>\n"; | 
| 432 | 432 | |
| 433 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . | |
| 434 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 435 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 436 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 437 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 438 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . | |
| 439 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 440 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 441 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . | |
| 442 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . | |
| 443 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . | |
| 444 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 445 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 446 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 447 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 448 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . | |
| 449 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . | |
| 450 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 451 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . | |
| 452 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 453 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 454 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . | |
| 455 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 456 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . | |
| 457 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . | |
| 458 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . | |
| 459 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . | |
| 433 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". | |
| 434 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". | |
| 435 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". | |
| 436 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". | |
| 437 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". | |
| 438 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". | |
| 439 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". | |
| 440 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". | |
| 441 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". | |
| 442 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". | |
| 443 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". | |
| 444 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". | |
| 445 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". | |
| 446 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". | |
| 447 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". | |
| 448 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". | |
| 449 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". | |
| 450 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". | |
| 451 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". | |
| 452 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". | |
| 453 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". | |
| 454 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". | |
| 455 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". | |
| 456 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". | |
| 457 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". | |
| 458 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". | |
| 459 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". | |
| 460 | 460 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; | 
| 461 | 461 | echo "</form></td></tr>\n"; | 
| 462 | 462 | } | 
| @@ -468,7 +468,7 @@ discard block | ||
| 468 | 468 | case 'wrap': | 
| 469 | 469 | $r1 = $resp[0]->value(); | 
| 470 | 470 | $r2 = $resp[1]->value(); | 
| 471 | -                    if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { | |
| 471 | +                    if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { | |
| 472 | 472 | echo "Error: signature unknown\n"; | 
| 473 | 473 |                      } else { | 
| 474 | 474 | $mdesc = $r1->scalarval(); | 
| @@ -489,11 +489,11 @@ discard block | ||
| 489 | 489 | $prefix = 'xmlrpc'; | 
| 490 | 490 | } | 
| 491 | 491 | $wrapper = new PhpXmlRpc\Wrapper(); | 
| 492 | -                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); | |
| 492 | +                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); | |
| 493 | 493 | //if ($code) | 
| 494 | 494 |                          //{ | 
| 495 | 495 | echo "<div id=\"phpcode\">\n"; | 
| 496 | -                        highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); | |
| 496 | +                        highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); | |
| 497 | 497 | echo "\n</div>"; | 
| 498 | 498 | //} | 
| 499 | 499 | //else | 
| @@ -504,7 +504,7 @@ discard block | ||
| 504 | 504 | break; | 
| 505 | 505 | |
| 506 | 506 | case 'execute': | 
| 507 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; | |
| 507 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; | |
| 508 | 508 | break; | 
| 509 | 509 | |
| 510 | 510 | default: // give a warning | 
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 |  if (isset($_GET['run'])) { | 
| 4 | 4 | $path = parse_url($_GET['run']); | 
| 5 | 5 |      if (isset($path['query'])) { | 
| 6 | - $query = '?' . $path['query']; | |
| 6 | + $query = '?'.$path['query']; | |
| 7 | 7 | } | 
| 8 | 8 | } | 
| 9 | 9 | ?> | 
| @@ -1,6 +1,6 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/parse_args.php'; | |
| 3 | +include_once __DIR__.'/parse_args.php'; | |
| 4 | 4 | |
| 5 | 5 | abstract class PhpXmlRpc_LocalFileTestCase extends PHPUnit_Framework_TestCase | 
| 6 | 6 |  { | 
| @@ -15,7 +15,7 @@ discard block | ||
| 15 | 15 | |
| 16 | 16 | public function run(PHPUnit_Framework_TestResult $result = NULL) | 
| 17 | 17 |      { | 
| 18 | - $this->testId = get_class($this) . '__' . $this->getName(); | |
| 18 | + $this->testId = get_class($this).'__'.$this->getName(); | |
| 19 | 19 | |
| 20 | 20 |          if ($result === NULL) { | 
| 21 | 21 | $result = $this->createResult(); | 
| @@ -43,7 +43,7 @@ discard block | ||
| 43 | 43 | |
| 44 | 44 | protected function request($file, $method = 'GET', $payload = '', $emptyPageOk = false) | 
| 45 | 45 |      { | 
| 46 | - $url = $this->baseUrl . $file; | |
| 46 | + $url = $this->baseUrl.$file; | |
| 47 | 47 | |
| 48 | 48 | $ch = curl_init($url); | 
| 49 | 49 | curl_setopt_array($ch, array( | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 |          { | 
| 62 | 62 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); | 
| 63 | 63 | } | 
| 64 | -        if ($this->args['DEBUG'] > 0) { | |
| 64 | +        if ($this->args['DEBUG']>0) { | |
| 65 | 65 | curl_setopt($ch, CURLOPT_VERBOSE, 1); | 
| 66 | 66 | } | 
| 67 | 67 | $page = curl_exec($ch); | 
| @@ -17,8 +17,8 @@ discard block | ||
| 17 | 17 | // test for php version | 
| 18 | 18 | $ver = phpversion(); | 
| 19 | 19 | $tests['php_version'] = array(); | 
| 20 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; | |
| 21 | -        if (version_compare($ver, '5.3.0') < 0) { | |
| 20 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; | |
| 21 | +        if (version_compare($ver, '5.3.0')<0) { | |
| 22 | 22 | $tests['php_version']['status'] = 0; | 
| 23 | 23 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later'; | 
| 24 | 24 |          } else { | 
| @@ -51,8 +51,8 @@ discard block | ||
| 51 | 51 | // test for php version | 
| 52 | 52 | $ver = phpversion(); | 
| 53 | 53 | $tests['php_version'] = array(); | 
| 54 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; | |
| 55 | -        if (version_compare($ver, '5.3.0') < 0) { | |
| 54 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; | |
| 55 | +        if (version_compare($ver, '5.3.0')<0) { | |
| 56 | 56 | $tests['php_version']['status'] = 0; | 
| 57 | 57 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later'; | 
| 58 | 58 |          } else { | 
| @@ -79,7 +79,7 @@ discard block | ||
| 79 | 79 | $info = curl_version(); | 
| 80 | 80 | $tests['curl']['status'] = 2; | 
| 81 | 81 | $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols"; | 
| 82 | -            if (version_compare($ver, '4.3.8') < 0) { | |
| 82 | +            if (version_compare($ver, '4.3.8')<0) { | |
| 83 | 83 | $tests['curl']['status'] = 1; | 
| 84 | 84 | $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives"; | 
| 85 | 85 | } | 
| @@ -167,7 +167,7 @@ discard block | ||
| 167 | 167 | <?php | 
| 168 | 168 |      $res = phpxmlrpc_verify_compat('server'); | 
| 169 | 169 |      foreach ($res as $test => $result) { | 
| 170 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; | |
| 170 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; | |
| 171 | 171 | } | 
| 172 | 172 | ?> | 
| 173 | 173 | </tbody> | 
| @@ -184,7 +184,7 @@ discard block | ||
| 184 | 184 | <?php | 
| 185 | 185 |      $res = phpxmlrpc_verify_compat('client'); | 
| 186 | 186 |      foreach ($res as $test => $result) { | 
| 187 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; | |
| 187 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; | |
| 188 | 188 | } | 
| 189 | 189 | ?> | 
| 190 | 190 | </tbody> | 
| @@ -1,6 +1,6 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/LocalFileTestCase.php'; | |
| 3 | +include_once __DIR__.'/LocalFileTestCase.php'; | |
| 4 | 4 | |
| 5 | 5 | class DebuggerTest extends PhpXmlRpc_LocalFileTestCase | 
| 6 | 6 |  { | 
| @@ -8,9 +8,9 @@ discard block | ||
| 8 | 8 |      { | 
| 9 | 9 | $this->args = argParser::getArgs(); | 
| 10 | 10 | |
| 11 | - $this->baseUrl = $this->args['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['URI'] ); | |
| 11 | +        $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['URI']); | |
| 12 | 12 | |
| 13 | - $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] ); | |
| 13 | +        $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']); | |
| 14 | 14 | } | 
| 15 | 15 | |
| 16 | 16 | public function testIndex() | 
| @@ -17,9 +17,9 @@ discard block | ||
| 17 | 17 | use PhpXmlRpc\Response; | 
| 18 | 18 | use PhpXmlRpc\Encoder; | 
| 19 | 19 | |
| 20 | -include_once __DIR__ . '/../vendor/autoload.php'; | |
| 20 | +include_once __DIR__.'/../vendor/autoload.php'; | |
| 21 | 21 | |
| 22 | -include __DIR__ . '/parse_args.php'; | |
| 22 | +include __DIR__.'/parse_args.php'; | |
| 23 | 23 | $args = argParser::getArgs(); | 
| 24 | 24 | |
| 25 | 25 | function begin_test($test_name, $test_case) | 
| @@ -39,7 +39,7 @@ discard block | ||
| 39 | 39 |      if (!isset($test_results[$test_name][$test_case])) { | 
| 40 | 40 |          trigger_error('ending test that was not started'); | 
| 41 | 41 | } | 
| 42 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; | |
| 42 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; | |
| 43 | 43 | $test_results[$test_name][$test_case]['result'] = $test_result; | 
| 44 | 44 | echo '.'; | 
| 45 | 45 | flush(); | 
| @@ -73,24 +73,24 @@ discard block | ||
| 73 | 73 | } | 
| 74 | 74 | |
| 75 | 75 |  if ($is_web) { | 
| 76 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; | |
| 76 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; | |
| 77 | 77 |      if ($xd) { | 
| 78 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; | |
| 78 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; | |
| 79 | 79 | } | 
| 80 | 80 | flush(); | 
| 81 | 81 | ob_flush(); | 
| 82 | 82 |  } else { | 
| 83 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; | |
| 83 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; | |
| 84 | 84 |      if ($xd) { | 
| 85 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; | |
| 85 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; | |
| 86 | 86 | } | 
| 87 | 87 | } | 
| 88 | 88 | |
| 89 | 89 | // test 'manual style' data encoding vs. 'automatic style' encoding | 
| 90 | 90 |  begin_test('Data encoding (large array)', 'manual encoding'); | 
| 91 | -for ($i = 0; $i < $num_tests; $i++) { | |
| 91 | +for ($i = 0; $i<$num_tests; $i++) { | |
| 92 | 92 | $vals = array(); | 
| 93 | -    for ($j = 0; $j < 10; $j++) { | |
| 93 | +    for ($j = 0; $j<10; $j++) { | |
| 94 | 94 | $valarray = array(); | 
| 95 | 95 |          foreach ($data[$j] as $key => $val) { | 
| 96 | 96 | $values = array(); | 
| @@ -115,7 +115,7 @@ discard block | ||
| 115 | 115 | |
| 116 | 116 |  begin_test('Data encoding (large array)', 'automatic encoding'); | 
| 117 | 117 | $encoder = new Encoder(); | 
| 118 | -for ($i = 0; $i < $num_tests; $i++) { | |
| 118 | +for ($i = 0; $i<$num_tests; $i++) { | |
| 119 | 119 |      $value = $encoder->encode($data, array('auto_dates')); | 
| 120 | 120 | $out = $value->serialize(); | 
| 121 | 121 | } | 
| @@ -123,8 +123,8 @@ discard block | ||
| 123 | 123 | |
| 124 | 124 |  if (function_exists('xmlrpc_set_type')) { | 
| 125 | 125 |      begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); | 
| 126 | -    for ($i = 0; $i < $num_tests; $i++) { | |
| 127 | -        for ($j = 0; $j < 10; $j++) { | |
| 126 | +    for ($i = 0; $i<$num_tests; $i++) { | |
| 127 | +        for ($j = 0; $j<10; $j++) { | |
| 128 | 128 |              foreach ($keys as $k) { | 
| 129 | 129 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); | 
| 130 | 130 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); | 
| @@ -138,18 +138,18 @@ discard block | ||
| 138 | 138 | // test 'old style' data decoding vs. 'automatic style' decoding | 
| 139 | 139 |  $dummy = new Request(''); | 
| 140 | 140 | $out = new Response($value); | 
| 141 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); | |
| 141 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); | |
| 142 | 142 | |
| 143 | 143 |  begin_test('Data decoding (large array)', 'manual decoding'); | 
| 144 | -for ($i = 0; $i < $num_tests; $i++) { | |
| 144 | +for ($i = 0; $i<$num_tests; $i++) { | |
| 145 | 145 | $response = $dummy->ParseResponse($in, true); | 
| 146 | 146 | $value = $response->value(); | 
| 147 | 147 | $result = array(); | 
| 148 | -    foreach($value as $val1) { | |
| 148 | +    foreach ($value as $val1) { | |
| 149 | 149 | $out = array(); | 
| 150 | -        foreach($val1 as $name => $val) { | |
| 150 | +        foreach ($val1 as $name => $val) { | |
| 151 | 151 | $out[$name] = array(); | 
| 152 | -            foreach($val as $data) { | |
| 152 | +            foreach ($val as $data) { | |
| 153 | 153 | $out[$name][] = $data->scalarval(); | 
| 154 | 154 | } | 
| 155 | 155 | } | 
| @@ -159,18 +159,18 @@ discard block | ||
| 159 | 159 |  end_test('Data decoding (large array)', 'manual decoding', $result); | 
| 160 | 160 | |
| 161 | 161 |  begin_test('Data decoding (large array)', 'manual decoding deprecated'); | 
| 162 | -for ($i = 0; $i < $num_tests; $i++) { | |
| 162 | +for ($i = 0; $i<$num_tests; $i++) { | |
| 163 | 163 | $response = $dummy->ParseResponse($in, true); | 
| 164 | 164 | $value = $response->value(); | 
| 165 | 165 | $result = array(); | 
| 166 | 166 | $l = $value->arraysize(); | 
| 167 | -    for ($k = 0; $k < $l; $k++) { | |
| 167 | +    for ($k = 0; $k<$l; $k++) { | |
| 168 | 168 | $val1 = $value->arraymem($k); | 
| 169 | 169 | $out = array(); | 
| 170 | 170 |          while (list($name, $val) = $val1->structeach()) { | 
| 171 | 171 | $out[$name] = array(); | 
| 172 | 172 | $m = $val->arraysize(); | 
| 173 | -            for ($j = 0; $j < $m; $j++) { | |
| 173 | +            for ($j = 0; $j<$m; $j++) { | |
| 174 | 174 | $data = $val->arraymem($j); | 
| 175 | 175 | $out[$name][] = $data->scalarval(); | 
| 176 | 176 | } | 
| @@ -181,7 +181,7 @@ discard block | ||
| 181 | 181 |  end_test('Data decoding (large array)', 'manual decoding deprecated', $result); | 
| 182 | 182 | |
| 183 | 183 |  begin_test('Data decoding (large array)', 'automatic decoding'); | 
| 184 | -for ($i = 0; $i < $num_tests; $i++) { | |
| 184 | +for ($i = 0; $i<$num_tests; $i++) { | |
| 185 | 185 | $response = $dummy->ParseResponse($in, true, 'phpvals'); | 
| 186 | 186 | $value = $response->value(); | 
| 187 | 187 | } | 
| @@ -189,7 +189,7 @@ discard block | ||
| 189 | 189 | |
| 190 | 190 |  if (function_exists('xmlrpc_decode')) { | 
| 191 | 191 |      begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); | 
| 192 | -    for ($i = 0; $i < $num_tests; $i++) { | |
| 192 | +    for ($i = 0; $i<$num_tests; $i++) { | |
| 193 | 193 | $response = $dummy->ParseResponse($in, true, 'xml'); | 
| 194 | 194 | $value = xmlrpc_decode($response->value()); | 
| 195 | 195 | } | 
| @@ -203,15 +203,15 @@ discard block | ||
| 203 | 203 |      $value = $encoder->encode($data1, array('auto_dates')); | 
| 204 | 204 |      $req = new Request('interopEchoTests.echoValue', array($value)); | 
| 205 | 205 | $reqs = array(); | 
| 206 | -    for ($i = 0; $i < 25; $i++) { | |
| 206 | +    for ($i = 0; $i<25; $i++) { | |
| 207 | 207 | $reqs[] = $req; | 
| 208 | 208 | } | 
| 209 | 209 |      $server = explode(':', $args['LOCALSERVER']); | 
| 210 | -    if (count($server) > 1) { | |
| 211 | - $srv = $server[1] . '://' . $server[0] . $args['URI']; | |
| 210 | +    if (count($server)>1) { | |
| 211 | + $srv = $server[1].'://'.$server[0].$args['URI']; | |
| 212 | 212 | $c = new Client($args['URI'], $server[0], $server[1]); | 
| 213 | 213 |      } else { | 
| 214 | - $srv = $args['LOCALSERVER'] . $args['URI']; | |
| 214 | + $srv = $args['LOCALSERVER'].$args['URI']; | |
| 215 | 215 | $c = new Client($args['URI'], $args['LOCALSERVER']); | 
| 216 | 216 | } | 
| 217 | 217 | // do not interfere with http compression | 
| @@ -225,7 +225,7 @@ discard block | ||
| 225 | 225 | } | 
| 226 | 226 | begin_test($testName, 'http 10'); | 
| 227 | 227 | $response = array(); | 
| 228 | -    for ($i = 0; $i < 25; $i++) { | |
| 228 | +    for ($i = 0; $i<25; $i++) { | |
| 229 | 229 | $resp = $c->send($req); | 
| 230 | 230 | $response[] = $resp->value(); | 
| 231 | 231 | } | 
| @@ -234,7 +234,7 @@ discard block | ||
| 234 | 234 |      if (function_exists('curl_init')) { | 
| 235 | 235 | begin_test($testName, 'http 11 w. keep-alive'); | 
| 236 | 236 | $response = array(); | 
| 237 | -        for ($i = 0; $i < 25; $i++) { | |
| 237 | +        for ($i = 0; $i<25; $i++) { | |
| 238 | 238 | $resp = $c->send($req, 10, 'http11'); | 
| 239 | 239 | $response[] = $resp->value(); | 
| 240 | 240 | } | 
| @@ -243,7 +243,7 @@ discard block | ||
| 243 | 243 | $c->keepalive = false; | 
| 244 | 244 | begin_test($testName, 'http 11'); | 
| 245 | 245 | $response = array(); | 
| 246 | -        for ($i = 0; $i < 25; $i++) { | |
| 246 | +        for ($i = 0; $i<25; $i++) { | |
| 247 | 247 | $resp = $c->send($req, 10, 'http11'); | 
| 248 | 248 | $response[] = $resp->value(); | 
| 249 | 249 | } | 
| @@ -263,7 +263,7 @@ discard block | ||
| 263 | 263 | |
| 264 | 264 | begin_test($testName, 'http 10 w. compression'); | 
| 265 | 265 | $response = array(); | 
| 266 | -        for ($i = 0; $i < 25; $i++) { | |
| 266 | +        for ($i = 0; $i<25; $i++) { | |
| 267 | 267 | $resp = $c->send($req); | 
| 268 | 268 | $response[] = $resp->value(); | 
| 269 | 269 | } | 
| @@ -272,7 +272,7 @@ discard block | ||
| 272 | 272 |          if (function_exists('curl_init')) { | 
| 273 | 273 | begin_test($testName, 'http 11 w. keep-alive and compression'); | 
| 274 | 274 | $response = array(); | 
| 275 | -            for ($i = 0; $i < 25; $i++) { | |
| 275 | +            for ($i = 0; $i<25; $i++) { | |
| 276 | 276 | $resp = $c->send($req, 10, 'http11'); | 
| 277 | 277 | $response[] = $resp->value(); | 
| 278 | 278 | } | 
| @@ -281,7 +281,7 @@ discard block | ||
| 281 | 281 | $c->keepalive = false; | 
| 282 | 282 | begin_test($testName, 'http 11 w. compression'); | 
| 283 | 283 | $response = array(); | 
| 284 | -            for ($i = 0; $i < 25; $i++) { | |
| 284 | +            for ($i = 0; $i<25; $i++) { | |
| 285 | 285 | $resp = $c->send($req, 10, 'http11'); | 
| 286 | 286 | $response[] = $resp->value(); | 
| 287 | 287 | } | 
| @@ -302,7 +302,7 @@ discard block | ||
| 302 | 302 |  foreach ($test_results as $test => $results) { | 
| 303 | 303 | echo "\nTEST: $test\n"; | 
| 304 | 304 |      foreach ($results as $case => $data) { | 
| 305 | -        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; | |
| 305 | +        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; | |
| 306 | 306 | } | 
| 307 | 307 | } | 
| 308 | 308 | |