Remove use of ForwardCompatTrait

Author: jderusse

Tests/CsrfTokenManagerTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Csrf\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Csrf\CsrfToken;
@@ -23,8 +22,6 @@
  */
 class CsrfTokenManagerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getManagerGeneratorAndStorage
      */
@@ -213,12 +210,12 @@ private function getGeneratorAndStorage()
         ];
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         $_SERVER['HTTPS'] = 'on';
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         parent::tearDown();
 

Tests/TokenGenerator/UriSafeTokenGeneratorTest.php

@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Csrf\Tests\TokenGenerator;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Csrf\TokenGenerator\UriSafeTokenGenerator;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 class UriSafeTokenGeneratorTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const ENTROPY = 1000;
 
     /**
@@ -36,17 +33,17 @@ class UriSafeTokenGeneratorTest extends TestCase
      */
     private $generator;
 
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         self::$bytes = base64_decode('aMf+Tct/RLn2WQ==');
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->generator = new UriSafeTokenGenerator(self::ENTROPY);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->generator = null;
     }

Tests/TokenStorage/NativeSessionTokenStorageTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Csrf\Tests\TokenStorage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Csrf\TokenStorage\NativeSessionTokenStorage;
 
 /**
@@ -23,16 +22,14 @@
  */
 class NativeSessionTokenStorageTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const SESSION_NAMESPACE = 'foobar';
 
     /**
      * @var NativeSessionTokenStorage
      */
     private $storage;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $_SESSION = [];
 

Tests/TokenStorage/SessionTokenStorageTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Csrf\Tests\TokenStorage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage;
@@ -22,8 +21,6 @@
  */
 class SessionTokenStorageTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const SESSION_NAMESPACE = 'foobar';
 
     /**
@@ -36,7 +33,7 @@ class SessionTokenStorageTest extends TestCase
      */
     private $storage;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->session = new Session(new MockArraySessionStorage());
         $this->storage = new SessionTokenStorage($this->session, self::SESSION_NAMESPACE);