diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 16:11:12 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 16:11:12 +0200 |
| commit | a3c3bf47ffef13bb4646f0c7b7971cce399d5950 (patch) | |
| tree | bbc8859d18aee3c4fb90945dbf0ef69cb7a5bf07 /Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php | |
| parent | be8e01596f133c2c950b011fe8b0e261dc6c6f34 (diff) | |
| parent | 34bcfc3debc0b7e1fbc68b1bedf98e21163f4967 (diff) | |
| download | symfony-security-a3c3bf47ffef13bb4646f0c7b7971cce399d5950.zip symfony-security-a3c3bf47ffef13bb4646f0c7b7971cce399d5950.tar.gz symfony-security-a3c3bf47ffef13bb4646f0c7b7971cce399d5950.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
fixed CS
fixed CS
fixed CS
Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
[Validator] Deprecated PHP7-incompatible constraints and related validators
[DebugBundle] Allow alternative destination for dumps
[DebugBundle] Use output mechanism of dumpers instead of echoing
[DebugBundle] Always collect dumps
[FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Bundle/FrameworkBundle/composer.json
Diffstat (limited to 'Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php')
| -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() |