Skip to content

Commit d89ac33

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Add forgotten use Fix option double dashes [Validator] Fix namespace of UserPassword and UserPasswordValidator
2 parents d25d246 + f5e0f47 commit d89ac33

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

console/input.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ optionally accepts a value, but it's a bit tricky. Consider this example::
249249
)
250250
;
251251

252-
This option can be used in 3 ways: ``greet --yell``, ``greet yell=louder``,
252+
This option can be used in 3 ways: ``greet --yell``, ``greet --yell=louder``,
253253
and ``greet``. However, it's hard to distinguish between passing the option
254254
without a value (``greet --yell``) and not passing the option (``greet``).
255255

reference/constraints/UserPassword.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Applies to :ref:`property or method <validation-property-target>`
2020
Options - `groups`_
2121
- `message`_
2222
- `payload`_
23-
Class :class:`Symfony\\Component\\Validator\\Constraints\\UserPassword`
24-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\UserPasswordValidator`
23+
Class :class:`Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPassword`
24+
Validator :class:`Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPasswordValidator`
2525
========== ===================================================================
2626

2727
Basic Usage

security/access_denied_handler.rst

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ unauthenticated user tries to access a protected resource::
2929
use Symfony\Component\HttpFoundation\RedirectResponse;
3030
use Symfony\Component\HttpFoundation\Request;
3131
use Symfony\Component\HttpFoundation\Session\SessionInterface;
32+
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
3233
use Symfony\Component\Security\Core\Exception\AuthenticationException;
3334
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
3435

0 commit comments

Comments
 (0)