diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:16:33 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:16:33 +0200 |
| commit | 12a6ccbca008f06b7b6a95b2e0ec02abc03e4253 (patch) | |
| tree | dbad71f28c662376b9c633943c52a866824372d4 | |
| parent | 79b843690e5ec9df6f0184756c702d96579b41e0 (diff) | |
| parent | dd1ae0ad000020fc6ddae6c66846e5fe383d8828 (diff) | |
| download | symfony-security-12a6ccbca008f06b7b6a95b2e0ec02abc03e4253.zip symfony-security-12a6ccbca008f06b7b6a95b2e0ec02abc03e4253.tar.gz symfony-security-12a6ccbca008f06b7b6a95b2e0ec02abc03e4253.tar.bz2 | |
Merge branch '2.4' into 2.5
* 2.4:
[DependencyInjection] fix @return anno created by PhpDumper
Fixed the phpdoc of the VoterInterface
[DoctrineBridge] Fix empty parameter logging in the dbal logger
Fixed #11675 ValueToDuplicatesTransformer accept "0" value
check for the correct field type
fix handling of nullable XML attributes
[DomCrawler] fix the axes handling in a bc way
Conflicts:
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
| -rw-r--r-- | Core/Authorization/Voter/VoterInterface.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authorization/Voter/VoterInterface.php b/Core/Authorization/Voter/VoterInterface.php index abc18b4..79fa69f 100644 --- a/Core/Authorization/Voter/VoterInterface.php +++ b/Core/Authorization/Voter/VoterInterface.php @@ -49,7 +49,7 @@ interface VoterInterface * ACCESS_GRANTED, ACCESS_DENIED, or ACCESS_ABSTAIN. * * @param TokenInterface $token A TokenInterface instance - * @param object $object The object to secure + * @param object|null $object The object to secure * @param array $attributes An array of attributes associated with the method being invoked * * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED |