Merge pull request #228 from samnela/remove-deprecated-testcase

dbu · web-flow · commit 988ec6d86236 · 2018-10-15T08:18:03.000+02:00
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
diff --git a/tests/Unit/Candidates/CandidatesTest.php b/tests/Unit/Candidates/CandidatesTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Candidates;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\Candidates\Candidates;
 use Symfony\Component\HttpFoundation\Request;
 
-class CandidatesTest extends \PHPUnit_Framework_TestCase
+class CandidatesTest extends TestCase
 {
     /**
      * Everything is a candidate.
diff --git a/tests/Unit/DependencyInjection/Compiler/RegisterRouteEnhancersPassTest.php b/tests/Unit/DependencyInjection/Compiler/RegisterRouteEnhancersPassTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
-class RegisterRouteEnhancersPassTest extends \PHPUnit_Framework_TestCase
+class RegisterRouteEnhancersPassTest extends TestCase
 {
     public function testRouteEnhancerPass()
     {
diff --git a/tests/Unit/DependencyInjection/Compiler/RegisterRoutersPassTest.php b/tests/Unit/DependencyInjection/Compiler/RegisterRoutersPassTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Cmf\Routing\Tests\Unit\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-class RegisterRoutersPassTest extends \PHPUnit_Framework_TestCase
+class RegisterRoutersPassTest extends TestCase
 {
     /**
      * @dataProvider getValidRoutersData
diff --git a/tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php b/tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
 use Symfony\Cmf\Component\Routing\Enhancer\ContentRepositoryEnhancer;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class ContentRepositoryEnhancerTest extends \PHPUnit_Framework_TestCase
+class ContentRepositoryEnhancerTest extends TestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Unit/Enhancer/FieldByClassEnhancerTest.php b/tests/Unit/Enhancer/FieldByClassEnhancerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer;
 use Symfony\Component\HttpFoundation\Request;
 
-class FieldByClassEnhancerTest extends \PHPUnit_Framework_TestCase
+class FieldByClassEnhancerTest extends TestCase
 {
     private $request;
 
diff --git a/tests/Unit/Enhancer/FieldMapEnhancerTest.php b/tests/Unit/Enhancer/FieldMapEnhancerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Mapper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer;
 use Symfony\Component\HttpFoundation\Request;
 
-class FieldMapEnhancerTest extends \PHPUnit_Framework_TestCase
+class FieldMapEnhancerTest extends TestCase
 {
     /**
      * @var Request
diff --git a/tests/Unit/Enhancer/FieldPresenceEnhancerTest.php b/tests/Unit/Enhancer/FieldPresenceEnhancerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer;
 use Symfony\Component\HttpFoundation\Request;
 
-class FieldPresenceEnhancerTest extends \PHPUnit_Framework_TestCase
+class FieldPresenceEnhancerTest extends TestCase
 {
     /**
      * @var FieldPresenceEnhancer
diff --git a/tests/Unit/Enhancer/RouteContentEnhancerTest.php b/tests/Unit/Enhancer/RouteContentEnhancerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
-class RouteContentEnhancerTest extends \PHPUnit_Framework_TestCase
+class RouteContentEnhancerTest extends TestCase
 {
     /**
      * @var RouteContentEnhancer
diff --git a/tests/Unit/NestedMatcher/NestedMatcherTest.php b/tests/Unit/NestedMatcher/NestedMatcherTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\NestedMatcher\FinalMatcherInterface;
 use Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher;
 use Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface;
@@ -20,7 +21,7 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class NestedMatcherTest extends \PHPUnit_Framework_TestCase
+class NestedMatcherTest extends TestCase
 {
     private $provider;
 
diff --git a/tests/Unit/NestedMatcher/UrlMatcherTest.php b/tests/Unit/NestedMatcher/UrlMatcherTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock;
@@ -20,7 +21,7 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class UrlMatcherTest extends \PHPUnit_Framework_TestCase
+class UrlMatcherTest extends TestCase
 {
     protected $routeDocument;
 
diff --git a/tests/Unit/Routing/ChainRouterTest.php b/tests/Unit/Routing/ChainRouterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Cmf\Component\Routing\VersatileGeneratorInterface;
@@ -26,7 +27,7 @@
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 
-class ChainRouterTest extends \PHPUnit_Framework_TestCase
+class ChainRouterTest extends TestCase
 {
     /**
      * @var ChainRouter
diff --git a/tests/Unit/Routing/ContentAwareGeneratorTest.php b/tests/Unit/Routing/ContentAwareGeneratorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\ContentAwareGenerator;
 use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
@@ -20,7 +21,7 @@
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 
-class ContentAwareGeneratorTest extends \PHPUnit_Framework_TestCase
+class ContentAwareGeneratorTest extends TestCase
 {
     private $contentDocument;
 
diff --git a/tests/Unit/Routing/DynamicRouterTest.php b/tests/Unit/Routing/DynamicRouterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\DynamicRouter;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
 use Symfony\Cmf\Component\Routing\Event\Events;
@@ -28,7 +29,7 @@
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 
-class DynamicRouterTest extends \PHPUnit_Framework_TestCase
+class DynamicRouterTest extends TestCase
 {
     protected $routeDocument;
 
diff --git a/tests/Unit/Routing/LazyRouteCollectionTest.php b/tests/Unit/Routing/LazyRouteCollectionTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 
 /**
  * Tests the lazy route collection.
  *
  * @group cmf/routing
  */
-class LazyRouteCollectionTest extends \PHPUnit_Framework_TestCase
+class LazyRouteCollectionTest extends TestCase
 {
     /**
      * Tests the iterator without a paged route provider.
diff --git a/tests/Unit/Routing/PagedRouteCollectionTest.php b/tests/Unit/Routing/PagedRouteCollectionTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 
 /**
  * Tests the page route collection.
  *
  * @group cmf/routing
  */
-class PagedRouteCollectionTest extends \PHPUnit_Framework_TestCase
+class PagedRouteCollectionTest extends TestCase
 {
     /**
      * Contains a mocked route provider.
diff --git a/tests/Unit/Routing/ProviderBasedGeneratorTest.php b/tests/Unit/Routing/ProviderBasedGeneratorTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\ProviderBasedGenerator;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Component\Routing\CompiledRoute;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 
-class ProviderBasedGeneratorTest extends \PHPUnit_Framework_TestCase
+class ProviderBasedGeneratorTest extends TestCase
 {
     protected $routeDocument;
 

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Component\Routing\Tests\Unit\DependencyInjection\Compiler;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;`
`15`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Definition;`
`17`	`18`
`18`		`-class RegisterRouteEnhancersPassTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class RegisterRouteEnhancersPassTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`public function testRouteEnhancerPass()`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer;`
`15`	`16`	`use Symfony\Component\HttpFoundation\Request;`
`16`	`17`
`17`		`-class FieldByClassEnhancerTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class FieldByClassEnhancerTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`private $request;`
`20`	`21`