summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-05-27 16:47:40 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-05-27 16:47:40 +0200
commit5a8e158b61fa72aebff84c125026d3bc18389889 (patch)
tree24840a6db730c498df6a241cb6c5633d7279d83e
parent30928a37835ca43141f13fa58333600323cc49b5 (diff)
parented9f49a800ddd8afb19c12791154fe4a5b998dc0 (diff)
downloadsymfony-security-5a8e158b61fa72aebff84c125026d3bc18389889.zip
symfony-security-5a8e158b61fa72aebff84c125026d3bc18389889.tar.gz
symfony-security-5a8e158b61fa72aebff84c125026d3bc18389889.tar.bz2
Merge branch '2.1' into 2.2v2.2.3v2.2.2
* 2.1: 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/Tests/FinderTest.php
-rw-r--r--Core/Authorization/Voter/VoterInterface.php2
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);