Skip to content

Commit 0c6a77a

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [Twig] [Twig Reference] fix path parameter and add example in asset v… Update serializer.rst
2 parents 91095ab + 0a53599 commit 0c6a77a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

reference/twig_reference.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ asset_version
130130

131131
.. code-block:: twig
132132
133-
{{ asset_version(packageName = null) }}
133+
{{ asset_version(path, packageName = null) }}
134134
135+
``path``
136+
**type**: ``string``
135137
``packageName`` *(optional)*
136138
**type**: ``string`` | ``null`` **default**: ``null``
137139

serializer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ identifier of the next nested object, instead of omitting the property::
17741774
$child = new Person('Joe', $mother);
17751775

17761776
// all callback parameters are optional (you can omit the ones you don't use)
1777-
$maxDepthHandler = function (object $innerObject, object $outerObject, string $attributeName, ?string $format = null, array $context = []): string {
1777+
$maxDepthHandler = function (object $innerObject, object $outerObject, string $attributeName, ?string $format = null, array $context = []): ?string {
17781778
// return only the name of the next person in the tree
17791779
return $innerObject instanceof Person ? $innerObject->getName() : null;
17801780
};

0 commit comments

Comments
 (0)