Inspection of "more gha ci fixes" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 0c11b8...7877a8 )

by Gaetano

created 2022-11-23 18:29 UTC

Status

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
     // assume this is either a standalone install, or installed as Composer dependency
     /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
     ///       debugger include this one, taking care of autoloading ?
-    include_once __DIR__ . "/../src/Autoloader.php";
+    include_once __DIR__."/../src/Autoloader.php";
     PhpXmlRpc\Autoloader::register();
 }
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
         }
 
         // Variables that shouldn't be unset
-        $noUnset = array('GLOBALS',  '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
+        $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
@@ -53,8 +53,7 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     $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')) {

Please login to merge, or discard this patch.

debugger/controller.php 2 patches

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

@@ -17,15 +17,15 @@  discard block
 block discarded – undo
 // 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td 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>

Please login to merge, or discard this patch.

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

@@ -32,7 +32,12 @@
 block discarded – undo
 <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')

Please login to merge, or discard this patch.

tests/4ClientTest.php 2 patches

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

@@ -1,10 +1,10 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 
         // 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];

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -24,14 +24,16 @@
 block discarded – undo
         $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

Please login to merge, or discard this patch.

tests/5ServerTest.php 2 patches

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -107,14 +107,16 @@
 block discarded – undo
 
         $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

Please login to merge, or discard this patch.

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
         // (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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         }
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
     {
         // 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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

tests/0CharsetTest.php 1 patch

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
  * @author JoakimLofgren
  */
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PhpXmlRpc\Helper\Charset;
 
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
     {
         // 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);
         }
     }

Please login to merge, or discard this patch.

tests/3EncoderTest.php 2 patches

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

@@ -1,11 +1,11 @@
 block discarded – undo
 <?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;
 

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -21,14 +21,16 @@
 block discarded – undo
     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

Please login to merge, or discard this patch.

tests/2MessageTest.php 2 patches

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
             '<?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 @@  discard block
 block discarded – undo
 </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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
         $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();

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -21,14 +21,16 @@
 block discarded – undo
     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

Please login to merge, or discard this patch.

tests/6HTTPTest.php 2 patches

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?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__ . '/5ServerTest.php';
+include_once __DIR__.'/5ServerTest.php';
 
 /**
  * Tests which stress http features of the library.
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
         );
 
         $methods = array();
-        foreach(get_class_methods('ServerTest') as $method)
+        foreach (get_class_methods('ServerTest') as $method)
         {
             if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
             {

Please login to merge, or discard this patch.

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

@@ -201,8 +201,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
             return;
@@ -226,8 +225,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
             return;
@@ -278,13 +276,11 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
             return;

Please login to merge, or discard this patch.

tests/1ValueTest.php 2 patches

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?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;
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
         $this->assertequals(1, count($v1));
         $out = array('me' => array(), 'mytype' => 2, '_php_class' => null);
 
-        foreach($v1 as $key => $val)
+        foreach ($v1 as $key => $val)
         {
             $this->assertArrayHasKey($key, $out);
             $expected = $out[$key];
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
         $this->assertequals(2, count($v2));
         $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object'));
         $i = 0;
-        foreach($v2 as $key => $val)
+        foreach ($v2 as $key => $val)
         {
             $expected = $out[$i];
             $this->assertequals($expected['key'], $key);
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
     {
         // nb: make sure that  the serialized xml corresponding to this is > 10MB in size
         $data = array();
-        for ($i = 0; $i < 500000; $i++ ) {
+        for ($i = 0; $i<500000; $i++) {
             $data[] = 'hello world';
         }
 

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -21,14 +21,16 @@
 block discarded – undo
     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

Please login to merge, or discard this patch.

		@@ -107,14 +107,16 @@
		block discarded – undo
107	107
108	108	$this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
109	109
110		- if ($this->args['DEBUG'] == 1)
111		- ob_start();
	110	+ if ($this->args['DEBUG'] == 1) {
	111	+ ob_start();
	112	+ }
112	113	}
113	114
114	115	protected function tear_down()
115	116	{
116		- if ($this->args['DEBUG'] != 1)
117		- return;
	117	+ if ($this->args['DEBUG'] != 1) {
	118	+ return;
	119	+ }
118	120	$out = ob_get_clean();
119	121	$status = $this->getStatus();
120	122	if ($status == BaseTestRunner::STATUS_ERROR

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	// assume this is either a standalone install, or installed as Composer dependency
20	20	/// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
21	21	/// debugger include this one, taking care of autoloading ?
22		- include_once __DIR__ . "/../src/Autoloader.php";
	22	+ include_once __DIR__."/../src/Autoloader.php";
23	23	PhpXmlRpc\Autoloader::register();
24	24	}
25	25
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	}
34	34
35	35	// Variables that shouldn't be unset
36		- $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
	36	+ $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
37	37
38	38	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
39	39	isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
		@@ -53,8 +53,7 @@ discard block
		block discarded – undo
53	53	function stripslashes_deep($value)
54	54	{
55	55	$value = is_array($value) ?
56		- array_map('stripslashes_deep', $value) :
57		- stripslashes($value);
	56	+ array_map('stripslashes_deep', $value) : stripslashes($value);
58	57
59	58	return $value;
60	59	}
		@@ -99,7 +98,7 @@ discard block
		block discarded – undo
99	98	$path = isset($_GET['path']) ? $_GET['path'] : '';
100	99	// in case user forgot initial '/' in xmlrpc server path, add it back
101	100	if ($path && ($path[0]) != '/') {
102		- $path = '/' . $path;
	101	+ $path = '/'.$path;
103	102	}
104	103
105	104	if (isset($_GET['debug']) && ($_GET['debug'] == '1' \|\| $_GET['debug'] == '2')) {

		@@ -17,15 +17,15 @@ discard block
		block discarded – undo
17	17	// Make sure we set the correct charset type for output, so that we can display all characters
18	18	header('Content-Type: text/html; charset=utf-8');
19	19
20		-include __DIR__ . '/common.php';
	20	+include __DIR__.'/common.php';
21	21	if ($action == '') {
22	22	$action = 'list';
23	23	}
24	24
25	25	// Relative path to the visual xmlrpc editing dialog
26	26	// We allow to easily configure this path via defines
27		-$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/';
28		-$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/';
	27	+$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/';
	28	+$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/';
29	29	?>
30	30	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
31	31	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
		@@ -230,9 +230,9 @@ discard block
		block discarded – undo
230	230	echo ' document.forms[2].submit();';
231	231	} ?>">
232	232	<h1>XMLRPC
233		- <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>
	233	+ <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>
234	234	/
235		- <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>
	235	+ <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>
236	236	JSONRPC Debugger (based on the <a href="http://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library)
237	237	</h1>
238	238	<form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	</select>
288	288	</td>
289	289	<td class="labelcell">Timeout:</td>
290		- <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
	290	+ <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
291	291	<td class="labelcell">Protocol:</td>
292	292	<td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
293	293	<option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option>

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

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../lib/xmlrpc.inc';
	3	+include_once __DIR__.'/../lib/xmlrpc.inc';
4	4
5		-include_once __DIR__ . '/parse_args.php';
	5	+include_once __DIR__.'/parse_args.php';
6	6
7		-include_once __DIR__ . '/PolyfillTestCase.php';
	7	+include_once __DIR__.'/PolyfillTestCase.php';
8	8
9	9	use PHPUnit\Runner\BaseTestRunner;
10	10
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	$this->client->server .= 'XXX';
59	59	$dnsinfo = @dns_get_record($this->client->server);
60	60	if ($dnsinfo) {
61		- $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found');
	61	+ $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found');
62	62	} else {
63	63	$r = $this->client->send($m, 5);
64	64	// make sure there's no freaking catchall DNS in effect
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85
86	86	// now test a successful connection
87	87	$server = explode(':', $this->args['HTTPSERVER']);
88		- if (count($server) > 1) {
	88	+ if (count($server)>1) {
89	89	$this->client->port = $server[1];
90	90	}
91	91	$this->client->server = $server[0];

		@@ -24,14 +24,16 @@
		block discarded – undo
24	24	$this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80);
25	25	$this->client->setDebug($this->args['DEBUG']);
26	26
27		- if ($this->args['DEBUG'] == 1)
28		- ob_start();
	27	+ if ($this->args['DEBUG'] == 1) {
	28	+ ob_start();
	29	+ }
29	30	}
30	31
31	32	protected function tear_down()
32	33	{
33		- if ($this->args['DEBUG'] != 1)
34		- return;
	34	+ if ($this->args['DEBUG'] != 1) {
	35	+ return;
	36	+ }
35	37	$out = ob_get_clean();
36	38	$status = $this->getStatus();
37	39	if ($status == BaseTestRunner::STATUS_ERROR

		@@ -1,11 +1,11 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../lib/xmlrpc.inc';
4		-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
	3	+include_once __DIR__.'/../lib/xmlrpc.inc';
	4	+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
5	5
6		-include_once __DIR__ . '/parse_args.php';
	6	+include_once __DIR__.'/parse_args.php';
7	7
8		-include_once __DIR__ . '/PolyfillTestCase.php';
	8	+include_once __DIR__.'/PolyfillTestCase.php';
9	9
10	10	use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
11	11	use PHPUnit\Framework\TestResult;
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	// (but only if not called from subclass objects / multitests)
43	43	if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
44	44	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
45		- for ($i = 0; $i < count($trace); $i++) {
	45	+ for ($i = 0; $i<count($trace); $i++) {
46	46	if (strpos($trace[$i]['function'], 'test') === 0) {
47	47	self::$failed_tests[$trace[$i]['function']] = true;
48	48	break;
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	*/
66	66	public function _run($result = NULL)
67	67	{
68		- $this->testId = get_class($this) . '__' . $this->getName();
	68	+ $this->testId = get_class($this).'__'.$this->getName();
69	69
70	70	if ($result === NULL) {
71	71	$result = $this->createResult();
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	$this->args = argParser::getArgs();
97	97
98	98	$server = explode(':', $this->args['HTTPSERVER']);
99		- if (count($server) > 1) {
	99	+ if (count($server)>1) {
100	100	$this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
101	101	} else {
102	102	$this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106	$this->client->request_compression = $this->request_compression;
107	107	$this->client->accepted_compression = $this->accepted_compression;
108	108
109		- $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
	109	+ $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
110	110
111	111	if ($this->args['DEBUG'] == 1)
112	112	ob_start();
		@@ -143,9 +143,9 @@ discard block
		block discarded – undo
143	143	}
144	144	$this->validateResponse($r);
145	145	if (is_array($errorCode)) {
146		- $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	146	+ $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
147	147	} else {
148		- $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	148	+ $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
149	149	}
150	150	if (!$r->faultCode()) {
151	151	if ($returnResponse) {
		@@ -172,20 +172,20 @@ discard block
		block discarded – undo
172	172	$query = parse_url($this->client->path, PHP_URL_QUERY);
173	173	parse_str($query, $vars);
174	174	$query = http_build_query(array_merge($vars, $data));
175		- $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
	175	+ $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
176	176	}
177	177
178	178	public function testString()
179	179	{
180		- $sendString = "here are 3 \"entities\": < > & " .
181		- "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
182		- " - isn't that great? \\\"hackery\\\" at it's best " .
183		- " also don't want to miss out on \$item[0]. " .
184		- "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
185		- "a simple CR here" . chr(13) .
186		- "a simple LF here" . chr(10) .
187		- "and then LFCR" . chr(10) . chr(13) .
188		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
	180	+ $sendString = "here are 3 \"entities\": < > & ".
	181	+ "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
	182	+ " - isn't that great? \\\"hackery\\\" at it's best ".
	183	+ " also don't want to miss out on \$item[0]. ".
	184	+ "The real weird stuff follows: CRLF here".chr(13).chr(10).
	185	+ "a simple CR here".chr(13).
	186	+ "a simple LF here".chr(10).
	187	+ "and then LFCR".chr(10).chr(13).
	188	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
189	189	$m = new xmlrpcmsg('examples.stringecho', array(
190	190	new xmlrpcval($sendString, 'string'),
191	191	));
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	public function testLatin1String()
207	207	{
208	208	$sendString =
209		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
	209	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
210	210	$x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
211	211	$sendString.
212	212	'</value></param></params></methodCall>';
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	public function testUtf8Method()
311	311	{
312	312	PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
313		- $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
	313	+ $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
314	314	new xmlrpcval('hello')
315	315	));
316	316	$v = $this->send($m);
		@@ -332,7 +332,7 @@ discard block
		block discarded – undo
332	332	));
333	333	$v = $this->send($m);
334	334	if ($v) {
335		- $this->assertEquals($a + $b, $v->scalarval());
	335	+ $this->assertEquals($a+$b, $v->scalarval());
336	336	}
337	337	}
338	338
		@@ -344,7 +344,7 @@ discard block
		block discarded – undo
344	344	));
345	345	$v = $this->send($m);
346	346	if ($v) {
347		- $this->assertEquals(12 - 23, $v->scalarval());
	347	+ $this->assertEquals(12-23, $v->scalarval());
348	348	}
349	349	}
350	350
		@@ -378,7 +378,7 @@ discard block
		block discarded – undo
