diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-05-27 16:49:21 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-05-27 16:49:21 +0200 |
| commit | f54858561272d81ffb9e431c0032c04ec4365bc6 (patch) | |
| tree | 99285df07ef78f94224f047d374faa9c81baba29 | |
| parent | 8061daa0391e95e34eff345a46e29cf155416cc4 (diff) | |
| parent | 5a8e158b61fa72aebff84c125026d3bc18389889 (diff) | |
| download | symfony-security-f54858561272d81ffb9e431c0032c04ec4365bc6.zip symfony-security-f54858561272d81ffb9e431c0032c04ec4365bc6.tar.gz symfony-security-f54858561272d81ffb9e431c0032c04ec4365bc6.tar.bz2 | |
Merge branch '2.2' into 2.3v2.3.0
* 2.2:
Fix several instances of doubled words
[Finder] Fix iteration fails with non-rewindable streams
[Finder] Fix unexpected duplicate sub path related AppendIterator issue
Added type of return value in VoterInterface.
Fixed two bugs in HttpCache
Conflicts:
src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.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 1fc93e5..0840c1c 100644 --- a/Core/Authorization/Voter/VoterInterface.php +++ b/Core/Authorization/Voter/VoterInterface.php @@ -38,7 +38,7 @@ interface VoterInterface * * @param string $class A class name * - * @return true if this Voter can process the class + * @return Boolean true if this Voter can process the class */ public function supportsClass($class); |