Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 94f08e1d7e9d · 2019-08-01T14:54:17.000+02:00
* 3.4:
  [Yaml] fix test for PHP 7.4
  Add polyfill for TestCase::createMock()
  Skip tests that fatal-error on PHP 7.4 because of missing parent classes
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(): void
+    private function doSetUp()
     {
         $this->parser = new Parser();
     }
 
-    protected function tearDown(): void
+    private function doTearDown()
     {
         $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(): void`
	`28`	`+ private function doSetUp()`
`29`	`29`	`{`
`30`	`30`	`$this->parser = new Parser();`
`31`	`31`	`}`
`32`	`32`
`33`		`- protected function tearDown(): void`
	`33`	`+ private function doTearDown()`
`34`	`34`	`{`
`35`	`35`	`$this->parser = null;`
`36`	`36`