summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorJohannes M. Schmitt <schmittjoh@gmail.com>2011-05-30 10:00:07 +0200
committerJohannes M. Schmitt <schmittjoh@gmail.com>2011-05-30 10:00:07 +0200
commit55ff65be8bbb558bf9f5bf1aaeb5f5bea4903411 (patch)
treef741d29b1781d6ec2c87a5396220ee60921c8928 /Core
parent877e4798347acb6bed5a95df174f05ce6970d74c (diff)
parent5fcd8d03276e142bbedd2194f59cf8e551d624c7 (diff)
downloadsymfony-security-55ff65be8bbb558bf9f5bf1aaeb5f5bea4903411.zip
symfony-security-55ff65be8bbb558bf9f5bf1aaeb5f5bea4903411.tar.gz
symfony-security-55ff65be8bbb558bf9f5bf1aaeb5f5bea4903411.tar.bz2
Merge branch 'master' of http://github.com/symfony/symfony into security
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Token/RememberMeToken.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/Authentication/Token/RememberMeToken.php b/Core/Authentication/Token/RememberMeToken.php
index 7978427..6abb1e5 100644
--- a/Core/Authentication/Token/RememberMeToken.php
+++ b/Core/Authentication/Token/RememberMeToken.php
@@ -27,8 +27,8 @@ class RememberMeToken extends AbstractToken
* Constructor.
*
* @param UserInterface $user
- * @param string $providerKey
- * @param string $key
+ * @param string $providerKey
+ * @param string $key
*/
public function __construct(UserInterface $user, $providerKey, $key) {
parent::__construct($user->getRoles());