Inspection of "tests" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( da2c1e...110169 )

by Gaetano

created 2020-12-31 14:37 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 1 patch

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.

tests/7DemofilesTest.php 1 patch

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/demo/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/demo/', $this->args['HTTPURI']);
 
-        $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']);
     }
 
     public function testAgeSort()

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

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;
@@ -41,7 +41,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;
@@ -64,7 +64,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();
@@ -95,7 +95,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']);
@@ -105,7 +105,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();
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
             return $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) {
@@ -165,20 +165,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'),
         ));
@@ -199,7 +199,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>';
@@ -303,7 +303,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);
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -371,7 +371,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';
@@ -434,7 +434,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'];
             }
@@ -863,7 +863,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 {
@@ -902,9 +902,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));
@@ -952,10 +952,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.

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.

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/8DebuggerTest.php 1 patch

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.php';
 
 class DebuggerTest extends PhpXmlRpc_LocalFileTestCase
 {
@@ -8,9 +8,9 @@  discard block
 block discarded – undo
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['HTTPURI']);
 
-        $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']);
     }
 
     public function testIndex()

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/9ExtraFilesTest.php 1 patch

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.php';
 
 /**
  * Tests for php files in the 'extras' directory
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/', $this->args['HTTPURI']);
 
-        $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']);
     }
 
     /**

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>

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/LocalFileTestCase.php';
	3	+include_once __DIR__.'/LocalFileTestCase.php';
4	4
5	5	/**
6	6	* Tests for php files in the 'demo' directory
		@@ -11,9 +11,9 @@ discard block
		block discarded – undo
11	11	{
12	12	$this->args = argParser::getArgs();
13	13
14		- $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/demo/', $this->args['HTTPURI'] );
	14	+ $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/demo/', $this->args['HTTPURI']);
15	15
16		- $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
	16	+ $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
17	17	}
18	18
19	19	public function testAgeSort()

		@@ -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;
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	// (but only if not called from subclass objects / multitests)
42	42	if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
43	43	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
44		- for ($i = 0; $i < count($trace); $i++) {
	44	+ for ($i = 0; $i<count($trace); $i++) {
45	45	if (strpos($trace[$i]['function'], 'test') === 0) {
46	46	self::$failed_tests[$trace[$i]['function']] = true;
47	47	break;
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	*/
65	65	public function _run($result = NULL)
66	66	{
67		- $this->testId = get_class($this) . '__' . $this->getName();
	67	+ $this->testId = get_class($this).'__'.$this->getName();
68	68
69	69	if ($result === NULL) {
70	70	$result = $this->createResult();
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	$this->args = argParser::getArgs();
96	96
97	97	$server = explode(':', $this->args['HTTPSERVER']);
98		- if (count($server) > 1) {
	98	+ if (count($server)>1) {
99	99	$this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
100	100	} else {
101	101	$this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
		@@ -105,7 +105,7 @@ discard block
		block discarded – undo
105	105	$this->client->request_compression = $this->request_compression;
106	106	$this->client->accepted_compression = $this->accepted_compression;
107	107
108		- $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] );
	108	+ $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
109	109
110	110	if ($this->args['DEBUG'] == 1)
111	111	ob_start();
		@@ -141,9 +141,9 @@ discard block
		block discarded – undo
141	141	return $r;
142	142	}
143	143	if (is_array($errorCode)) {
144		- $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	144	+ $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
145	145	} else {
146		- $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	146	+ $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
147	147	}
148	148	if (!$r->faultCode()) {
149	149	if ($returnResponse) {
		@@ -165,20 +165,20 @@ discard block
		block discarded – undo
165	165	$query = parse_url($this->client->path, PHP_URL_QUERY);
166	166	parse_str($query, $vars);
167	167	$query = http_build_query(array_merge($vars, $data));
168		- $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
	168	+ $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
169	169	}
170	170
171	171	public function testString()
172	172	{
173		- $sendString = "here are 3 \"entities\": < > & " .
174		- "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
175		- " - isn't that great? \\\"hackery\\\" at it's best " .
176		- " also don't want to miss out on \$item[0]. " .
177		- "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
178		- "a simple CR here" . chr(13) .
179		- "a simple LF here" . chr(10) .
180		- "and then LFCR" . chr(10) . chr(13) .
181		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
	173	+ $sendString = "here are 3 \"entities\": < > & ".
	174	+ "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
	175	+ " - isn't that great? \\\"hackery\\\" at it's best ".
	176	+ " also don't want to miss out on \$item[0]. ".
	177	+ "The real weird stuff follows: CRLF here".chr(13).chr(10).
	178	+ "a simple CR here".chr(13).
	179	+ "a simple LF here".chr(10).
	180	+ "and then LFCR".chr(10).chr(13).
	181	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
182	182	$m = new xmlrpcmsg('examples.stringecho', array(
183	183	new xmlrpcval($sendString, 'string'),
184	184	));
		@@ -199,7 +199,7 @@ discard block
		block discarded – undo
199	199	public function testLatin1String()
200	200	{
201	201	$sendString =
202		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
	202	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
203	203	$x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
204	204	$sendString.
205	205	'</value></param></params></methodCall>';
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	public function testUtf8Method()
304	304	{
305	305	PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
306		- $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
	306	+ $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
307	307	new xmlrpcval('hello')
308	308	));
309	309	$v = $this->send($m);
		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	));
326	326	$v = $this->send($m);
327	327	if ($v) {
328		- $this->assertEquals($a + $b, $v->scalarval());
	328	+ $this->assertEquals($a+$b, $v->scalarval());
329	329	}
330	330	}
331	331
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337	));
338	338	$v = $this->send($m);
339	339	if ($v) {
340		- $this->assertEquals(12 - 23, $v->scalarval());
	340	+ $this->assertEquals(12-23, $v->scalarval());
341	341	}
342	342	}
343	343
		@@ -371,7 +371,7 @@ discard block
		block discarded – undo
