Make tests support phpunit 8

Author: nicolas-grekas

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();

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();
     }

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.');

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);