Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit c619fb5d8b3c · 2017-02-20T14:49:17.000+01:00
* 3.2:
  Updated PHPUnit namespaces
  Add missing conflict rules for phpunit
diff --git a/Tests/Util/TargetPathTraitTest.php b/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()
     {

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\Security\Http\Tests\Util;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`6`	`7`	`use Symfony\Component\Security\Http\Util\TargetPathTrait;`
`7`	`8`
`8`		`-class TargetPathTraitTest extends \PHPUnit_Framework_TestCase`
	`9`	`+class TargetPathTraitTest extends TestCase`
`9`	`10`	`{`
`10`	`11`	`public function testSetTargetPath()`
`11`	`12`	`{`