371	371	if ($v) {
372	372	$sz = $v->arraysize();
373	373	$got = '';
374		- for ($i = 0; $i < $sz; $i++) {
	374	+ for ($i = 0; $i<$sz; $i++) {
375	375	$b = $v->arraymem($i);
376	376	if ($b->scalarval()) {
377	377	$got .= '1';
		@@ -434,7 +434,7 @@ discard block
		block discarded – undo
434	434	$got = '';
435	435	$expected = '37210';
436	436	$expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
437		- foreach($expect_array as $val) {
	437	+ foreach ($expect_array as $val) {
438	438	$b = $v->structmem($val);
439	439	$got .= $b->me['int'];
440	440	}
		@@ -863,7 +863,7 @@ discard block
		block discarded – undo
863	863	{
864	864	// make a 'deep client copy' as the original one might have many properties set
865	865	// also for speed only wrap one method of the whole server
866		- $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
	866	+ $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
867	867	if ($class == '') {
868	868	$this->fail('Registration of remote server failed');
869	869	} else {
		@@ -902,9 +902,9 @@ discard block
		block discarded – undo
902	902	$cookies = array(
903	903	//'c1' => array(),
904	904	'c2' => array('value' => 'c2'),
905		- 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
906		- 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
907		- 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
	905	+ 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
	906	+ 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
	907	+ 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
908	908	);
909	909	$cookiesval = php_xmlrpc_encode($cookies);
910	910	$m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
		@@ -952,10 +952,10 @@ discard block
		block discarded – undo
952	952	$m = new xmlrpcmsg('examples.getcookies', array());
953	953	foreach ($cookies as $cookie => $val) {
954	954	$this->client->setCookie($cookie, $val);
955		- $cookies[$cookie] = (string)$cookies[$cookie];
	955	+ $cookies[$cookie] = (string) $cookies[$cookie];
956	956	}
957	957	$r = $this->client->send($m, $this->timeout, $this->method);
958		- $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	958	+ $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
959	959	if (!$r->faultCode()) {
960	960	$v = $r->value();
961	961	$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

gggeek / phpxmlrpc

Push — master ( da2c1e...110169 )

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

Spacing +3 added lines, -3 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

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

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

Spacing +3 added lines, -3 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 +3 added lines, -3 removed lines patch added patch discarded remove patch