Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 8a6b7e6e3bce · 2018-10-02T18:36:10.000+02:00
* 3.4:
  CS fix
  [Debug] fix compat with PHP 7.3
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -398,7 +398,6 @@ private function renderColumnSeparator($type = self::BORDER_OUTSIDE)
      * Example:
      *
      *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
-     *
      */
     private function renderRow(array $row, string $cellFormat)
     {
diff --git a/Tests/Fixtures/Foo6Command.php b/Tests/Fixtures/Foo6Command.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use Symfony\Component\Console\Command\Command;
 
 class Foo6Command extends Command

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,6 @@ private function renderColumnSeparator($type = self::BORDER_OUTSIDE)`
`398`	`398`	`* Example:`
`399`	`399`	`*`
`400`	`400`	`* \| 9971-5-0210-0 \| A Tale of Two Cities \| Charles Dickens \|`
`401`		`- *`
`402`	`401`	`*/`
`403`	`402`	`private function renderRow(array $row, string $cellFormat)`
`404`	`403`	`{`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 <?php
+-
 use Symfony\Component\Console\Command\Command;
 class Foo6Command extends Command