fix merge
This commit is contained in:
parent
2abb25e881
commit
36f3849842
@ -156,7 +156,7 @@ class GuardAuthenticationProviderTest extends TestCase
|
|||||||
{
|
{
|
||||||
$providerKey = 'my_uncool_firewall';
|
$providerKey = 'my_uncool_firewall';
|
||||||
|
|
||||||
$authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
|
$authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
|
||||||
|
|
||||||
// make sure the authenticator is used
|
// make sure the authenticator is used
|
||||||
$this->preAuthenticationToken->expects($this->any())
|
$this->preAuthenticationToken->expects($this->any())
|
||||||
@ -201,8 +201,8 @@ class GuardAuthenticationProviderTest extends TestCase
|
|||||||
|
|
||||||
public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
|
public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
|
||||||
{
|
{
|
||||||
$authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
|
$authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
|
||||||
$authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
|
$authenticatorB = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
|
||||||
$authenticators = array($authenticatorA, $authenticatorB);
|
$authenticators = array($authenticatorA, $authenticatorB);
|
||||||
|
|
||||||
$mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
$mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
||||||
@ -223,7 +223,7 @@ class GuardAuthenticationProviderTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testAuthenticateFailsOnNonOriginatingToken()
|
public function testAuthenticateFailsOnNonOriginatingToken()
|
||||||
{
|
{
|
||||||
$authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
|
$authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
|
||||||
$authenticators = array($authenticatorA);
|
$authenticators = array($authenticatorA);
|
||||||
|
|
||||||
$mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
$mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
||||||
|
Reference in New Issue
Block a user