Skip to content

Commit dcd9bfa

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: fix voting on multiple roles behavior description
2 parents 388013c + 0b85305 commit dcd9bfa

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

reference/twig_reference.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ is_granted
175175

176176
Returns ``true`` if the current user has the given role. If several roles are
177177
passed in an array, ``true`` is returned if the user has at least one of
178-
them or all of them, depending on the
179-
:ref:`Access Decision Manager strategy <security-access-control-enforcement-options>`.
178+
them.
180179

181180
Optionally, an object can be passed to be used by the voter. More information
182181
can be found in :ref:`security-template`.

security/access_control.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ options:
147147
* ``roles`` If the user does not have the given role, then access is denied
148148
(internally, an :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
149149
is thrown). If this value is an array of multiple roles, the user must have
150-
at least one of them (when using the default ``affirmative`` strategy in the
151-
:ref:`Access Decision Manager <components-security-access-decision-manager>`)
152-
or all of them when using the ``unanimous`` strategy;
150+
at least one of them.
153151

154152
* ``allow_if`` If the expression returns false, then access is denied;
155153

0 commit comments

Comments
 (0)