Merge branch '3.2'

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

Author: nicolas-grekas

Tests/Command/YamlLintCommandTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Application as BaseApplication;
@@ -25,7 +26,7 @@
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
-class YamlLintCommandTest extends \PHPUnit_Framework_TestCase
+class YamlLintCommandTest extends TestCase
 {
     private $files;
 

Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolClearerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
 use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
@@ -20,7 +21,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 
-class CachePoolClearerPassTest extends \PHPUnit_Framework_TestCase
+class CachePoolClearerPassTest extends TestCase
 {
     public function testPoolRefsAreWeak()
     {

Tests/DependencyInjection/Compiler/CachePoolPassTest.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-class CachePoolPassTest extends \PHPUnit_Framework_TestCase
+class CachePoolPassTest extends TestCase
 {
     private $cachePoolPass;
 

Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ControllerArgumentValueResolverPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
-class ControllerArgumentValueResolverPassTest extends \PHPUnit_Framework_TestCase
+class ControllerArgumentValueResolverPassTest extends TestCase
 {
     public function testServicesAreOrderedAccordingToPriority()
     {

composer.json

@@ -60,6 +60,7 @@
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
         "phpdocumentor/type-resolver": "<0.2.0",
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/asset": "<3.3",
         "symfony/console": "<3.3",
         "symfony/serializer": "<3.3",