summaryrefslogtreecommitdiffstats
path: root/Core/Role
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-01-24 15:36:35 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-01-24 15:36:35 +0100
commit2ed9ab016307cdeb6ef88dcc79648c8f1d79255c (patch)
tree7c7f98ed0af7be4ab318562d25a4df82374d808a /Core/Role
parent666dcfb222822bd7ab620cd24631a24f12215bba (diff)
parentc8e2d4a8bc6cb7bf9418a57e680278723aa76f94 (diff)
downloadsymfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.zip
symfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.tar.gz
symfony-security-2ed9ab016307cdeb6ef88dcc79648c8f1d79255c.tar.bz2
Merge branch '2.4'
* 2.4: (35 commits) Update validators.ro.xlf add non-standard port to HTTP_HOST fixed attribute "source-language" for translations [Process] clarify idle timeout [Security] fix DI for SimpleFormAuthenticationListener Update PluralizationRules.php Update validators.pt_BR.xlf Translated remaining items (57-72) Updated Vietnamese translation allow null value in fragment handler added missing dot in translation updated Arabic translations Update validators.id.xlf [Validator] Translate validator messages into Brazilian Portuguese Added more Swedish validator translations Update validators.ca.xlf fixed typos in Welsh translation Added missing Croatian translations [Form] fixed allow render 0 and 0.0 numeric input values Fixed validators.nl.xlf ... Conflicts: src/Symfony/Bridge/Twig/composer.json
Diffstat (limited to 'Core/Role')
-rw-r--r--Core/Role/RoleHierarchy.php6
-rw-r--r--Core/Role/RoleHierarchyInterface.php2
2 files changed, 2 insertions, 6 deletions
diff --git a/Core/Role/RoleHierarchy.php b/Core/Role/RoleHierarchy.php
index 44ccb39..793007e 100644
--- a/Core/Role/RoleHierarchy.php
+++ b/Core/Role/RoleHierarchy.php
@@ -34,11 +34,7 @@ class RoleHierarchy implements RoleHierarchyInterface
}
/**
- * Returns an array of all roles reachable by the given ones.
- *
- * @param RoleInterface[] $roles An array of RoleInterface instances
- *
- * @return RoleInterface[] An array of RoleInterface instances
+ * {@inheritdoc}
*/
public function getReachableRoles(array $roles)
{
diff --git a/Core/Role/RoleHierarchyInterface.php b/Core/Role/RoleHierarchyInterface.php
index 2ea6ca3..c994009 100644
--- a/Core/Role/RoleHierarchyInterface.php
+++ b/Core/Role/RoleHierarchyInterface.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\Security\Core\Role;
interface RoleHierarchyInterface
{
/**
- * Returns an array of all reachable roles.
+ * Returns an array of all reachable roles by the given ones.
*
* Reachable roles are the roles directly assigned but also all roles that
* are transitively reachable from them in the role hierarchy.