Merge branch '3.4' into 4.3

* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/ChildDefinitionTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\DependencyInjection\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 
 class ChildDefinitionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $def = new ChildDefinition('foo');

Tests/Compiler/AutoAliasServicePassTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\AutoAliasServicePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class AutoAliasServicePassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcessWithMissingParameter()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException');

Tests/Compiler/AutowirePassTest.php

@@ -15,7 +15,6 @@
 use PHPUnit\Framework\Warning;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
@@ -37,8 +36,6 @@
  */
 class AutowirePassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcess()
     {
         $container = new ContainerBuilder();

Tests/Compiler/CheckArgumentsValidityPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\CheckArgumentsValidityPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -21,8 +20,6 @@
  */
 class CheckArgumentsValidityPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcess()
     {
         $container = new ContainerBuilder();

Tests/Compiler/CheckCircularReferencesPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
 use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
@@ -22,8 +21,6 @@
 
 class CheckCircularReferencesPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcess()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');

Tests/Compiler/CheckDefinitionValidityPassTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\CheckDefinitionValidityPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class CheckDefinitionValidityPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcessDetectsSyntheticNonPublicDefinitions()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');

Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
 use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
@@ -24,8 +23,6 @@
 
 class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcess()
     {
         $container = new ContainerBuilder();

Tests/Compiler/CheckReferenceValidityPassTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 class CheckReferenceValidityPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testProcessDetectsReferenceToAbstractDefinition()
     {
         $this->expectException('RuntimeException');

Tests/Compiler/DefinitionErrorExceptionPassTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
 class DefinitionErrorExceptionPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');

Tests/Compiler/ExtensionCompilerPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -23,12 +22,10 @@
  */
 class ExtensionCompilerPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $container;
     private $pass;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->container = new ContainerBuilder();
         $this->pass = new ExtensionCompilerPass();