diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:33:16 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:33:16 +0200 |
| commit | 41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1 (patch) | |
| tree | 443aa261c131816e4d9895476a9405fcd468c63e /Http/Tests/Authentication | |
| parent | ad8373bcf455be18e2bdbcec1c37b6c032d5943c (diff) | |
| parent | f81b1cd7a05c28ce191bc5d4295bbea7367368d4 (diff) | |
| download | symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.zip symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.tar.gz symfony-security-41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[DebugBundle] Allow alternative destination for dumps
[DebugBundle] Use output mechanism of dumpers instead of echoing
[DebugBundle] Always collect dumps
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Component/Finder/Expression/Glob.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 fd06e23..82b5533 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() |