Merge branch '3.2'

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

Author: nicolas-grekas

Core/Tests/Authorization/TraceableAccessDecisionManagerTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Core\Tests\Authorization;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\DebugAccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\TraceableAccessDecisionManager;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-class TraceableAccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
+class TraceableAccessDecisionManagerTest extends TestCase
 {
     /**
      * @dataProvider provideObjectsAndLogs

Http/Tests/Util/TargetPathTraitTest.php

@@ -2,10 +2,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Http\Util\TargetPathTrait;
 
-class TargetPathTraitTest extends \PHPUnit_Framework_TestCase
+class TargetPathTraitTest extends TestCase
 {
     public function testSetTargetPath()
     {