Update to PHPUnit namespaces

peterrehm · fabpot · commit a7392c4b1fb4 · 2017-02-18T08:02:39.000-08:00
diff --git a/Tests/Annotation/RouteTest.php b/Tests/Annotation/RouteTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Routing\Tests\Annotation;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Annotation\Route;
 
-class RouteTest extends \PHPUnit_Framework_TestCase
+class RouteTest extends TestCase
 {
     /**
      * @expectedException \BadMethodCallException
diff --git a/Tests/CompiledRouteTest.php b/Tests/CompiledRouteTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\CompiledRoute;
 
-class CompiledRouteTest extends \PHPUnit_Framework_TestCase
+class CompiledRouteTest extends TestCase
 {
     public function testAccessors()
     {
diff --git a/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Routing\Tests\Generator\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
 use Symfony\Component\Routing\RequestContext;
 
-class PhpGeneratorDumperTest extends \PHPUnit_Framework_TestCase
+class PhpGeneratorDumperTest extends TestCase
 {
     /**
      * @var RouteCollection
diff --git a/Tests/Generator/UrlGeneratorTest.php b/Tests/Generator/UrlGeneratorTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Routing\Tests\Generator;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
 
-class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
+class UrlGeneratorTest extends TestCase
 {
     public function testAbsoluteUrlWithPort80()
     {
diff --git a/Tests/Loader/AbstractAnnotationLoaderTest.php b/Tests/Loader/AbstractAnnotationLoaderTest.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-abstract class AbstractAnnotationLoaderTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractAnnotationLoaderTest extends TestCase
 {
     public function getReader()
     {
diff --git a/Tests/Loader/ClosureLoaderTest.php b/Tests/Loader/ClosureLoaderTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Loader\ClosureLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class ClosureLoaderTest extends \PHPUnit_Framework_TestCase
+class ClosureLoaderTest extends TestCase
 {
     public function testSupports()
     {
diff --git a/Tests/Loader/PhpFileLoaderTest.php b/Tests/Loader/PhpFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\PhpFileLoader;
 
-class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase
+class PhpFileLoaderTest extends TestCase
 {
     public function testSupports()
     {
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
 use Symfony\Component\Routing\Tests\Fixtures\CustomXmlFileLoader;
 
-class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
+class XmlFileLoaderTest extends TestCase
 {
     public function testSupports()
     {
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
+class YamlFileLoaderTest extends TestCase
 {
     public function testSupports()
     {
diff --git a/Tests/Matcher/Dumper/DumperCollectionTest.php b/Tests/Matcher/Dumper/DumperCollectionTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;
 
-class DumperCollectionTest extends \PHPUnit_Framework_TestCase
+class DumperCollectionTest extends TestCase
 {
     public function testGetRoot()
     {
diff --git a/Tests/Matcher/Dumper/DumperPrefixCollectionTest.php b/Tests/Matcher/Dumper/DumperPrefixCollectionTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Matcher\Dumper\DumperPrefixCollection;
 use Symfony\Component\Routing\Matcher\Dumper\DumperRoute;
 use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;
 
-class DumperPrefixCollectionTest extends \PHPUnit_Framework_TestCase
+class DumperPrefixCollectionTest extends TestCase
 {
     public function testAddPrefixRoute()
     {
diff --git a/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php b/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Matcher\Dumper\ApacheMatcherDumper;
 
 /**
  * @group legacy
  */
-class LegacyApacheMatcherDumperTest extends \PHPUnit_Framework_TestCase
+class LegacyApacheMatcherDumperTest extends TestCase
 {
     protected static $fixturesPath;
 
diff --git a/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class PhpMatcherDumperTest extends \PHPUnit_Framework_TestCase
+class PhpMatcherDumperTest extends TestCase
 {
     /**
      * @expectedException \LogicException
diff --git a/Tests/Matcher/LegacyApacheUrlMatcherTest.php b/Tests/Matcher/LegacyApacheUrlMatcherTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Matcher\ApacheUrlMatcher;
 
 /**
  * @group legacy
  */
-class LegacyApacheUrlMatcherTest extends \PHPUnit_Framework_TestCase
+class LegacyApacheUrlMatcherTest extends TestCase
 {
     protected $server;
 
diff --git a/Tests/Matcher/RedirectableUrlMatcherTest.php b/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 
-class RedirectableUrlMatcherTest extends \PHPUnit_Framework_TestCase
+class RedirectableUrlMatcherTest extends TestCase
 {
     public function testRedirectWhenNoSlash()
     {
diff --git a/Tests/Matcher/TraceableUrlMatcherTest.php b/Tests/Matcher/TraceableUrlMatcherTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
 
-class TraceableUrlMatcherTest extends \PHPUnit_Framework_TestCase
+class TraceableUrlMatcherTest extends TestCase
 {
     public function test()
     {
diff --git a/Tests/Matcher/UrlMatcherTest.php b/Tests/Matcher/UrlMatcherTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 
-class UrlMatcherTest extends \PHPUnit_Framework_TestCase
+class UrlMatcherTest extends TestCase
 {
     public function testNoMethodSoAllowed()
     {
diff --git a/Tests/RequestContextTest.php b/Tests/RequestContextTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RequestContext;
 
-class RequestContextTest extends \PHPUnit_Framework_TestCase
+class RequestContextTest extends TestCase
 {
     public function testConstruct()
     {
diff --git a/Tests/RouteCollectionTest.php b/Tests/RouteCollectionTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Config\Resource\FileResource;
 
-class RouteCollectionTest extends \PHPUnit_Framework_TestCase
+class RouteCollectionTest extends TestCase
 {
     public function testRoute()
     {
diff --git a/Tests/RouteCompilerTest.php b/Tests/RouteCompilerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCompiler;
 
-class RouteCompilerTest extends \PHPUnit_Framework_TestCase
+class RouteCompilerTest extends TestCase
 {
     /**
      * @dataProvider provideCompileData
diff --git a/Tests/RouteTest.php b/Tests/RouteTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 
-class RouteTest extends \PHPUnit_Framework_TestCase
+class RouteTest extends TestCase
 {
     public function testConstructor()
     {
diff --git a/Tests/RouterTest.php b/Tests/RouterTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Router;
 use Symfony\Component\HttpFoundation\Request;
 
-class RouterTest extends \PHPUnit_Framework_TestCase
+class RouterTest extends TestCase
 {
     private $router = null;
 

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Annotation;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Routing\Annotation\Route;`
`15`	`16`
`16`		`-class RouteTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class RouteTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`/**`
`19`	`20`	`* @expectedException \BadMethodCallException`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Generator;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Routing\RouteCollection;`
`15`	`16`	`use Symfony\Component\Routing\Route;`
`16`	`17`	`use Symfony\Component\Routing\Generator\UrlGenerator;`
`17`	`18`	`use Symfony\Component\Routing\Generator\UrlGeneratorInterface;`
`18`	`19`	`use Symfony\Component\Routing\RequestContext;`
`19`	`20`
`20`		`-class UrlGeneratorTest extends \PHPUnit_Framework_TestCase`
	`21`	`+class UrlGeneratorTest extends TestCase`
`21`	`22`	`{`
`22`	`23`	`public function testAbsoluteUrlWithPort80()`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Loader;`
`13`	`13`
`14`		`-abstract class AbstractAnnotationLoaderTest extends \PHPUnit_Framework_TestCase`
	`14`	`+use PHPUnit\Framework\TestCase;`
	`15`	`+`
	`16`	`+abstract class AbstractAnnotationLoaderTest extends TestCase`
`15`	`17`	`{`
`16`	`18`	`public function getReader()`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Loader;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Routing\Loader\ClosureLoader;`
`15`	`16`	`use Symfony\Component\Routing\Route;`
`16`	`17`	`use Symfony\Component\Routing\RouteCollection;`
`17`	`18`
`18`		`-class ClosureLoaderTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class ClosureLoaderTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`public function testSupports()`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Tests\Loader;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Config\FileLocator;`
`15`	`16`	`use Symfony\Component\Routing\Loader\PhpFileLoader;`
`16`	`17`
`17`		`-class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class PhpFileLoaderTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`public function testSupports()`
`20`	`21`	`{`