diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:57 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:57 +0100 |
| commit | 84d8e737d03979475eacb87a1239170fc6eab50e (patch) | |
| tree | b9e48852bca87fd8242ef54bb25d5eb42e947930 /Http/Authentication | |
| parent | b7b837e189058e1009b94203146042069ec85982 (diff) | |
| parent | c7d59d4cf078674f865f4103cdf23077f6c1af95 (diff) | |
| download | symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.zip symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.tar.gz symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6: (25 commits)
Added information when an error occured during validation of an answer of a question
Adding note about known BC issues
Adding note about the PdoSessionHandler BC break
[Console] fixes some typos and phpdoc.
fix phpdoc's alignment
[2.6] CS Fixes And Removed An Unused Import
Minor phpcs fixes
[ClassLoader] Fix undefined index in ClassCollectionLoader
CS fixes
Revert "minor #12821 Remove deprecated class (MasterB)"
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.6.2
updated VERSION for 2.6.1
updated CHANGELOG for 2.6.1
bumped Symfony version to 2.5.9
updated VERSION for 2.5.8
update CONTRIBUTORS for 2.5.8
updated CHANGELOG for 2.5.8
...
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/Authentication')
| -rw-r--r-- | Http/Authentication/AuthenticationUtils.php | 3 | ||||
| -rw-r--r-- | Http/Authentication/CustomAuthenticationFailureHandler.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Http/Authentication/AuthenticationUtils.php b/Http/Authentication/AuthenticationUtils.php index 38763dc..317c8a0 100644 --- a/Http/Authentication/AuthenticationUtils.php +++ b/Http/Authentication/AuthenticationUtils.php @@ -38,7 +38,8 @@ class AuthenticationUtils /** * @param bool $clearSession - * @return null|AuthenticationException + * + * @return AuthenticationException|null */ public function getLastAuthenticationError($clearSession = true) { diff --git a/Http/Authentication/CustomAuthenticationFailureHandler.php b/Http/Authentication/CustomAuthenticationFailureHandler.php index 35bfc05..36d4a78 100644 --- a/Http/Authentication/CustomAuthenticationFailureHandler.php +++ b/Http/Authentication/CustomAuthenticationFailureHandler.php @@ -24,8 +24,8 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler /** * Constructor. * - * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance - * @param array $options Options for processing a successful authentication attempt + * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance + * @param array $options Options for processing a successful authentication attempt */ public function __construct(AuthenticationFailureHandlerInterface $handler, array $options) { |