Remove use of ForwardCompatTrait

Author: jderusse

Tests/Authentication/AuthenticationProviderManagerTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -25,8 +24,6 @@
 
 class AuthenticationProviderManagerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAuthenticateWithoutProviders()
     {
         $this->expectException('InvalidArgumentException');

Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider;
 
 class AnonymousAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider('foo');

Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;
 use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 class DaoAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testRetrieveUserWhenProviderDoesNotReturnAnUserInterface()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');

Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Ldap\Adapter\CollectionInterface;
 use Symfony\Component\Ldap\Adapter\QueryInterface;
 use Symfony\Component\Ldap\Entry;
@@ -29,8 +28,6 @@
  */
 class LdapBindAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testEmptyPasswordShouldThrowAnException()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');

Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\LockedException;
 
 class PreAuthenticatedAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider();

Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\Role\Role;
 
 class RememberMeAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider();

Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php

@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\Exception\LockedException;
 use Symfony\Component\Security\Core\User\UserChecker;
 
 class SimpleAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAuthenticateWhenPreChecksFails()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\DisabledException');

Tests/Authentication/Provider/UserAuthenticationProviderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Exception\AccountExpiredException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Exception\CredentialsExpiredException;
@@ -22,8 +21,6 @@
 
 class UserAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider();

Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\RememberMe;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider;
 use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
 
 class InMemoryTokenProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testCreateNewToken()
     {
         $provider = new InMemoryTokenProvider();

Tests/Authentication/Token/RememberMeTokenTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
 use Symfony\Component\Security\Core\Role\Role;
 
 class RememberMeTokenTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $user = $this->getUser();

Tests/Authentication/Token/UsernamePasswordTokenTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Role\Role;
 
 class UsernamePasswordTokenTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $token = new UsernamePasswordToken('foo', 'bar', 'key');

Tests/Authorization/AccessDecisionManagerTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
@@ -21,8 +20,6 @@
 
 class AccessDecisionManagerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSetUnsupportedStrategy()
     {
         $this->expectException('InvalidArgumentException');

Tests/Authorization/AuthorizationCheckerTest.php

@@ -12,20 +12,17 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
 
 class AuthorizationCheckerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $authenticationManager;
     private $accessDecisionManager;
     private $authorizationChecker;
     private $tokenStorage;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
         $this->accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();

Tests/Authorization/Voter/VoterTest.php

@@ -12,18 +12,15 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 class VoterTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     protected $token;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
     }

Tests/Encoder/Argon2iPasswordEncoderTest.php

@@ -12,19 +12,16 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 
 /**
  * @author Zan Baldwin <[email protected]>
  */
 class Argon2iPasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const PASSWORD = 'password';
 
-    private function doSetUp()
+    protected function setUp()
     {
         if (!Argon2iPasswordEncoder::isSupported()) {
             $this->markTestSkipped('Argon2i algorithm is not supported.');

Tests/Encoder/BCryptPasswordEncoderTest.php

@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
 
 /**
  * @author Elnur Abdurrakhimov <[email protected]>
  */
 class BCryptPasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const PASSWORD = 'password';
     const VALID_COST = '04';
 

Tests/Encoder/BasePasswordEncoderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder;
 
 class PasswordEncoder extends BasePasswordEncoder
@@ -28,8 +27,6 @@ public function isPasswordValid($encoded, $raw, $salt)
 
 class BasePasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testComparePassword()
     {
         $this->assertTrue($this->invokeComparePasswords('password', 'password'));

Tests/Encoder/EncoderFactoryTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
@@ -21,8 +20,6 @@
 
 class EncoderFactoryTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetEncoderWithMessageDigestEncoder()
     {
         $factory = new EncoderFactory(['Symfony\Component\Security\Core\User\UserInterface' => [

Tests/Encoder/MessageDigestPasswordEncoderTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 
 class MessageDigestPasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testIsPasswordValid()
     {
         $encoder = new MessageDigestPasswordEncoder('sha256', false, 1);

Tests/Encoder/Pbkdf2PasswordEncoderTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder;
 
 class Pbkdf2PasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testIsPasswordValid()
     {
         $encoder = new Pbkdf2PasswordEncoder('sha256', false, 1, 40);

Tests/Encoder/PlaintextPasswordEncoderTest.php

@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
 
 class PlaintextPasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testIsPasswordValid()
     {
         $encoder = new PlaintextPasswordEncoder();

Tests/User/ChainUserProviderTest.php

@@ -12,15 +12,12 @@
 namespace Symfony\Component\Security\Core\Tests\User;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\ChainUserProvider;
 
 class ChainUserProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testLoadUserByUsername()
     {
         $provider1 = $this->getProvider();

Tests/User/InMemoryUserProviderTest.php

@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\User;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Core\User\User;
 
 class InMemoryUserProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $provider = $this->createProvider();

Tests/User/LdapUserProviderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Core\Tests\User;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Ldap\Adapter\CollectionInterface;
 use Symfony\Component\Ldap\Adapter\QueryInterface;
 use Symfony\Component\Ldap\Entry;
@@ -25,8 +24,6 @@
  */
 class LdapUserProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testLoadUserByUsernameFailsIfCantConnectToLdap()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');