Remove use of ForwardCompatTrait

jderusse · jderusse · commit aa2bf3d39444 · 2019-08-03T23:15:25.000+02:00
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/Dumper/PhpGeneratorDumperTest.php b/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;
@@ -21,8 +20,6 @@
 
 class PhpGeneratorDumperTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var RouteCollection
      */
@@ -43,7 +40,7 @@ class PhpGeneratorDumperTest extends TestCase
      */
     private $largeTestTmpFilepath;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 
@@ -55,7 +52,7 @@ private function doSetUp()
         @unlink($this->largeTestTmpFilepath);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         parent::tearDown();
 
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
@@ -11,17 +11,14 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Annotation\Route;
 
 class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
-    use ForwardCompatTestTrait;
-
     protected $loader;
     private $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 
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/ObjectRouteLoaderTest.php b/Tests/Loader/ObjectRouteLoaderTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Loader\ObjectRouteLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 class ObjectRouteLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testLoadCallsServiceAndReturnsCollection()
     {
         $loader = new ObjectRouteLoaderForTest();
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
 use Symfony\Component\Routing\Tests\Fixtures\CustomXmlFileLoader;
 
 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,15 +12,12 @@
 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;
 
 class YamlFileLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $loader = new YamlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
diff --git a/Tests/Matcher/DumpedUrlMatcherTest.php b/Tests/Matcher/DumpedUrlMatcherTest.php
@@ -11,15 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 
 class DumpedUrlMatcherTest extends UrlMatcherTest
 {
-    use ForwardCompatTestTrait;
-
     public function testSchemeRequirement()
     {
         $this->expectException('LogicException');
diff --git a/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
@@ -22,8 +21,6 @@
 
 class PhpMatcherDumperTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var string
      */
@@ -34,15 +31,15 @@ class PhpMatcherDumperTest extends TestCase
      */
     private $dumpPath;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();
 
         $this->matcherClass = uniqid('ProjectUrlMatcher');
         $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         parent::tearDown();
 
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');

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Annotation;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Routing\Annotation\Route;`
`17`	`16`
`18`	`17`	`class RouteTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ForwardCompatTestTrait;`
`21`		`-`
`22`	`19`	`public function testInvalidRouteParameter()`
`23`	`20`	`{`
`24`	`21`	`$this->expectException('BadMethodCallException');`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Generator;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Routing\Generator\UrlGenerator;`
`17`	`16`	`use Symfony\Component\Routing\Generator\UrlGeneratorInterface;`
`18`	`17`	`use Symfony\Component\Routing\RequestContext;`
`@@ -21,8 +20,6 @@`
`21`	`20`
`22`	`21`	`class UrlGeneratorTest extends TestCase`
`23`	`22`	`{`
`24`		`- use ForwardCompatTestTrait;`
`25`		`-`
`26`	`23`	`public function testAbsoluteUrlWithPort80()`
`27`	`24`	`{`
`28`	`25`	`$routes = $this->getRoutes('test', new Route('/testing'));`
Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Loader;`
`13`	`13`
`14`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`14`	`use Symfony\Component\Routing\Annotation\Route;`
`16`	`15`
`17`	`16`	`class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest`
`18`	`17`	`{`
`19`		`- use ForwardCompatTestTrait;`
`20`		`-`
`21`	`18`	`protected $loader;`
`22`	`19`	`private $reader;`
`23`	`20`
`24`		`- private function doSetUp()`
	`21`	`+ protected function setUp()`
`25`	`22`	`{`
`26`	`23`	`parent::setUp();`
`27`	`24`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,12 @@`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Loader;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Routing\Loader\ObjectRouteLoader;`
`17`	`16`	`use Symfony\Component\Routing\Route;`
`18`	`17`	`use Symfony\Component\Routing\RouteCollection;`
`19`	`18`
`20`	`19`	`class ObjectRouteLoaderTest extends TestCase`
`21`	`20`	`{`
`22`		`- use ForwardCompatTestTrait;`
`23`		`-`
`24`	`21`	`public function testLoadCallsServiceAndReturnsCollection()`
`25`	`22`	`{`
`26`	`23`	`$loader = new ObjectRouteLoaderForTest();`