378	378	if ($v) {
379	379	$sz = $v->arraysize();
380	380	$got = '';
381		- for ($i = 0; $i < $sz; $i++) {
	381	+ for ($i = 0; $i<$sz; $i++) {
382	382	$b = $v->arraymem($i);
383	383	if ($b->scalarval()) {
384	384	$got .= '1';
		@@ -441,7 +441,7 @@ discard block
		block discarded – undo
441	441	$got = '';
442	442	$expected = '37210';
443	443	$expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
444		- foreach($expect_array as $val) {
	444	+ foreach ($expect_array as $val) {
445	445	$b = $v->structmem($val);
446	446	$got .= $b->me['int'];
447	447	}
		@@ -894,7 +894,7 @@ discard block
		block discarded – undo
894	894	{
895	895	// make a 'deep client copy' as the original one might have many properties set
896	896	// also for speed only wrap one method of the whole server
897		- $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
	897	+ $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
898	898	if ($class == '') {
899	899	$this->fail('Registration of remote server failed');
900	900	} else {
		@@ -933,9 +933,9 @@ discard block
		block discarded – undo
933	933	$cookies = array(
934	934	//'c1' => array(),
935	935	'c2' => array('value' => 'c2'),
936		- 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
937		- 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
938		- 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
	936	+ 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
	937	+ 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
	938	+ 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
939	939	);
940	940	$cookiesval = php_xmlrpc_encode($cookies);
941	941	$m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
		@@ -983,10 +983,10 @@ discard block
		block discarded – undo
983	983	$m = new xmlrpcmsg('examples.getcookies', array());
984	984	foreach ($cookies as $cookie => $val) {
985	985	$this->client->setCookie($cookie, $val);
986		- $cookies[$cookie] = (string)$cookies[$cookie];
	986	+ $cookies[$cookie] = (string) $cookies[$cookie];
987	987	}
988	988	$r = $this->client->send($m, $this->timeout, $this->method);
989		- $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	989	+ $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
990	990	if (!$r->faultCode()) {
991	991	$v = $r->value();
992	992	$v = php_xmlrpc_decode($v);

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	* @author JoakimLofgren
4	4	*/
5	5
6		-include_once __DIR__ . '/PolyfillTestCase.php';
	6	+include_once __DIR__.'/PolyfillTestCase.php';
7	7
8	8	use PhpXmlRpc\Helper\Charset;
9	9
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	{
33	33	// construct a latin string with all chars (except control ones)
34	34	$this->latinString = "\n\r\t";
35		- for($i = 32; $i < 127; $i++) {
	35	+ for ($i = 32; $i<127; $i++) {
36	36	$this->latinString .= chr($i);
37	37	}
38		- for($i = 160; $i < 256; $i++) {
	38	+ for ($i = 160; $i<256; $i++) {
39	39	$this->latinString .= chr($i);
40	40	}
41	41	}

		@@ -1,11 +1,11 @@
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../lib/xmlrpc.inc';
4		-include_once __DIR__ . '/../lib/xmlrpcs.inc';
	3	+include_once __DIR__.'/../lib/xmlrpc.inc';
	4	+include_once __DIR__.'/../lib/xmlrpcs.inc';
5	5
6		-include_once __DIR__ . '/parse_args.php';
	6	+include_once __DIR__.'/parse_args.php';
7	7
8		-include_once __DIR__ . '/PolyfillTestCase.php';
	8	+include_once __DIR__.'/PolyfillTestCase.php';
9	9
10	10	use PHPUnit\Runner\BaseTestRunner;
11	11

		@@ -21,14 +21,16 @@
		block discarded – undo
21	21	protected function set_up()
22	22	{
23	23	$this->args = argParser::getArgs();
24		- if ($this->args['DEBUG'] == 1)
25		- ob_start();
	24	+ if ($this->args['DEBUG'] == 1) {
	25	+ ob_start();
	26	+ }
26	27	}
27	28
28	29	protected function tear_down()
29	30	{
30		- if ($this->args['DEBUG'] != 1)
31		- return;
	31	+ if ($this->args['DEBUG'] != 1) {
	32	+ return;
	33	+ }
32	34	$out = ob_get_clean();
33	35	$status = $this->getStatus();
34	36	if ($status == BaseTestRunner::STATUS_ERROR

		@@ -201,8 +201,7 @@ discard block
		block discarded – undo
201	201	{
202	202	$this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
203	203	return;
204		- }
205		- else if ($this->args['PROXYSERVER'] == '')
	204	+ } else if ($this->args['PROXYSERVER'] == '')
206	205	{
207	206	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
208	207	return;
		@@ -226,8 +225,7 @@ discard block
		block discarded – undo
226	225	{
227	226	$this->markTestSkipped('CURL missing: cannot test https functionality');
228	227	return;
229		- }
230		- else if ($this->args['HTTPSSERVER'] == '')
	228	+ } else if ($this->args['HTTPSSERVER'] == '')
231	229	{
232	230	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
233	231	return;
		@@ -278,13 +276,11 @@ discard block
		block discarded – undo
278	276	{
279	277	$this->markTestSkipped('CURL missing: cannot test https w. proxy');
280	278	return;
281		- }
282		- else if ($this->args['PROXYSERVER'] == '')
	279	+ } else if ($this->args['PROXYSERVER'] == '')
283	280	{
284	281	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
285	282	return;
286		- }
287		- else if ($this->args['HTTPSSERVER'] == '')
	283	+ } else if ($this->args['HTTPSSERVER'] == '')
288	284	{
289	285	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
290	286	return;

gggeek / phpxmlrpc

Push — master ( 0c11b8...7877a8 )

Status

Category

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

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

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

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

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

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

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

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

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

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

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch