Skip to content

Commit 55190a8

Browse files
OskarStarkOskarStark
committed
Merge branch '3.4' into 4.4
* 3.4: Enhancement: Use table like in other constraints. Enhancement: New rule - SpaceBetweenLabelAndLinkInRef Minor: Whitespace
2 parents fcab174 + 320a3a5 commit 55190a8

19 files changed

+171
-131
lines changed

‎.doctor-rst.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ rules:
3030
replace_code_block_types: ~
3131
replacement: ~
3232
short_array_syntax: ~
33+
space_between_label_and_link_in_ref: ~
3334
typo: ~
3435
unused_links: ~
3536
use_deprecated_directive_instead_of_versionadded: ~

‎components/process.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ Any asynchronous process can be stopped at any time with the
359359
:method:`Symfony\\Component\\Process\\Process::stop` method. This method takes
360360
two arguments: a timeout and a signal. Once the timeout is reached, the signal
361361
is sent to the running process. The default signal sent to a process is ``SIGKILL``.
362-
Please read the :ref:`signal documentation below<reference-process-signal>`
362+
Please read the :ref:`signal documentation below <reference-process-signal>`
363363
to find out more about signal handling in the Process component::
364364

365365
$process = new Process(['ls', '-lsa']);

‎logging/channels_handlers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Creating your own Channel
123123

124124
You can change the channel Monolog logs to one service at a time. This is done
125125
either via the :ref:`configuration <monolog-channels-config>` below
126-
or by tagging your service with :ref:`monolog.logger<dic_tags-monolog>` and
126+
or by tagging your service with :ref:`monolog.logger <dic_tags-monolog>` and
127127
specifying which channel the service should log to. With the tag, the logger
128128
that is injected into that service is preconfigured to use the channel you've
129129
specified.

‎reference/constraints/Collection.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ following:
9696
profileData:
9797
- Collection:
9898
fields:
99-
personal_email:
99+
personal_email:
100100
- Email: ~
101101
short_bio:
102102
- NotBlank: ~

‎reference/constraints/Currency.rst‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ Currency
33

44
Validates that a value is a valid `3-letter ISO 4217`_ currency name.
55

6-
========== ===================================================================
7-
Applies to :ref:`property or method <validation-property-target>`
8-
Options - `groups`_
9-
- `message`_
10-
- `payload`_
11-
Class :class:`Symfony\\Component\\Validator\\Constraints\\Currency`
12-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\CurrencyValidator`
13-
========== ===================================================================
6+
+----------------+---------------------------------------------------------------------------+
7+
| Applies to | :ref:`property or method <validation-property-target>` |
8+
+----------------+---------------------------------------------------------------------------+
9+
| Options | - `groups`_ |
10+
| | - `message`_ |
11+
| | - `payload`_ |
12+
+----------------+---------------------------------------------------------------------------+
13+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\Currency` |
14+
+----------------+---------------------------------------------------------------------------+
15+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\CurrencyValidator` |
16+
+----------------+---------------------------------------------------------------------------+
1417

1518
Basic Usage
1619
-----------

‎reference/constraints/EqualTo.rst‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualT
1010
equal. Use :doc:`/reference/constraints/IdenticalTo` to compare with
1111
``===``.
1212

13-
========== ===================================================================
14-
Applies to :ref:`property or method <validation-property-target>`
15-
Options - `groups`_
16-
- `message`_
17-
- `payload`_
18-
- `propertyPath`_
19-
- `value`_
20-
Class :class:`Symfony\\Component\\Validator\\Constraints\\EqualTo`
21-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\EqualToValidator`
22-
========== ===================================================================
13+
+----------------+-----------------------------------------------------------------------+
14+
| Applies to | :ref:`property or method <validation-property-target>` |
15+
+----------------+-----------------------------------------------------------------------+
16+
| Options | - `groups`_ |
17+
| | - `message`_ |
18+
| | - `payload`_ |
19+
| | - `propertyPath`_ |
20+
| | - `value`_ |
21+
+----------------+-----------------------------------------------------------------------+
22+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\EqualTo` |
23+
+----------------+-----------------------------------------------------------------------+
24+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\EqualToValidator` |
25+
+----------------+-----------------------------------------------------------------------+
2326

2427
Basic Usage
2528
-----------

‎reference/constraints/GreaterThan.rst‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ force that a value is greater than or equal to another value, see
66
:doc:`/reference/constraints/GreaterThanOrEqual`. To force a value is less
77
than another value, see :doc:`/reference/constraints/LessThan`.
88

