diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:53:44 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:53:44 +0200 |
| commit | 34bcfc3debc0b7e1fbc68b1bedf98e21163f4967 (patch) | |
| tree | 47f4484cd82bf68bec11be587ea012fccb4950ba /Http | |
| parent | 41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1 (diff) | |
| parent | c7f7fcfa6dbcd0ae71be8fb4b2c0dbbce8f38150 (diff) | |
| download | symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.zip symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.tar.gz symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
fixed CS
fixed CS
Conflicts:
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Tests/Firewall/RememberMeListenerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
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()) |