Merge branch '5.1' into 5.2

fabpot · fabpot · commit 47c02526c532 · 2020-12-18T09:03:05.000+01:00
* 5.1:
  Remove :void in test function signatures
diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
@@ -1470,7 +1470,7 @@ protected function getOutputContent(StreamOutput $output)
         return str_replace(\PHP_EOL, "\n", stream_get_contents($output->getStream()));
     }
 
-    public function testWithColspanAndMaxWith(): void
+    public function testWithColspanAndMaxWith()
     {
         $table = new Table($output = $this->getOutputStream());
 

Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ protected function getOutputContent(StreamOutput $output)`
`1470`	`1470`	`return str_replace(\PHP_EOL, "\n", stream_get_contents($output->getStream()));`
`1471`	`1471`	`}`
`1472`	`1472`
`1473`		`- public function testWithColspanAndMaxWith(): void`
	`1473`	`+ public function testWithColspanAndMaxWith()`
`1474`	`1474`	`{`
`1475`	`1475`	`$table = new Table($output = $this->getOutputStream());`
`1476`	`1476`