summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-10-18 17:01:05 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-10-18 17:01:47 +0200
commitf2119452ff4c24fef69cded521003b58a7971319 (patch)
tree114055b50aff669e0d1b55c9da81100bad6817d5
parentaa8caa52c085ff6b1015c101cc0c9cf1dc898076 (diff)
parenta406f17bd63a506a3db3a0198fb34709aa6dd389 (diff)
downloadsymfony-security-f2119452ff4c24fef69cded521003b58a7971319.zip
symfony-security-f2119452ff4c24fef69cded521003b58a7971319.tar.gz
symfony-security-f2119452ff4c24fef69cded521003b58a7971319.tar.bz2
Merge branch '2.3'
* 2.3: [DoctrineBridge] Added type check to prevent calling clear() on arrays [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty Fix docblock typo
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index 6a47a7a..740d3d6 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -291,7 +291,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
}
/**
- * Checks whether remember-me capabilities where requested
+ * Checks whether remember-me capabilities were requested
*
* @param Request $request
*