Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 164944e4b31c · 2019-08-03T23:50:52.000+02:00
* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset
diff --git a/Tests/Authentication/AuthenticationProviderManagerTest.php b/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');
diff --git a/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php b/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');
diff --git a/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/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');
diff --git a/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/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');
diff --git a/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/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();
diff --git a/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.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\RememberMeAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 
 class RememberMeAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider();
diff --git a/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php b/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.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\Authentication\Provider\SimpleAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\Exception\LockedException;
@@ -23,8 +22,6 @@
  */
 class SimpleAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAuthenticateWhenPreChecksFails()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\DisabledException');
diff --git a/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/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\Authentication\Token\SwitchUserToken;
 use Symfony\Component\Security\Core\Exception\AccountExpiredException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
@@ -22,8 +21,6 @@
 
 class UserAuthenticationProviderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSupports()
     {
         $provider = $this->getProvider();
diff --git a/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php b/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();
diff --git a/Tests/Authentication/Token/RememberMeTokenTest.php b/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -12,13 +12,10 @@
 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;
 
 class RememberMeTokenTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $user = $this->getUser();
diff --git a/Tests/Authentication/Token/UsernamePasswordTokenTest.php b/Tests/Authentication/Token/UsernamePasswordTokenTest.php
@@ -12,13 +12,10 @@
 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;
 
 class UsernamePasswordTokenTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $token = new UsernamePasswordToken('foo', 'bar', 'key');
diff --git a/Tests/Authorization/AccessDecisionManagerTest.php b/Tests/Authorization/AccessDecisionManagerTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 class AccessDecisionManagerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSetUnsupportedStrategy()
     {
         $this->expectException('InvalidArgumentException');
diff --git a/Tests/Authorization/AuthorizationCheckerTest.php b/Tests/Authorization/AuthorizationCheckerTest.php
@@ -12,21 +12,18 @@
 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\Authentication\Token\UsernamePasswordToken;
 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();
diff --git a/Tests/Authorization/Voter/VoterTest.php b/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();
     }
diff --git a/Tests/Encoder/Argon2iPasswordEncoderTest.php b/Tests/Encoder/Argon2iPasswordEncoderTest.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\Argon2iPasswordEncoder;
 
 /**
@@ -22,11 +21,9 @@
  */
 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.');
diff --git a/Tests/Encoder/BCryptPasswordEncoderTest.php b/Tests/Encoder/BCryptPasswordEncoderTest.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\BCryptPasswordEncoder;
 
 /**
@@ -22,8 +21,6 @@
  */
 class BCryptPasswordEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const PASSWORD = 'password';
     const VALID_COST = '04';
 
diff --git a/Tests/Encoder/BasePasswordEncoderTest.php b/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'));
diff --git a/Tests/Encoder/EncoderFactoryTest.php b/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' => [
diff --git a/Tests/Encoder/MessageDigestPasswordEncoderTest.php b/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);
diff --git a/Tests/Encoder/Pbkdf2PasswordEncoderTest.php b/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);
diff --git a/Tests/Encoder/PlaintextPasswordEncoderTest.php b/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();
diff --git a/Tests/User/ChainUserProviderTest.php b/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();
diff --git a/Tests/User/InMemoryUserProviderTest.php b/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();
diff --git a/Tests/User/LdapUserProviderTest.php b/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');
diff --git a/Tests/User/UserCheckerTest.php b/Tests/User/UserCheckerTest.php
diff --git a/Tests/User/UserTest.php b/Tests/User/UserTest.php
diff --git a/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Tests/Validator/Constraints/UserPasswordValidatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authentication;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;`
`17`	`16`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
`18`	`17`	`use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;`
`@@ -25,8 +24,6 @@`
`25`	`24`
`26`	`25`	`class AuthenticationProviderManagerTest extends TestCase`
`27`	`26`	`{`
`28`		`- use ForwardCompatTestTrait;`
`29`		`-`
`30`	`27`	`public function testAuthenticateWithoutProviders()`
`31`	`28`	`{`
`32`	`29`	`$this->expectException('InvalidArgumentException');`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider;`
`17`	`16`
`18`	`17`	`class AnonymousAuthenticationProviderTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ForwardCompatTestTrait;`
`21`		`-`
`22`	`19`	`public function testSupports()`
`23`	`20`	`{`
`24`	`21`	`$provider = $this->getProvider('foo');`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,12 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;`
`17`	`16`	`use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;`
`18`	`17`	`use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;`
`19`	`18`
`20`	`19`	`class DaoAuthenticationProviderTest extends TestCase`
`21`	`20`	`{`
`22`		`- use ForwardCompatTestTrait;`
`23`		`-`
`24`	`21`	`public function testRetrieveUserWhenProviderDoesNotReturnAnUserInterface()`
`25`	`22`	`{`
`26`	`23`	`$this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,11 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider;`
`17`	`16`	`use Symfony\Component\Security\Core\Exception\LockedException;`
`18`	`17`
`19`	`18`	`class PreAuthenticatedAuthenticationProviderTest extends TestCase`
`20`	`19`	`{`
`21`		`- use ForwardCompatTestTrait;`
`22`		`-`
`23`	`20`	`public function testSupports()`
`24`	`21`	`{`
`25`	`22`	`$provider = $this->getProvider();`