diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-30 09:31:46 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-10-30 09:31:46 +0100 |
| commit | d32a490e3f1497b2b26e4ac03384c9d172569cb6 (patch) | |
| tree | 7f9052415e2707f09fad223b41e8b15ebb1c23ae | |
| parent | 09989b5b3bfee97a4e776dd6c80dabb080fe3f6e (diff) | |
| parent | 2d03373e16a1f3f7947a0bf980ab76ecca61a310 (diff) | |
| download | symfony-security-d32a490e3f1497b2b26e4ac03384c9d172569cb6.zip symfony-security-d32a490e3f1497b2b26e4ac03384c9d172569cb6.tar.gz symfony-security-d32a490e3f1497b2b26e4ac03384c9d172569cb6.tar.bz2 | |
Merge branch '2.3'
* 2.3:
fixed CS
fixed CS
[HttpKernel] fixed memory limit display in MemoryDataCollector
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/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.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) |