Merge branch '4.3' into 4.4

* 4.3:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/Annotation/RouteTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Routing\Tests\Annotation;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Annotation\Route;
 
 class RouteTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testInvalidRouteParameter()
     {
         $this->expectException('BadMethodCallException');

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Generator\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
@@ -24,8 +23,6 @@
  */
 class PhpGeneratorDumperTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var RouteCollection
      */
@@ -46,7 +43,7 @@ class PhpGeneratorDumperTest extends TestCase
      */
     private $largeTestTmpFilepath;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 
@@ -58,7 +55,7 @@ private function doSetUp()
         @unlink($this->largeTestTmpFilepath);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         parent::tearDown();
 

Tests/Generator/UrlGeneratorTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Generator;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
@@ -21,8 +20,6 @@
 
 class UrlGeneratorTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAbsoluteUrlWithPort80()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));

Tests/Loader/AnnotationClassLoaderTest.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
@@ -41,14 +40,12 @@
 
 class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var AnnotationClassLoader
      */
     private $loader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $reader = new AnnotationReader();
         $this->loader = new class($reader) extends AnnotationClassLoader {

Tests/Loader/AnnotationDirectoryLoaderTest.php

@@ -11,18 +11,15 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 
 class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
 {
-    use ForwardCompatTestTrait;
-
     protected $loader;
     protected $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 

Tests/Loader/AnnotationFileLoaderTest.php

@@ -11,19 +11,16 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 
 class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
 {
-    use ForwardCompatTestTrait;
-
     protected $loader;
     protected $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 

Tests/Loader/DirectoryLoaderTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
@@ -21,12 +20,10 @@
 
 class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
 {
-    use ForwardCompatTestTrait;
-
     private $loader;
     private $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 

Tests/Loader/ObjectRouteLoaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Tests\Fixtures\TestObjectRouteLoader;
@@ -22,8 +21,6 @@
  */
 class ObjectRouteLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @expectedDeprecation Referencing service route loaders with a single colon is deprecated since Symfony 4.1. Use my_route_provider_service::loadRoutes instead.
      */

Tests/Loader/XmlFileLoaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
@@ -22,8 +21,6 @@
 
 class XmlFileLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $loader = new XmlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());

Tests/Loader/YamlFileLoaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
@@ -21,8 +20,6 @@
 
 class YamlFileLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $loader = new YamlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());