Merge branch '4.4'

* 4.4: Remove use of ForwardCompatTrait Remove deprecated methods assertArraySubset
symfony · Aug 3, 2019 · 84c3063 · 84c3063
2 parents eefd23c + 3a4a767
commit 84c3063
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 47 deletions.
diff --git a/Tests/Annotation/RouteTest.php b/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');

diff --git a/Tests/Generator/UrlGeneratorTest.php b/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'));

diff --git a/Tests/Loader/AnnotationClassLoaderTest.php b/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 {

diff --git a/Tests/Loader/AnnotationDirectoryLoaderTest.php b/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();
 

diff --git a/Tests/Loader/AnnotationFileLoaderTest.php b/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();
 

diff --git a/Tests/Loader/DirectoryLoaderTest.php b/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();
 

diff --git a/Tests/Loader/XmlFileLoaderTest.php b/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());

diff --git a/Tests/Loader/YamlFileLoaderTest.php b/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());

diff --git a/Tests/Matcher/RedirectableUrlMatcherTest.php b/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -11,15 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 class RedirectableUrlMatcherTest extends UrlMatcherTest
 {
-    use ForwardCompatTestTrait;
-
     public function testMissingTrailingSlash()
     {
         $coll = new RouteCollection();

diff --git a/Tests/Matcher/UrlMatcherTest.php b/Tests/Matcher/UrlMatcherTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Matcher;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
@@ -22,8 +21,6 @@
 
 class UrlMatcherTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testNoMethodSoAllowed()
     {
         $coll = new RouteCollection();

diff --git a/Tests/RouteCollectionBuilderTest.php b/Tests/RouteCollectionBuilderTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests;
 
 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;
@@ -22,8 +21,6 @@
 
 class RouteCollectionBuilderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testImport()
     {
         $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();

diff --git a/Tests/RouteCompilerTest.php b/Tests/RouteCompilerTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCompiler;
 
 class RouteCompilerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider provideCompileData
      */

diff --git a/Tests/RouteTest.php b/Tests/RouteTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Route;
 
 class RouteTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $route = new Route('/{foo}', ['foo' => 'bar'], ['foo' => '\d+'], ['foo' => 'bar'], '{locale}.example.com');

diff --git a/Tests/RouterTest.php b/Tests/RouterTest.php
@@ -12,20 +12,17 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Router;
 
 class RouterTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $router = null;
 
     private $loader = null;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $this->router = new Router($this->loader, 'routing.yml');