diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 13:59:59 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 13:59:59 +0200 |
| commit | 729bef85463490cebd41160e3a111954f63a1638 (patch) | |
| tree | 9d33fdc3a0c5f05f50399674c2adafee04045864 /Http/Authentication | |
| parent | de26fac7a2ca06f784ff0b19742878b2107b5643 (diff) | |
| parent | 133d64ad84f9e37d681c70db8a05743fa2001e11 (diff) | |
| download | symfony-security-729bef85463490cebd41160e3a111954f63a1638.zip symfony-security-729bef85463490cebd41160e3a111954f63a1638.tar.gz symfony-security-729bef85463490cebd41160e3a111954f63a1638.tar.bz2 | |
Merge branch '2.5'
* 2.5:
added missing use statements
added missing use statement
added missing use statement
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
Diffstat (limited to 'Http/Authentication')
| -rw-r--r-- | Http/Authentication/AuthenticationUtils.php | 1 | ||||
| -rw-r--r-- | Http/Authentication/DefaultAuthenticationFailureHandler.php | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Http/Authentication/AuthenticationUtils.php b/Http/Authentication/AuthenticationUtils.php index ed4b0a1..03f5e44 100644 --- a/Http/Authentication/AuthenticationUtils.php +++ b/Http/Authentication/AuthenticationUtils.php @@ -54,7 +54,6 @@ class AuthenticationUtils if ($clearSession) { $session->remove(SecurityContextInterface::AUTHENTICATION_ERROR); } - } return $authenticationException; diff --git a/Http/Authentication/DefaultAuthenticationFailureHandler.php b/Http/Authentication/DefaultAuthenticationFailureHandler.php index f106a4a..db96e67 100644 --- a/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -53,7 +53,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle 'failure_path' => null, 'failure_forward' => false, 'login_path' => '/login', - 'failure_path_parameter' => '_failure_path' + 'failure_path_parameter' => '_failure_path', ), $options); } @@ -63,7 +63,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { if ($failureUrl = $request->get($this->options['failure_path_parameter'], null, true)) { - $this->options['failure_path'] = $failureUrl; + $this->options['failure_path'] = $failureUrl; } if (null === $this->options['failure_path']) { |