Merge branch '3.2'

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

Author: nicolas-grekas

Tests/Definition/Builder/BooleanNodeDefinitionTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition;
 
-class BooleanNodeDefinitionTest extends \PHPUnit_Framework_TestCase
+class BooleanNodeDefinitionTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException

Tests/Resource/ClassExistenceResourceTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Config\Tests\Resource;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\Config\Tests\Fixtures\Resource\ConditionalClass;
 
-class ClassExistenceResourceTest extends \PHPUnit_Framework_TestCase
+class ClassExistenceResourceTest extends TestCase
 {
     public function testToString()
     {