Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit f8edc2628071 · 2019-08-01T00:32:32.000+02:00
* 3.4:
  [Cache] fix cs
  Make tests support phpunit 8
diff --git a/Tests/FilesystemTestCase.php b/Tests/FilesystemTestCase.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\Filesystem\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Filesystem\Filesystem;
 
 class FilesystemTestCase extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $umask;
 
     protected $longPathNamesWindows = [];
@@ -40,7 +43,7 @@ class FilesystemTestCase extends TestCase
      */
     private static $symlinkOnWindows = null;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             self::$linkOnWindows = true;
@@ -69,7 +72,7 @@ public static function setUpBeforeClass()
         }
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->umask = umask(0);
         $this->filesystem = new Filesystem();
@@ -78,7 +81,7 @@ protected function setUp()
         $this->workspace = realpath($this->workspace);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         if (!empty($this->longPathNamesWindows)) {
             foreach ($this->longPathNamesWindows as $path) {

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,13 @@`
`12`	`12`	`namespace Symfony\Component\Filesystem\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Filesystem\Filesystem;`
`16`	`17`
`17`	`18`	`class FilesystemTestCase extends TestCase`
`18`	`19`	`{`
	`20`	`+ use ForwardCompatTestTrait;`
	`21`	`+`
`19`	`22`	`private $umask;`
`20`	`23`
`21`	`24`	`protected $longPathNamesWindows = [];`
`@@ -40,7 +43,7 @@ class FilesystemTestCase extends TestCase`
`40`	`43`	`*/`
`41`	`44`	`private static $symlinkOnWindows = null;`
`42`	`45`
`43`		`- public static function setUpBeforeClass()`
	`46`	`+ private static function doSetUpBeforeClass()`
`44`	`47`	`{`
`45`	`48`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`46`	`49`	`self::$linkOnWindows = true;`
`@@ -69,7 +72,7 @@ public static function setUpBeforeClass()`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`
`72`		`- protected function setUp()`
	`75`	`+ private function doSetUp()`
`73`	`76`	`{`
`74`	`77`	`$this->umask = umask(0);`
`75`	`78`	`$this->filesystem = new Filesystem();`
`@@ -78,7 +81,7 @@ protected function setUp()`
`78`	`81`	`$this->workspace = realpath($this->workspace);`
`79`	`82`	`}`
`80`	`83`
`81`		`- protected function tearDown()`
	`84`	`+ private function doTearDown()`
`82`	`85`	`{`
`83`	`86`	`if (!empty($this->longPathNamesWindows)) {`
`84`	`87`	`foreach ($this->longPathNamesWindows as $path) {`