diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-24 15:36:35 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-24 15:36:35 +0100 |
| commit | 2ed9ab016307cdeb6ef88dcc79648c8f1d79255c (patch) | |
| tree | 7c7f98ed0af7be4ab318562d25a4df82374d808a /Core/SecurityContextInterface.php | |
| parent | 666dcfb222822bd7ab620cd24631a24f12215bba (diff) | |
| parent | c8e2d4a8bc6cb7bf9418a57e680278723aa76f94 (diff) | |
| download | symfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.zip symfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.tar.gz symfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.tar.bz2 | |
Merge branch '2.4'
* 2.4: (35 commits)
Update validators.ro.xlf
add non-standard port to HTTP_HOST
fixed attribute "source-language" for translations
[Process] clarify idle timeout
[Security] fix DI for SimpleFormAuthenticationListener
Update PluralizationRules.php
Update validators.pt_BR.xlf
Translated remaining items (57-72)
Updated Vietnamese translation
allow null value in fragment handler
added missing dot in translation
updated Arabic translations
Update validators.id.xlf
[Validator] Translate validator messages into Brazilian Portuguese
Added more Swedish validator translations
Update validators.ca.xlf
fixed typos in Welsh translation
Added missing Croatian translations
[Form] fixed allow render 0 and 0.0 numeric input values
Fixed validators.nl.xlf
...
Conflicts:
src/Symfony/Bridge/Twig/composer.json
Diffstat (limited to 'Core/SecurityContextInterface.php')
| -rw-r--r-- | Core/SecurityContextInterface.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php index 78d6477..434f9a5 100644 --- a/Core/SecurityContextInterface.php +++ b/Core/SecurityContextInterface.php @@ -34,14 +34,14 @@ interface SecurityContextInterface /** * Sets the authentication token. * - * @param TokenInterface $token + * @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored */ public function setToken(TokenInterface $token = null); /** * Checks if the attributes are granted against the current authentication token and optionally supplied object. * - * @param array $attributes + * @param mixed $attributes * @param mixed $object * * @return Boolean |