Merge branch '3.4' into 4.3

* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/FilesystemTest.php

@@ -11,15 +11,11 @@
 
 namespace Symfony\Component\Filesystem\Tests;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
-
 /**
  * Test class for Filesystem.
  */
 class FilesystemTest extends FilesystemTestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testCopyCreatesNewFile()
     {
         $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';

Tests/FilesystemTestCase.php

@@ -12,13 +12,10 @@
 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 = [];
@@ -43,7 +40,7 @@ class FilesystemTestCase extends TestCase
      */
     private static $symlinkOnWindows = null;
 
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             self::$linkOnWindows = true;
@@ -72,7 +69,7 @@ private static function doSetUpBeforeClass()
         }
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->umask = umask(0);
         $this->filesystem = new Filesystem();
@@ -81,7 +78,7 @@ private function doSetUp()
         $this->workspace = realpath($this->workspace);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         if (!empty($this->longPathNamesWindows)) {
             foreach ($this->longPathNamesWindows as $path) {