Skip to content

Commit d934a4e

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Remove duplicate line Reintroduce removed note
2 parents f8dac53 + 5d2b110 commit d934a4e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

components/serializer.rst

+5
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,11 @@ The Serializer component provides several built-in normalizers:
900900
Also it can denormalize ``uuid`` or ``ulid`` strings to :class:`Symfony\\Component\\Uid\\Uuid`
901901
or :class:`Symfony\\Component\\Uid\\Ulid`. The format does not matter.
902902

903+
.. note::
904+
905+
You can also create your own Normalizer to use another structure. Read more at
906+
:doc:`/serializer/custom_normalizer`.
907+
903908
Certain normalizers are enabled by default when using the Serializer component
904909
in a Symfony application, additional ones can be enabled by tagging them with
905910
:ref:`serializer.normalizer <reference-dic-tags-serializer-normalizer>`.

security/custom_authenticator.rst

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ would initialize the passport like this::
315315
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\CsrfTokenBadge;
316316
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
317317
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
318-
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
319318

320319
class LoginAuthenticator extends AbstractAuthenticator
321320
{

0 commit comments

Comments
 (0)