diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-15 16:16:35 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-15 16:16:35 +0200 |
| commit | 450dfddf29562061e5c2d511c20ee8e8e06d99cf (patch) | |
| tree | 2214477049f97cfb85b1a08065372d6b3e7be1aa /Http | |
| parent | 4c7bd960282b017cd44aae49353c723f1da466af (diff) | |
| parent | 6ed97b76b3efaf04314def15abefd7e8e284a2d0 (diff) | |
| download | symfony-security-450dfddf29562061e5c2d511c20ee8e8e06d99cf.zip symfony-security-450dfddf29562061e5c2d511c20ee8e8e06d99cf.tar.gz symfony-security-450dfddf29562061e5c2d511c20ee8e8e06d99cf.tar.bz2 | |
Merge branch '2.8'
* 2.8:
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:
UPGRADE-2.7.md
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/Console/Helper/DialogHelper.php
src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php | 2 | ||||
| -rw-r--r-- | Http/Tests/Firewall/RememberMeListenerTest.php | 2 |
2 files changed, 2 insertions, 2 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() diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php index ec1c35d..e348355 100644 --- a/Http/Tests/Firewall/RememberMeListenerTest.php +++ b/Http/Tests/Firewall/RememberMeListenerTest.php @@ -106,7 +106,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase */ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation() { - list($listener, $tokenStorage, $service, $manager,) = $this->getListener(false, false); + list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, false); $tokenStorage ->expects($this->once()) |