Merge branch '3.2'

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

Author: nicolas-grekas

Tests/LdapTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Ldap\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Ldap\Adapter\AdapterInterface;
 use Symfony\Component\Ldap\Adapter\ConnectionInterface;
 use Symfony\Component\Ldap\Exception\DriverNotFoundException;
 use Symfony\Component\Ldap\Ldap;
 
-class LdapTest extends \PHPUnit_Framework_TestCase
+class LdapTest extends TestCase
 {
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $adapter;

Tests/LdapTestCase.php

@@ -2,7 +2,9 @@
 
 namespace Symfony\Component\Ldap\Tests;
 
-class LdapTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class LdapTestCase extends TestCase
 {
     protected function getLdapConfig()
     {