diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:16:42 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-08-26 16:16:42 +0200 |
| commit | 518f866e608bfa5198c5cc79491cec0dfd66363e (patch) | |
| tree | f1113cbeb1730168a66124201fa43df9a35418af /Core | |
| parent | 8ad895b224583c8951cc1a54e598f145e145c309 (diff) | |
| parent | 12a6ccbca008f06b7b6a95b2e0ec02abc03e4253 (diff) | |
| download | symfony-security-518f866e608bfa5198c5cc79491cec0dfd66363e.zip symfony-security-518f866e608bfa5198c5cc79491cec0dfd66363e.tar.gz symfony-security-518f866e608bfa5198c5cc79491cec0dfd66363e.tar.bz2 | |
Merge branch '2.5'
* 2.5:
[DependencyInjection] fix @return anno created by PhpDumper
Fixed the phpdoc of the VoterInterface
[DoctrineBridge] Fix empty parameter logging in the dbal logger
[Validator] remove duplicate interface implementations
[Validator] fix return doc of ClassMetadata::getCascadingStrategy
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
Diffstat (limited to 'Core')
| -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 |