diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 09:12:58 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 09:12:58 +0100 |
| commit | e1b3cad806eeac40b55904ff27f94414686b04bf (patch) | |
| tree | a9612271562d20682fde63bc22c4dd334cd25804 /Http | |
| parent | 63903803dccb799e3ae52538b68411fc9889d3d5 (diff) | |
| parent | 8671ca5b3f863275b19c7bba751278926bc3dace (diff) | |
| download | symfony-security-e1b3cad806eeac40b55904ff27f94414686b04bf.zip symfony-security-e1b3cad806eeac40b55904ff27f94414686b04bf.tar.gz symfony-security-e1b3cad806eeac40b55904ff27f94414686b04bf.tar.bz2 | |
Merge branch '2.4'
* 2.4:
fixed CS
fixed a typo
fixed CS for lambdas
[Yaml] fixed some license headers
Fixes message value for objects
Check for hour, minute & second validity
avoid tables to have apparently long blank line breaks and be too far appart for long nested array params
fixed various typos
[Filesystem] Fixed mirror for symlinks
[Validator] Removed duplicated test for IBAN in data provider
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 995b6f6..571abbe 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -116,7 +116,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The unixtime when the cookie expires + * @param integer $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException if username contains invalid chars @@ -138,7 +138,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The unixtime when the cookie expires + * @param integer $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException when the private key is empty |