summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-06-29 07:43:10 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2016-06-29 07:43:10 +0200
commit6c4c152f2a7a0b22d49074a71e34fc4020eeac22 (patch)
treea0c7db08589f11bd9e1557efcfe9c1436b3d4729 /Http
parent3f8bd07f269080e291f0785ccd2a6f1126123b99 (diff)
parentad26beddbb9a24638754523d7232daab3580e4ae (diff)
downloadsymfony-security-6c4c152f2a7a0b22d49074a71e34fc4020eeac22.zip
symfony-security-6c4c152f2a7a0b22d49074a71e34fc4020eeac22.tar.gz
symfony-security-6c4c152f2a7a0b22d49074a71e34fc4020eeac22.tar.bz2
Merge branch '3.1'
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
Diffstat (limited to 'Http')
-rw-r--r--Http/Authentication/DefaultAuthenticationFailureHandler.php2
-rw-r--r--Http/Authentication/DefaultAuthenticationSuccessHandler.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Http/Authentication/DefaultAuthenticationFailureHandler.php b/Http/Authentication/DefaultAuthenticationFailureHandler.php
index 3e63992..ea5c356 100644
--- a/Http/Authentication/DefaultAuthenticationFailureHandler.php
+++ b/Http/Authentication/DefaultAuthenticationFailureHandler.php
@@ -47,7 +47,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
*
* @param HttpKernelInterface $httpKernel
* @param HttpUtils $httpUtils
- * @param array $options Options for processing a failed authentication attempt.
+ * @param array $options Options for processing a failed authentication attempt
* @param LoggerInterface $logger Optional logger
*/
public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = array(), LoggerInterface $logger = null)
diff --git a/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 38690c7..4cb4bb6 100644
--- a/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -43,7 +43,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
* Constructor.
*
* @param HttpUtils $httpUtils
- * @param array $options Options for processing a successful authentication attempt.
+ * @param array $options Options for processing a successful authentication attempt
*/
public function __construct(HttpUtils $httpUtils, array $options = array())
{