Commit44aa31e

committed

Merge branch '3.4' into 4.1

* 3.4: Fixed a formatting issue in WebLink article RM: Sentence about extending the Request class Update percent.rst

2 parents908b3d9 +6783548 commit44aa31eCopy full SHA for 44aa31e

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,7 @@ of arguments that should be passed when executing that callable.`
`342`	`342`
`343`	`343`	`b) If the argument in the controller is type-hinted with Symfony's`
`344`	`344`	:class:`Symfony\\Component\\HttpFoundation\\Request` object, the
`345`		- ``Request`` is passed in as the value. If you have a custom ``Request``
`346`		- class, it will be injected as long as you extend the Symfony ``Request``.
	`345`	+ ``Request`` is passed in as the value.
`347`	`346`
`348`	`347`	c) If the function or method argument is `variadic`_ and the ``Request``
`349`	`348`	``attributes`` bag contains an array for that argument, they will all be

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ PercentType Field`
`5`	`5`	`=================`
`6`	`6`
`7`	`7`	The ``PercentType`` renders an input text field and specializes in handling
`8`		-percentage data. If your percentage data is stored as a decimal (e.g. ``.95``),
	`8`	+percentage data. If your percentage data is stored as a decimal (e.g. ``0.95``),
`9`	`9`	`you can use this field out-of-the-box. If you store your data as a number`
`10`	`10`	(e.g. ``95``), you should set the ``type`` option to ``integer``.
`11`	`11`
`@@ -56,14 +56,14 @@ type`
`56`	`56`	type: ``string`` default: ``fractional``
`57`	`57`
`58`	`58`	`This controls how your data is stored on your object. For example, a percentage`
`59`		-corresponding to "55%", might be stored as ``.55`` or ``55`` on your
	`59`	+corresponding to "55%", might be stored as ``0.55`` or ``55`` on your
`60`	`60`	`object. The two "types" handle these two cases:`
`61`	`61`
`62`	`62`	* ``fractional``
`63`		- If your data is stored as a decimal (e.g. ``.55``), use this type.
	`63`	+ If your data is stored as a decimal (e.g. ``0.55``), use this type.
`64`	`64`	The data will be multiplied by ``100`` before being shown to the
`65`	`65`	user (e.g. ``55``). The submitted data will be divided by ``100``
`66`		- on form submit so that the decimal value is stored (``.55``);
	`66`	+ on form submit so that the decimal value is stored (``0.55``);
`67`	`67`
`68`	`68`	* ``integer``
`69`	`69`	`If your data is stored as an integer (e.g. 55), then use this option.`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ The WebLink component provides the following Twig functions to send those hints:`
`112`	`112`	`which includes the DNS lookup, TCP handshake, and optional TLS negotiation, allows`
`113`	`113`	`the user agent to mask the high latency costs of establishing a connection".`
`114`	`114`	* ``prefetch()``: "identifies a resource that might be required by the next
`115`		`-navigation, and that the user agent should fetch, such that the user agent`
`116`		`-can deliver a faster response once the resource is requested in the future".`
	`115`	`+ navigation, and that the user agent should fetch, such that the user agent`
	`116`	`+ can deliver a faster response once the resource is requested in the future".`
`117`	`117`	* ``prerender()``: "identifies a resource that might be required by the next
`118`	`118`	`navigation, and that the user agent should fetch and execute, such that the`
`119`	`119`	`user agent can deliver a faster response once the resource is requested later".`

Comments

(0)