Skip to content

Commit 125fc04

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: [Validator] Remove annotations from `exactly` option of Length constraint [HttpKernel] Remove old caution from Symony <4
2 parents b1ef3c8 + 5903893 commit 125fc04

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

components/http_kernel.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,6 @@ See ":ref:`http-kernel-working-example`" for a more concrete implementation.
136136
For general information on adding listeners to the events below, see
137137
:ref:`http-kernel-creating-listener`.
138138

139-
.. caution::
140-
141-
As of 3.1 the :class:`Symfony\\Component\\HttpKernel\\HttpKernel` accepts a
142-
fourth argument, which must be an instance of
143-
:class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface`.
144-
In 4.0 this argument will become mandatory.
145-
146139
.. seealso::
147140

148141
There is a wonderful tutorial series on using the HttpKernel component and

reference/constraints/Length.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ the given value's length is not **exactly** equal to this value.
135135

136136
This option is the one being set by default when using the Length constraint
137137
without passing any named argument to it. This means that for example,
138-
``@Assert\Length(20)`` and ``@Assert\Length(exactly=20)`` are equivalent, as
139-
well as ``#[Assert\Length(20)]`` and ``#[Assert\Length(exactly: 20)]``.
138+
``#[Assert\Length(20)]`` and ``#[Assert\Length(exactly: 20)]`` are equivalent.
140139

141140
exactMessage
142141
~~~~~~~~~~~~

0 commit comments

Comments
 (0)