Merge branch '3.2'

* 3.2:
  Updated PHPUnit namespaces
  Add missing conflict rules for phpunit

Author: nicolas-grekas

Tests/Controller/ArgumentResolverTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Controller;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
@@ -23,7 +24,7 @@
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
 use Symfony\Component\HttpFoundation\Request;
 
-class ArgumentResolverTest extends \PHPUnit_Framework_TestCase
+class ArgumentResolverTest extends TestCase
 {
     /** @var ArgumentResolver */
     private static $resolver;

Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php

@@ -12,13 +12,14 @@
 namespace Symfony\Component\HttpKernel\Tests\ControllerMetadata;
 
 use Fake\ImportedAndFake;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\BasicTypesController;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
 
-class ArgumentMetadataFactoryTest extends \PHPUnit_Framework_TestCase
+class ArgumentMetadataFactoryTest extends TestCase
 {
     /**
      * @var ArgumentMetadataFactory

Tests/ControllerMetadata/ArgumentMetadataTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\Tests\ControllerMetadata;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
-class ArgumentMetadataTest extends \PHPUnit_Framework_TestCase
+class ArgumentMetadataTest extends TestCase
 {
     public function testWithBcLayerWithDefault()
     {

Tests/DataCollector/DataCollectorTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Tests\Fixtures\DataCollector\CloneVarDataCollector;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 
-class DataCollectorTest extends \PHPUnit_Framework_TestCase
+class DataCollectorTest extends TestCase
 {
     public function testCloneVarStringWithScheme()
     {

Tests/Debug/FileLinkFormatterTest.php

@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Debug;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 
-class FileLinkFormatterTest extends \PHPUnit_Framework_TestCase
+class FileLinkFormatterTest extends TestCase
 {
     public function testWhenNoFileLinkFormatAndNoRequest()
     {

Tests/DependencyInjection/AddClassesToCachePassTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\DependencyInjection\AddClassesToCachePass;
 
 /**
  * @group legacy
  */
-class AddClassesToCachePassTest extends \PHPUnit_Framework_TestCase
+class AddClassesToCachePassTest extends TestCase
 {
     public function testExpandClasses()
     {

Tests/Exception/HttpExceptionTest.php

@@ -2,9 +2,10 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-class HttpExceptionTest extends \PHPUnit_Framework_TestCase
+class HttpExceptionTest extends TestCase
 {
     public function headerDataProvider()
     {

Tests/Profiler/FileProfilerStorageTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Profiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
 use Symfony\Component\HttpKernel\Profiler\Profile;
 
-class FileProfilerStorageTest extends \PHPUnit_Framework_TestCase
+class FileProfilerStorageTest extends TestCase
 {
     private $tmpDir;
     private $storage;