diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-30 09:28:22 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-30 09:28:22 +0100 |
| commit | 2d03373e16a1f3f7947a0bf980ab76ecca61a310 (patch) | |
| tree | bb2067896d7c86a0ed2e3ee195f3869b536bcb5e | |
| parent | b557e6c3e9a2b77e4f51f5aeb8db27795facaa43 (diff) | |
| parent | a591c6a0d159ee1941e039f79ef4e91aac9b2f64 (diff) | |
| download | symfony-security-2d03373e16a1f3f7947a0bf980ab76ecca61a310.zip symfony-security-2d03373e16a1f3f7947a0bf980ab76ecca61a310.tar.gz symfony-security-2d03373e16a1f3f7947a0bf980ab76ecca61a310.tar.bz2 | |
Merge branch '2.2' into 2.3v2.3.7
* 2.2:
fixed CS
Fixed the error handling when decoding invalid XML to avoid a Warning
[Form] Fixed: The "data" option is taken into account even if it is NULL
[DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive
Conflicts:
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
| -rw-r--r-- | Http/Firewall/AbstractPreAuthenticatedListener.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/AbstractPreAuthenticatedListener.php b/Http/Firewall/AbstractPreAuthenticatedListener.php index fdc2e8c..94ae901 100644 --- a/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -97,7 +97,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface /** * Clears a PreAuthenticatedToken for this provider (if present) - * + * * @param AuthenticationException $exception */ private function clearToken(AuthenticationException $exception) |