Merge branch '3.4' into 4.3

* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/Command/LintCommandTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Yaml\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -25,8 +24,6 @@
  */
 class LintCommandTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $files;
 
     public function testLintCorrectFile()
@@ -128,13 +125,13 @@ protected function createCommandTester()
         return new CommandTester($command);
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->files = [];
         @mkdir(sys_get_temp_dir().'/framework-yml-lint-test');
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         foreach ($this->files as $file) {
             if (file_exists($file)) {

Tests/DumperTest.php

@@ -12,16 +12,13 @@
 namespace Symfony\Component\Yaml\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Yaml;
 
 class DumperTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     protected $parser;
     protected $dumper;
     protected $path;
@@ -41,14 +38,14 @@ class DumperTest extends TestCase
         ],
     ];
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->parser = new Parser();
         $this->dumper = new Dumper();
         $this->path = __DIR__.'/Fixtures';
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->parser = null;
         $this->dumper = null;

Tests/InlineTest.php

@@ -12,17 +12,14 @@
 namespace Symfony\Component\Yaml\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Inline;
 use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Yaml;
 
 class InlineTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
-    private function doSetUp()
+    protected function setUp()
     {
         Inline::initialize(0, 0);
     }

Tests/ParserTest.php

@@ -12,24 +12,21 @@
 namespace Symfony\Component\Yaml\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Yaml;
 
 class ParserTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var Parser */
     protected $parser;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->parser = new Parser();
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->parser = null;
 

Tests/YamlTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Yaml\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Yaml\Yaml;
 
 class YamlTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testParseAndDump()
     {
         $data = ['lorem' => 'ipsum', 'dolor' => 'sit'];