Make tests support phpunit 8

nicolas-grekas · nicolas-grekas · commit 9d2f9020903e · 2019-07-31T23:55:24.000+02:00
diff --git a/Core/Tests/Authorization/AuthorizationCheckerTest.php b/Core/Tests/Authorization/AuthorizationCheckerTest.php
@@ -12,17 +12,20 @@
 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;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
         $this->accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();
diff --git a/Core/Tests/Authorization/Voter/VoterTest.php b/Core/Tests/Authorization/Voter/VoterTest.php
@@ -12,15 +12,18 @@
 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;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
     }
diff --git a/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php b/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
@@ -12,16 +12,19 @@
 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 <hello@zanbaldwin.com>
  */
 class Argon2iPasswordEncoderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const PASSWORD = 'password';
 
-    protected function setUp()
+    private function doSetUp()
     {
         if (!Argon2iPasswordEncoder::isSupported()) {
             $this->markTestSkipped('Argon2i algorithm is not supported.');
diff --git a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Core\Tests\Validator\Constraints;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
@@ -23,6 +24,8 @@
  */
 abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
 {
+    use ForwardCompatTestTrait;
+
     const PASSWORD = 's3Cr3t';
     const SALT = '^S4lt$';
 
@@ -46,7 +49,7 @@ protected function createValidator()
         return new UserPasswordValidator($this->tokenStorage, $this->encoderFactory);
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $user = $this->createUser();
         $this->tokenStorage = $this->createTokenStorage($user);
diff --git a/Csrf/Tests/CsrfTokenManagerTest.php b/Csrf/Tests/CsrfTokenManagerTest.php
@@ -12,6 +12,7 @@
 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;
@@ -22,6 +23,8 @@
  */
 class CsrfTokenManagerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @dataProvider getManagerGeneratorAndStorage
      */
@@ -210,12 +213,12 @@ private function getGeneratorAndStorage()
         ];
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $_SERVER['HTTPS'] = 'on';
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         parent::tearDown();
 
diff --git a/Csrf/Tests/TokenGenerator/UriSafeTokenGeneratorTest.php b/Csrf/Tests/TokenGenerator/UriSafeTokenGeneratorTest.php
@@ -12,13 +12,16 @@
 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 <bschussek@gmail.com>
  */
 class UriSafeTokenGeneratorTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const ENTROPY = 1000;
 
     /**
@@ -33,17 +36,17 @@ class UriSafeTokenGeneratorTest extends TestCase
      */
     private $generator;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$bytes = base64_decode('aMf+Tct/RLn2WQ==');
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->generator = new UriSafeTokenGenerator(self::ENTROPY);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->generator = null;
     }
diff --git a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Csrf\Tests\TokenStorage;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Csrf\TokenStorage\NativeSessionTokenStorage;
 
 /**
@@ -22,14 +23,16 @@
  */
 class NativeSessionTokenStorageTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const SESSION_NAMESPACE = 'foobar';
 
     /**
      * @var NativeSessionTokenStorage
      */
     private $storage;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $_SESSION = [];
 
diff --git a/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
@@ -12,6 +12,7 @@
 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;
@@ -21,6 +22,8 @@
  */
 class SessionTokenStorageTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const SESSION_NAMESPACE = 'foobar';
 
     /**
@@ -33,7 +36,7 @@ class SessionTokenStorageTest extends TestCase
      */
     private $storage;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->session = new Session(new MockArraySessionStorage());
         $this->storage = new SessionTokenStorage($this->session, self::SESSION_NAMESPACE);
diff --git a/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php b/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Guard\Tests\Authenticator;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -23,6 +24,8 @@
  */
 class FormLoginAuthenticatorTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $requestWithoutSession;
     private $requestWithSession;
     private $authenticator;
@@ -127,7 +130,7 @@ public function testStartWithSession()
         $this->assertEquals(self::LOGIN_URL, $failureResponse->getTargetUrl());
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->requestWithoutSession = new Request([], [], [], [], [], []);
         $this->requestWithSession = new Request([], [], [], [], [], []);
diff --git a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Guard\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -28,6 +29,8 @@
  */
 class GuardAuthenticationListenerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $authenticationManager;
     private $guardAuthenticatorHandler;
     private $event;
@@ -420,7 +423,7 @@ public function testReturnNullFromGetCredentialsTriggersForAbstractGuardAuthenti
         $listener->handle($this->event);
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager')
             ->disableOriginalConstructor()
@@ -445,7 +448,7 @@ protected function setUp()
         $this->rememberMeServices = $this->getMockBuilder('Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface')->getMock();
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->authenticationManager = null;
         $this->guardAuthenticatorHandler = null;
diff --git a/Guard/Tests/GuardAuthenticatorHandlerTest.php b/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Guard\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -22,6 +23,8 @@
 
 class GuardAuthenticatorHandlerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $tokenStorage;
     private $dispatcher;
     private $token;
@@ -156,7 +159,7 @@ public function testSessionStrategyIsNotCalledWhenStateless()
         $handler->authenticateWithToken($this->token, $this->request, 'some_provider_key');
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
@@ -166,7 +169,7 @@ protected function setUp()
         $this->guardAuthenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->tokenStorage = null;
         $this->dispatcher = null;
diff --git a/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Guard\Tests\Provider;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Guard\AuthenticatorInterface;
@@ -24,6 +25,8 @@
  */
 class GuardAuthenticationProviderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $userProvider;
     private $userChecker;
     private $preAuthenticationToken;
@@ -233,7 +236,7 @@ public function testAuthenticateFailsOnNonOriginatingToken()
         $provider->authenticate($token);
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
         $this->userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
@@ -242,7 +245,7 @@ protected function setUp()
             ->getMock();
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->userProvider = null;
         $this->userChecker = null;
diff --git a/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
@@ -12,21 +12,24 @@
 namespace Symfony\Component\Security\Http\Tests\Authentication;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
 
 class DefaultAuthenticationFailureHandlerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $httpKernel;
     private $httpUtils;
     private $logger;
     private $request;
     private $session;
     private $exception;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->httpKernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $this->httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
diff --git a/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -21,6 +22,8 @@
 
 class SimpleAuthenticationHandlerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $successHandler;
 
     private $failureHandler;
@@ -33,7 +36,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
 
     private $response;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->successHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface')->getMock();
         $this->failureHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface')->getMock();
diff --git a/Http/Tests/Firewall/DigestDataTest.php b/Http/Tests/Firewall/DigestDataTest.php
diff --git a/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php
diff --git a/Http/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php b/Http/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php
diff --git a/Http/Tests/Logout/LogoutUrlGeneratorTest.php b/Http/Tests/Logout/LogoutUrlGeneratorTest.php
diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,18 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
`16`	`17`	`use Symfony\Component\Security\Core\Authorization\Voter\Voter;`
`17`	`18`	`use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;`
`18`	`19`
`19`	`20`	`class VoterTest extends TestCase`
`20`	`21`	`{`
	`22`	`+ use ForwardCompatTestTrait;`
	`23`	`+`
`21`	`24`	`protected $token;`
`22`	`25`
`23`		`- protected function setUp()`
	`26`	`+ private function doSetUp()`
`24`	`27`	`{`
`25`	`28`	`$this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Security\Csrf\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\HttpFoundation\Request;`
`16`	`17`	`use Symfony\Component\HttpFoundation\RequestStack;`
`17`	`18`	`use Symfony\Component\Security\Csrf\CsrfToken;`
`@@ -22,6 +23,8 @@`
`22`	`23`	`*/`
`23`	`24`	`class CsrfTokenManagerTest extends TestCase`
`24`	`25`	`{`
	`26`	`+ use ForwardCompatTestTrait;`
	`27`	`+`
`25`	`28`	`/**`
`26`	`29`	`* @dataProvider getManagerGeneratorAndStorage`
`27`	`30`	`*/`
`@@ -210,12 +213,12 @@ private function getGeneratorAndStorage()`
`210`	`213`	`];`
`211`	`214`	`}`
`212`	`215`
`213`		`- protected function setUp()`
	`216`	`+ private function doSetUp()`
`214`	`217`	`{`
`215`	`218`	`$_SERVER['HTTPS'] = 'on';`
`216`	`219`	`}`
`217`	`220`
`218`		`- protected function tearDown()`
	`221`	`+ private function doTearDown()`
`219`	`222`	`{`
`220`	`223`	`parent::tearDown();`
`221`	`224`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,16 @@`
`12`	`12`	`namespace Symfony\Component\Security\Csrf\Tests\TokenGenerator;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Security\Csrf\TokenGenerator\UriSafeTokenGenerator;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* @author Bernhard Schussek <[email protected]>`
`19`	`20`	`*/`
`20`	`21`	`class UriSafeTokenGeneratorTest extends TestCase`
`21`	`22`	`{`
	`23`	`+ use ForwardCompatTestTrait;`
	`24`	`+`
`22`	`25`	`const ENTROPY = 1000;`
`23`	`26`
`24`	`27`	`/**`
`@@ -33,17 +36,17 @@ class UriSafeTokenGeneratorTest extends TestCase`
`33`	`36`	`*/`
`34`	`37`	`private $generator;`
`35`	`38`
`36`		`- public static function setUpBeforeClass()`
	`39`	`+ private static function doSetUpBeforeClass()`
`37`	`40`	`{`
`38`	`41`	`self::$bytes = base64_decode('aMf+Tct/RLn2WQ==');`
`39`	`42`	`}`
`40`	`43`
`41`		`- protected function setUp()`
	`44`	`+ private function doSetUp()`
`42`	`45`	`{`
`43`	`46`	`$this->generator = new UriSafeTokenGenerator(self::ENTROPY);`
`44`	`47`	`}`
`45`	`48`
`46`		`- protected function tearDown()`
	`49`	`+ private function doTearDown()`
`47`	`50`	`{`
`48`	`51`	`$this->generator = null;`
`49`	`52`	`}`