diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:32:45 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:32:45 +0200 |
| commit | f81b1cd7a05c28ce191bc5d4295bbea7367368d4 (patch) | |
| tree | 162878fcf036372b2b7afeccc92b689c3c292cdd /Http/Tests/Authentication | |
| parent | db95dbe483b2f8ce7bae38ea37ae1f42fe141a6c (diff) | |
| parent | c29b2f6d4618d6366d6e5fb3770169c7e1773bf3 (diff) | |
| download | symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.zip symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.tar.gz symfony-security-f81b1cd7a05c28ce191bc5d4295bbea7367368d4.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
Diffstat (limited to 'Http/Tests/Authentication')
| -rw-r--r-- | Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php index e065660..f642096 100644 --- a/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php +++ b/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php @@ -38,7 +38,7 @@ class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCas $this->session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface'); $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request'); $this->request->expects($this->any())->method('getSession')->will($this->returnValue($this->session)); - $this->exception = $this->getMock('Symfony\Component\Security\Core\Exception\AuthenticationException'); + $this->exception = $this->getMock('Symfony\Component\Security\Core\Exception\AuthenticationException', array('getMessage')); } public function testForward() |