Skip to content

Navigation Menu

Sign in
Appearance settings

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 fcca521

Browse filesBrowse files
committed
Merge branch '3.4' into 4.2
* 3.4: Backport #11984 to 3.4 branch add $context argument to supportsNormalization() [Security] Better explain what happens when multiple roles are passed
2 parents e5eec74 + 5d081b2 commit fcca521
Copy full SHA for fcca521

File tree

3 files changed

+4
-3
lines changed
Filter options

3 files changed

+4
-3
lines changed

‎frontend/encore/simple-example.rst

Copy file name to clipboardExpand all lines: frontend/encore/simple-example.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Compiling Only a CSS File
322322
.. caution::
323323

324324
Using ``addStyleEntry()`` is supported, but not recommended. A better option
325-
is to use follow the pattern above: use ``addEntry()`` to point to a JavaScript
325+
is to follow the pattern above: use ``addEntry()`` to point to a JavaScript
326326
file, then require the CSS needed from inside of that.
327327

328328
If you want to only compile a CSS file, that's possible via ``addStyleEntry()``:

‎reference/twig_reference.rst

Copy file name to clipboardExpand all lines: reference/twig_reference.rst
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ 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.
178+
them or all of them, depending on the
179+
:ref:`Access Decision Manager strategy <security-access-control-enforcement-options>`.
179180

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

‎serializer/custom_normalizer.rst

Copy file name to clipboardExpand all lines: serializer/custom_normalizer.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ to customize the normalized data. To do that, leverage the ``ObjectNormalizer``:
4747
return $data;
4848
}
4949

50-
public function supportsNormalization($data, $format = null)
50+
public function supportsNormalization($data, $format = null, array $context = [])
5151
{
5252
return $data instanceof Topic;
5353
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.