diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 09:12:03 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 09:12:03 +0100 |
| commit | 8671ca5b3f863275b19c7bba751278926bc3dace (patch) | |
| tree | b64006cccfd6387556ed74b491b088373fd13cac | |
| parent | 0fff311596235f2196f9b36750ff97fbe899ab72 (diff) | |
| parent | a32c9ce67253c4571e867799fcddbeb1619cf3fd (diff) | |
| download | symfony-security-8671ca5b3f863275b19c7bba751278926bc3dace.zip symfony-security-8671ca5b3f863275b19c7bba751278926bc3dace.tar.gz symfony-security-8671ca5b3f863275b19c7bba751278926bc3dace.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
fixed a typo
fixed CS for lambdas
[Yaml] fixed some license headers
Fixes message value for objects
Check for hour, minute & second validity
fixed various typos
[Filesystem] Fixed mirror for symlinks
[Validator] Removed duplicated test for IBAN in data provider
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
| -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 |