Commit0c6a77a

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 parents91095ab +0a53599 commit0c6a77aCopy full SHA for 0c6a77a

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,10 @@ asset_version`
`130`	`130`
`131`	`131`	`..code-block::twig`
`132`	`132`
`133`		`- {{ asset_version(packageName = null) }}`
	`133`	`+ {{ asset_version(path,packageName = null) }}`
`134`	`134`
	`135`	+``path``
	`136`	+ type: ``string``
`135`	`137`	``packageName`` (optional)
`136`	`138`	type: ``string`` \| ``null`` default: ``null``
`137`	`139`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1774,7 +1774,7 @@ identifier of the next nested object, instead of omitting the property::`
`1774`	`1774`	`$child = new Person('Joe', $mother);`
`1775`	`1775`
`1776`	`1776`	`// 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 {`
`1778`	`1778`	`// return only the name of the next person in the tree`
`1779`	`1779`	`return $innerObject instanceof Person ? $innerObject->getName() : null;`
`1780`	`1780`	`};`

Comments

(0)