Remove use of ForwardCompatTrait

Author: jderusse

Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSecurityVotersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
@@ -22,8 +21,6 @@
 
 class AddSecurityVotersPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testNoVoters()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');

Tests/DependencyInjection/CompleteConfigurationTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
@@ -23,8 +22,6 @@
 
 abstract class CompleteConfigurationTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     abstract protected function getLoader(ContainerBuilder $container);
 
     abstract protected function getFileExtension();

Tests/DependencyInjection/MainConfigurationTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\MainConfiguration;
 use Symfony\Component\Config\Definition\Processor;
 
 class MainConfigurationTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * The minimal, required config needed to not have any required validation
      * issues.

Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Security\Factory;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\GuardAuthenticationFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
@@ -21,8 +20,6 @@
 
 class GuardAuthenticationFactoryTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getValidConfigurationTests
      */

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -12,16 +12,13 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Fixtures\UserProvider\DummyProvider;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class SecurityExtensionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testInvalidCheckPath()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');

Tests/Functional/AbstractWebTestCase.php

@@ -11,26 +11,23 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
 class AbstractWebTestCase extends BaseWebTestCase
 {
-    use ForwardCompatTestTrait;
-
     public static function assertRedirect($response, $location)
     {
         self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.substr($response, 0, 2000));
         self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
     }
 
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         static::deleteTmpDir();
     }
 
-    private static function doTearDownAfterClass()
+    public static function tearDownAfterClass()
     {
         static::deleteTmpDir();
     }

Tests/Functional/UserPasswordEncoderCommandTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
 use Symfony\Component\Console\Application as ConsoleApplication;
@@ -28,8 +27,6 @@
  */
 class UserPasswordEncoderCommandTest extends AbstractWebTestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var CommandTester */
     private $passwordEncoderCommandTester;
 
@@ -246,7 +243,7 @@ public function testLegacy()
         $this->assertContains('Encoder used       Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder', $tester->getDisplay());
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
@@ -259,7 +256,7 @@ private function doSetUp()
         $this->passwordEncoderCommandTester = new CommandTester($passwordEncoderCommand);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->passwordEncoderCommandTester = null;
     }