Skip to content

Commit d53074d

Browse files
committed
Merge branch '4.1'
* 4.1: Fixed a formatting issue in WebLink article Update github link to web-link instead of weblink RM: Sentence about extending the Request class Update percent.rst
2 parents 3edbcad + 44aa31e commit d53074d

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

components/http_kernel.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,7 @@ of arguments that should be passed when executing that callable.
342342

343343
b) If the argument in the controller is type-hinted with Symfony's
344344
: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.
347346

348347
c) If the function or method argument is `variadic`_ and the ``Request``
349348
``attributes`` bag contains an array for that argument, they will all be

components/weblink.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Installation
1515
1616
$ composer require symfony/web-link
1717
18-
Alternatively, you can clone the `<https://github.com/symfony/weblink>`_ repository.
18+
Alternatively, you can clone the `<https://github.com/symfony/web-link>`_ repository.
1919

2020
.. include:: /components/require_autoload.rst.inc
2121

contributing/code/core_team.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ discretion of the **Project Leader**.
235235
.. _Workflow: https://github.com/symfony/workflow
236236
.. _Yaml: https://github.com/symfony/yaml
237237
.. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
238-
.. _WebLink: https://github.com/symfony/weblink
238+
.. _WebLink: https://github.com/symfony/web-link
239239
.. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
240240
.. _`fabpot`: https://github.com/fabpot/
241241
.. _`webmozart`: https://github.com/webmozart/

reference/forms/types/percent.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PercentType Field
55
=================
66

77
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``),
99
you can use this field out-of-the-box. If you store your data as a number
1010
(e.g. ``95``), you should set the ``type`` option to ``integer``.
1111

@@ -57,14 +57,14 @@ type
5757
**type**: ``string`` **default**: ``fractional``
5858

5959
This controls how your data is stored on your object. For example, a percentage
60-
corresponding to "55%", might be stored as ``.55`` or ``55`` on your
60+
corresponding to "55%", might be stored as ``0.55`` or ``55`` on your
6161
object. The two "types" handle these two cases:
6262

6363
* ``fractional``
64-
If your data is stored as a decimal (e.g. ``.55``), use this type.
64+
If your data is stored as a decimal (e.g. ``0.55``), use this type.
6565
The data will be multiplied by ``100`` before being shown to the
6666
user (e.g. ``55``). The submitted data will be divided by ``100``
67-
on form submit so that the decimal value is stored (``.55``);
67+
on form submit so that the decimal value is stored (``0.55``);
6868

6969
* ``integer``
7070
If your data is stored as an integer (e.g. 55), then use this option.

security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ command will pre-configure this for you:
124124
encoders:
125125
# use your user class name here
126126
App\Entity\User:
127-
# bcrypt or argon21 are recommended
128-
# argon21 is more secure, but requires PHP 7.2 or the Sodium extension
127+
# bcrypt or argon2i are recommended
128+
# argon2i is more secure, but requires PHP 7.2 or the Sodium extension
129129
algorithm: bcrypt
130130
cost: 12
131131

weblink.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ The WebLink component provides the following Twig functions to send those hints:
112112
which includes the DNS lookup, TCP handshake, and optional TLS negotiation, allows
113113
the user agent to mask the high latency costs of establishing a connection".
114114
* ``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".
117117
* ``prerender()``: "identifies a resource that might be required by the next
118118
navigation, and that the user agent *should* fetch and execute, such that the
119119
user agent can deliver a faster response once the resource is requested later".

0 commit comments

Comments
 (0)