8000 Merge branch '4.3' into 4.4 · symfony/symfony-docs@d4159e7 · GitHub
[go: up one dir, main page]
Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d4159e7

Browse files
wouterjwouterj
committed
Merge branch '4.3' into 4.4
* 4.3: [#12538] Changed AND to OR
2 parents 462f36a + b3c5c7d commit d4159e7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎security.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ start with ``/admin``, you can:
438438
# require ROLE_ADMIN for /admin*
439439
- { path: '^/admin', roles: ROLE_ADMIN }
440440
441-
# or require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin*
441+
# or require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin*
442442
- { path: '^/admin', roles: [IS_AUTHENTICATED_FULLY, ROLE_ADMIN] }
443443
444444
# the 'path' value can be any valid regular expression
@@ -465,7 +465,7 @@ start with ``/admin``, you can:
465465
<!-- require ROLE_ADMIN for /admin* -->
466466
<rule path="^/admin" role="ROLE_ADMIN"/>
467467
468-
<!-- require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin* -->
468+
<!-- require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin* -->
469469
<rule path="^/admin">
470470
<role>ROLE_ADMIN</role>
471471
<role>IS_AUTHENTICATED_FULLY</role>
@@ -493,7 +493,7 @@ start with ``/admin``, you can:
493493
// require ROLE_ADMIN for /admin*
494494
['path' => '^/admin', 'roles' => 'ROLE_ADMIN'],
495495
496-
// require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin*
496+
// require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin*
497497
['path' => '^/admin', 'roles' => ['ROLE_ADMIN', 'IS_AUTHENTICATED_FULLY']],
498498
499499
// the 'path' value can be any valid regular expression

0 commit comments

Comments
 (0)
0