Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 5b56e368ca59 · 2019-08-01T13:51:38.000+02:00
* 4.3:
  Fix assertInternalType deprecation in phpunit 9
  Ensure signatures for setUp|tearDown|setUpAfterClass|tearDownAfterClass methods in tests are compatible with phpunit 8.2
diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -25,12 +25,12 @@ class ParserTest extends TestCase
     /** @var Parser */
     protected $parser;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->parser = new Parser();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->parser = null;
 

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ class ParserTest extends TestCase`
`25`	`25`	`/** @var Parser */`
`26`	`26`	`protected $parser;`
`27`	`27`
`28`		`- protected function setUp()`
	`28`	`+ protected function setUp(): void`
`29`	`29`	`{`
`30`	`30`	`$this->parser = new Parser();`
`31`	`31`	`}`
`32`	`32`
`33`		`- protected function tearDown()`
	`33`	`+ protected function tearDown(): void`
`34`	`34`	`{`
`35`	`35`	`$this->parser = null;`
`36`	`36`