diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:14:58 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:14:58 +0200 |
| commit | dd1ae0ad000020fc6ddae6c66846e5fe383d8828 (patch) | |
| tree | ac1380c1e7213013429122b691487ee8ae257979 | |
| parent | 326e51cc489ecb824954cbf2a0f6ac8b7dc1b726 (diff) | |
| parent | 7d54a1a19687aed3f719640a78c5abdc88976445 (diff) | |
| download | symfony-security-dd1ae0ad000020fc6ddae6c66846e5fe383d8828.zip symfony-security-dd1ae0ad000020fc6ddae6c66846e5fe383d8828.tar.gz symfony-security-dd1ae0ad000020fc6ddae6c66846e5fe383d8828.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
[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/DomCrawler/Tests/CrawlerTest.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 |