Skip to content

Commit 7bb481a

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Update custom_constraint.rst Adjust wording at Generating URLs Fix spelling in NotCompromisedPassword.rst
2 parents 86b108f + f954c45 commit 7bb481a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

reference/constraints/NotCompromisedPassword.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following constraint ensures that the ``rawPassword`` property of the
7979
8080
In order to make the password validation, this constraint doesn't send the raw
8181
password value to the ``haveibeenpwned.com`` API. Instead, it follows a secure
82-
process known as `k-anonimity password validation`_.
82+
process known as `k-anonymity password validation`_.
8383

8484
In practice, the raw password is hashed using SHA-1 and only the first bytes of
8585
the hash are sent. Then, the ``haveibeenpwned.com`` API compares those bytes
@@ -130,4 +130,4 @@ publicly to consider it compromised. Think carefully before setting this option
130130
to a higher value because it could decrease the security of your application.
131131

132132
.. _`haveibeenpwned.com`: https://haveibeenpwned.com/
133-
.. _`k-anonimity password validation`: https://blog.cloudflare.com/validating-leaked-passwords-with-k-anonymity/
133+
.. _`k-anonymity password validation`: https://blog.cloudflare.com/validating-leaked-passwords-with-k-anonymity/

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2018,7 +2018,7 @@ Generating URLs in JavaScript
20182018

20192019
If your JavaScript code is included in a Twig template, you can use the
20202020
``path()`` and ``url()`` Twig functions to generate the URLs and store them in
2021-
JavaScript variables. The ``escape()`` function is needed to escape any
2021+
JavaScript variables. The ``escape()`` filter is needed to escape any
20222022
non-JavaScript-safe values:
20232023

20242024
.. code-block:: html+twig

validation/custom_constraint.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ has this default logic::
4545
// in the base Symfony\Component\Validator\Constraint class
4646
public function validatedBy()
4747
{
48-
return \get_class($this).'Validator';
48+
return static::class.'Validator';
4949
}
5050

5151
In other words, if you create a custom ``Constraint`` (e.g. ``MyConstraint``),

0 commit comments

Comments
 (0)