Update to PHPUnit namespaces

peterrehm · fabpot · commit accab892e7c3 · 2017-02-18T08:02:39.000-08:00
diff --git a/Test/KernelTestCase.php b/Test/KernelTestCase.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Test;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -19,7 +20,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class KernelTestCase extends \PHPUnit_Framework_TestCase
+abstract class KernelTestCase extends TestCase
 {
     protected static $class;
 
diff --git a/Tests/Command/RouterDebugCommandTest.php b/Tests/Command/RouterDebugCommandTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase
+class RouterDebugCommandTest extends TestCase
 {
     public function testDebugAllRoutes()
     {
diff --git a/Tests/Command/RouterMatchCommandTest.php b/Tests/Command/RouterMatchCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
@@ -19,7 +20,7 @@
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 
-class RouterMatchCommandTest extends \PHPUnit_Framework_TestCase
+class RouterMatchCommandTest extends TestCase
 {
     public function testWithMatchPath()
     {
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
 use Symfony\Component\Filesystem\Filesystem;
 
-class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
+class TranslationDebugCommandTest extends TestCase
 {
     private $fs;
     private $translationDir;
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\DependencyInjection;
 use Symfony\Component\HttpKernel;
 
-class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
+class TranslationUpdateCommandTest extends TestCase
 {
     private $fs;
     private $translationDir;
diff --git a/Tests/Console/Descriptor/AbstractDescriptorTest.php b/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -20,7 +21,7 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractDescriptorTest extends TestCase
 {
     /** @dataProvider getDescribeRouteCollectionTestData */
     public function testDescribeRouteCollection(RouteCollection $routes, $expectedDescription)
diff --git a/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php b/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheWarmerPass;
 
-class AddCacheWarmerPassTest extends \PHPUnit_Framework_TestCase
+class AddCacheWarmerPassTest extends TestCase
 {
     public function testThatCacheWarmersAreProcessedInPriorityOrder()
     {
diff --git a/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConsoleCommandPass;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class AddConsoleCommandPassTest extends \PHPUnit_Framework_TestCase
+class AddConsoleCommandPassTest extends TestCase
 {
     public function testProcess()
     {
diff --git a/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php b/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
 
-class AddConstraintValidatorsPassTest extends \PHPUnit_Framework_TestCase
+class AddConstraintValidatorsPassTest extends TestCase
 {
     public function testThatConstraintValidatorServicesAreProcessed()
     {
diff --git a/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
 
-class AddExpressionLanguageProvidersPassTest extends \PHPUnit_Framework_TestCase
+class AddExpressionLanguageProvidersPassTest extends TestCase
 {
     public function testProcessForRouter()
     {
diff --git a/Tests/DependencyInjection/Compiler/LegacyFragmentRendererPassTest.php b/Tests/DependencyInjection/Compiler/LegacyFragmentRendererPassTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FragmentRendererPass;
 
 /**
  * @group legacy
  */
-class LegacyFragmentRendererPassTest extends \PHPUnit_Framework_TestCase
+class LegacyFragmentRendererPassTest extends TestCase
 {
     /**
      * Tests that content rendering not implementing FragmentRendererInterface
diff --git a/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php b/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingAssetHelperPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -19,7 +20,7 @@
 /**
  * @group legacy
  */
-class LegacyTemplatingAssetHelperPassTest extends \PHPUnit_Framework_TestCase
+class LegacyTemplatingAssetHelperPassTest extends TestCase
 {
     public function getScopesTests()
     {
diff --git a/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
 
-class LoggingTranslatorPassTest extends \PHPUnit_Framework_TestCase
+class LoggingTranslatorPassTest extends TestCase
 {
     public function testProcess()
     {
diff --git a/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
 
-class ProfilerPassTest extends \PHPUnit_Framework_TestCase
+class ProfilerPassTest extends TestCase
 {
     private $profilerDefinition;
 
diff --git a/Tests/DependencyInjection/Compiler/SerializerPassTest.php b/Tests/DependencyInjection/Compiler/SerializerPassTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
 
@@ -19,7 +20,7 @@
  *
  * @author Javier Lopez <f12loalf@gmail.com>
  */
-class SerializerPassTest extends \PHPUnit_Framework_TestCase
+class SerializerPassTest extends TestCase
 {
     public function testThrowExceptionWhenNoNormalizers()
     {
diff --git a/Tests/DependencyInjection/Compiler/TranslatorPassTest.php b/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslatorPass;
 
-class TranslatorPassTest extends \PHPUnit_Framework_TestCase
+class TranslatorPassTest extends TestCase
 {
     public function testValidCollector()
     {
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
 use Symfony\Component\Config\Definition\Processor;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     public function testDefaultConfig()
     {
diff --git a/Tests/Routing/RedirectableUrlMatcherTest.php b/Tests/Routing/RedirectableUrlMatcherTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher;
 use Symfony\Component\Routing\RequestContext;
 
-class RedirectableUrlMatcherTest extends \PHPUnit_Framework_TestCase
+class RedirectableUrlMatcherTest extends TestCase
 {
     public function testRedirectWhenNoSlash()
     {
diff --git a/Tests/Routing/RouterTest.php b/Tests/Routing/RouterTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class RouterTest extends \PHPUnit_Framework_TestCase
+class RouterTest extends TestCase
 {
     public function testGenerateWithServiceParam()
     {
diff --git a/Tests/Templating/DelegatingEngineTest.php b/Tests/Templating/DelegatingEngineTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
 use Symfony\Component\HttpFoundation\Response;
 
-class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
+class DelegatingEngineTest extends TestCase
 {
     public function testSupportsRetrievesEngineFromTheContainer()
     {
diff --git a/Tests/Templating/Helper/AssetsHelperTest.php b/Tests/Templating/Helper/AssetsHelperTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper;
 use Symfony\Component\Asset\Package;
 use Symfony\Component\Asset\Packages;
 use Symfony\Component\Asset\PathPackage;
 use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
 
-class AssetsHelperTest extends \PHPUnit_Framework_TestCase
+class AssetsHelperTest extends TestCase
 {
     /**
      * @group legacy
diff --git a/Tests/Templating/Helper/RequestHelperTest.php b/Tests/Templating/Helper/RequestHelperTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\RequestHelper;
 
-class RequestHelperTest extends \PHPUnit_Framework_TestCase
+class RequestHelperTest extends TestCase
 {
     protected $requestStack;
 
diff --git a/Tests/Templating/Helper/SessionHelperTest.php b/Tests/Templating/Helper/SessionHelperTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper;
 
-class SessionHelperTest extends \PHPUnit_Framework_TestCase
+class SessionHelperTest extends TestCase
 {
     protected $requestStack;
 
diff --git a/Tests/Templating/Helper/StopwatchHelperTest.php b/Tests/Templating/Helper/StopwatchHelperTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\StopwatchHelper;
 
-class StopwatchHelperTest extends \PHPUnit_Framework_TestCase
+class StopwatchHelperTest extends TestCase
 {
     public function testDevEnvironment()
     {
diff --git a/Tests/TestCase.php b/Tests/TestCase.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+class TestCase extends PHPUnitTestCase
 {
 }
diff --git a/Tests/Translation/TranslatorTest.php b/Tests/Translation/TranslatorTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Translation;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Translation\MessageSelector;
 
-class TranslatorTest extends \PHPUnit_Framework_TestCase
+class TranslatorTest extends TestCase
 {
     protected $tmpDir;
 
diff --git a/Tests/Validator/ConstraintValidatorFactoryTest.php b/Tests/Validator/ConstraintValidatorFactoryTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Validator;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Validator\Constraints\Blank as BlankConstraint;
 
-class ConstraintValidatorFactoryTest extends \PHPUnit_Framework_TestCase
+class ConstraintValidatorFactoryTest extends TestCase
 {
     public function testGetInstanceCreatesValidator()
     {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Test;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Finder\Finder;`
`15`	`16`	`use Symfony\Component\HttpKernel\KernelInterface;`
`16`	`17`
`@@ -19,7 +20,7 @@`
`19`	`20`	`*`
`20`	`21`	`* @author Fabien Potencier <[email protected]>`
`21`	`22`	`*/`
`22`		`-abstract class KernelTestCase extends \PHPUnit_Framework_TestCase`
	`23`	`+abstract class KernelTestCase extends TestCase`
`23`	`24`	`{`
`24`	`25`	`protected static $class;`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Command;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Console\Application;`
`15`	`16`	`use Symfony\Component\Console\Tester\CommandTester;`
`16`	`17`	`use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;`
`17`	`18`	`use Symfony\Component\Routing\Route;`
`18`	`19`	`use Symfony\Component\Routing\RouteCollection;`
`19`	`20`
`20`		`-class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase`
	`21`	`+class RouterDebugCommandTest extends TestCase`
`21`	`22`	`{`
`22`	`23`	`public function testDebugAllRoutes()`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\DependencyInjection\Reference;`
`15`	`16`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheWarmerPass;`
`16`	`17`
`17`		`-class AddCacheWarmerPassTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class AddCacheWarmerPassTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`public function testThatCacheWarmersAreProcessedInPriorityOrder()`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
	`12`	`+use PHPUnit\Framework\TestCase;`
`12`	`13`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;`
`13`	`14`
`14`		`-class AddConstraintValidatorsPassTest extends \PHPUnit_Framework_TestCase`
	`15`	`+class AddConstraintValidatorsPassTest extends TestCase`
`15`	`16`	`{`
`16`	`17`	`public function testThatConstraintValidatorServicesAreProcessed()`
`17`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`15`	`16`	`use Symfony\Component\DependencyInjection\Definition;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Reference;`
`17`	`18`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;`
`18`	`19`
`19`		`-class AddExpressionLanguageProvidersPassTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class AddExpressionLanguageProvidersPassTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`public function testProcessForRouter()`
`22`	`23`	`{`