9-
========== ===================================================================
10-
Applies to :ref:`property or method <validation-property-target>`
11-
Options - `groups`_
12-
- `message`_
13-
- `payload`_
14-
- `propertyPath`_
15-
- `value`_
16-
Class :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThan`
17-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanValidator`
18-
========== ===================================================================
9+
+----------------+---------------------------------------------------------------------------+
10+
| Applies to | :ref:`property or method <validation-property-target>` |
11+
+----------------+---------------------------------------------------------------------------+
12+
| Options | - `groups`_ |
13+
| | - `message`_ |
14+
| | - `payload`_ |
15+
| | - `propertyPath`_ |
16+
| | - `value`_ |
17+
+----------------+---------------------------------------------------------------------------+
18+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThan` |
19+
+----------------+---------------------------------------------------------------------------+
20+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanValidator` |
21+
+----------------+---------------------------------------------------------------------------+
1922

2023
Basic Usage
2124
-----------

‎reference/constraints/GreaterThanOrEqual.rst‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ Validates that a value is greater than or equal to another value, defined in
55
the options. To force that a value is greater than another value, see
66
:doc:`/reference/constraints/GreaterThan`.
77

8-
========== ===================================================================
9-
Applies to :ref:`property or method <validation-property-target>`
10-
Options - `groups`_
11-
- `message`_
12-
- `payload`_
13-
- `propertyPath`_
14-
- `value`_
15-
Class :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanOrEqual`
16-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanOrEqualValidator`
17-
========== ===================================================================
8+
+----------------+----------------------------------------------------------------------------------+
9+
| Applies to | :ref:`property or method <validation-property-target>` |
10+
+----------------+----------------------------------------------------------------------------------+
11+
| Options | - `groups`_ |
12+
| | - `message`_ |
13+
| | - `payload`_ |
14+
| | - `propertyPath`_ |
15+
| | - `value`_ |
16+
+----------------+----------------------------------------------------------------------------------+
17+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanOrEqual` |
18+
+----------------+----------------------------------------------------------------------------------+
19+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\GreaterThanOrEqualValidator` |
20+
+----------------+----------------------------------------------------------------------------------+
1821

1922
Basic Usage
2023
-----------

‎reference/constraints/Iban.rst‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ format of an `International Bank Account Number (IBAN)`_. IBAN is an
66
internationally agreed means of identifying bank accounts across national
77
borders with a reduced risk of propagating transcription errors.
88

9-
========== ===================================================================
10-
Applies to :ref:`property or method <validation-property-target>`
11-
Options - `groups`_
12-
- `message`_
13-
- `payload`_
14-
Class :class:`Symfony\\Component\\Validator\\Constraints\\Iban`
15-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\IbanValidator`
16-
========== ===================================================================
9+
+----------------+-----------------------------------------------------------------------+
10+
| Applies to | :ref:`property or method <validation-property-target>` |
11+
+----------------+-----------------------------------------------------------------------+
12+
| Options | - `groups`_ |
13+
| | - `message`_ |
14+
| | - `payload`_ |
15+
+----------------+-----------------------------------------------------------------------+
16+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\Iban` |
17+
+----------------+-----------------------------------------------------------------------+
18+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\IbanValidator` |
19+
+----------------+-----------------------------------------------------------------------+
1720

1821
Basic Usage
1922
-----------

‎reference/constraints/IdenticalTo.rst‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@ To force that a value is *not* identical, see
1111
considered equal. Use :doc:`/reference/constraints/EqualTo` to compare
1212
with ``==``.
1313

14-
========== ===================================================================
15-
Applies to :ref:`property or method <validation-property-target>`
16-
Options - `groups`_
17-
- `message`_
18-
- `payload`_
19-
- `propertyPath`_
20-
- `value`_
21-
Class :class:`Symfony\\Component\\Validator\\Constraints\\IdenticalTo`
22-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\IdenticalToValidator`
23-
========== ===================================================================
14+
+----------------+--------------------------------------------------------------------------+
15+
| Applies to | :ref:`property or method <validation-property-target>` |
16+
+----------------+--------------------------------------------------------------------------+
17+
| Options | - `groups`_ |
18+
| | - `message`_ |
19+
| | - `payload`_ |
20+
| | - `propertyPath`_ |
21+
| | - `value`_ |
22+
+----------------+--------------------------------------------------------------------------+
23+
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\IdenticalTo` |
24+
+----------------+--------------------------------------------------------------------------+
25+
| Validator | :class:`Symfony\\Component\\Validator\\Constraints\\IdenticalToValidator`|
26+
+----------------+--------------------------------------------------------------------------+
2427

2528
Basic Usage
2629
-----------

0 commit comments

Comments
 (0)