Merge branch '3.4' into 4.3

* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/Debug/OptionsResolverIntrospectorTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\OptionsResolver\Tests\Debug;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class OptionsResolverIntrospectorTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetDefault()
     {
         $resolver = new OptionsResolver();

Tests/OptionsResolverTest.php

@@ -13,21 +13,18 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class OptionsResolverTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var OptionsResolver
      */
     private $resolver;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->resolver = new OptionsResolver();
     }