Merge branch '3.2'

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

Author: nicolas-grekas

Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\LazyChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 
 /**
  * @author Jules Pietri <[email protected]>
  */
-class CallbackChoiceLoaderTest extends \PHPUnit_Framework_TestCase
+class CallbackChoiceLoaderTest extends TestCase
 {
     /**
      * @var \Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader

Tests/Extension/Core/DataTransformer/DateIntervalTestCase.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
-abstract class DateIntervalTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class DateIntervalTestCase extends TestCase
 {
     public static function assertDateIntervalEquals(\DateInterval $expected, \DateInterval $actual)
     {

composer.json

@@ -35,6 +35,7 @@
         "symfony/var-dumper": "~3.2"
     },
     "conflict": {
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/doctrine-bridge": "<2.7",
         "symfony/framework-bundle": "<2.7",
         "symfony/twig-bridge": "<2.7"