diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 17:07:36 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 17:07:36 +0100 |
commit | 7a9b11f3428243d368690b9485098e2d531703e7 (patch) | |
tree | 07877047d607cee71ae0312b36c80bbbd040f19f /Guard/Tests/GuardAuthenticatorHandlerTest.php | |
parent | 946bae1b15cb634ea9705476f4bb34fbede6fd2b (diff) | |
parent | b6686776ba39726bafa6435319ba0b3686e41498 (diff) | |
download | symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.zip symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.tar.gz symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.tar.bz2 |
Merge branch '3.1' into 3.2
* 3.1:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
Diffstat (limited to 'Guard/Tests/GuardAuthenticatorHandlerTest.php')
-rw-r--r-- | Guard/Tests/GuardAuthenticatorHandlerTest.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Guard/Tests/GuardAuthenticatorHandlerTest.php b/Guard/Tests/GuardAuthenticatorHandlerTest.php index 6f36702..58a3e17 100644 --- a/Guard/Tests/GuardAuthenticatorHandlerTest.php +++ b/Guard/Tests/GuardAuthenticatorHandlerTest.php @@ -123,11 +123,11 @@ class GuardAuthenticatorHandlerTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'); - $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); - $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'); + $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(); + $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); + $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock(); $this->request = new Request(array(), array(), array(), array(), array(), array()); - $this->guardAuthenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface'); + $this->guardAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock(); } protected function tearDown() |