summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-01-20 13:09:07 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2016-01-20 13:09:07 +0100
commit8dd31201403fe11165c6d8622d458d0a9d0599f1 (patch)
tree89878ff77966be430846c5f56bc52e0c979a5836
parentc8503ac7d0e73a8c9594da174228375453acd329 (diff)
parent3515cf295247b4929da32c8f9c733f99855d8f7c (diff)
downloadsymfony-security-8dd31201403fe11165c6d8622d458d0a9d0599f1.zip
symfony-security-8dd31201403fe11165c6d8622d458d0a9d0599f1.tar.gz
symfony-security-8dd31201403fe11165c6d8622d458d0a9d0599f1.tar.bz2
Merge branch '2.7' into 2.8
* 2.7: (28 commits) [Process] Use stream based storage to avoid memory issues Fix upgrade guides concerning erroneous removal of assets helper [Process] Remove a misleading comment Fix markdown typo ChooseBaseUrl should return an index [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced Improve the phpdoc of SplFileInfo methods [Process] Use stream based storage to avoid memory issues [FrameworkBundle] Don't log twice with the error handler Remove useless is_object condition [Process] Fix typo, no arguments needed anymore [Serializer] Introduce constants for context keys Fixed the documentation of VoterInterface::supportsAttribute Fixed Bootstrap form theme form "reset" buttons Remove useless duplicated tests [FrameworkBundle] Optimize framework extension tests synchronize 2.7 and 3.0 upgrade files fix merge 2.3 into 2.7 for SecureRandom dependency Use is_subclass_of instead of reflection Use is_subclass_of instead of Reflection when possible ...
-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 7e243f9..91ddc1f 100644
--- a/Core/Authorization/Voter/VoterInterface.php
+++ b/Core/Authorization/Voter/VoterInterface.php
@@ -27,7 +27,7 @@ interface VoterInterface
/**
* Checks if the voter supports the given attribute.
*
- * @param string $attribute An attribute
+ * @param mixed $attribute An attribute (usually the attribute name string)
*
* @return bool true if this Voter supports the attribute, false otherwise
*