Skip to content

Commit 8629ebf

Browse files
committed
Merge branch '4.4'
* 4.4: Fix wrong heading for not_compromised_password Update guard_authentication.rst scope singly-implemented interfaces detection by file
2 parents c8840c4 + d5ec360 commit 8629ebf

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

reference/configuration/framework.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,7 +2112,7 @@ error messages.
21122112
.. _reference-validation-not-compromised-password:
21132113

21142114
not_compromised_password
2115-
~~~~~~~~~~~~~~~~~~~~~~~~
2115+
........................
21162116

21172117
The :doc:`NotCompromisedPassword </reference/constraints/NotCompromisedPassword>`
21182118
constraint makes HTTP requests to a public API to check if the given password
@@ -2121,7 +2121,7 @@ has been compromised in a data breach.
21212121
.. _reference-validation-not-compromised-password-enabled:
21222122

21232123
enabled
2124-
.......
2124+
"""""""
21252125

21262126
**type**: ``boolean`` **default**: ``true``
21272127

@@ -2131,7 +2131,7 @@ make HTTP requests, such as in ``dev`` and ``test`` environments or in
21312131
continuous integration servers.
21322132

21332133
endpoint
2134-
........
2134+
""""""""
21352135

21362136
**type**: ``string`` **default**: ``null``
21372137

security/guard_authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ directly to your ``User`` class (the ``make:entity`` command is a good way to do
3838
// ...
3939
4040
+ /**
41-
+ * @ORM\Column(type="string", unique=true)
41+
+ * @ORM\Column(type="string", unique=true, nullable=true)
4242
+ */
4343
+ private $apiToken;
4444

service_container/autowiring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ dealing with the ``TransformerInterface``.
363363

364364
When using a `service definition prototype`_, if only one service is
365365
discovered that implements an interface, and that interface is also
366-
discovered at the same time, configuring the alias is not mandatory
366+
discovered in the same file, configuring the alias is not mandatory
367367
and Symfony will automatically create one.
368368

369369
Dealing with Multiple Implementations of the Same Type

0 commit comments

Comments
 (0)