Skip to content

Commit d1108d7

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Fix typo fix: remove quotes on routes Update mailer.rst: Changing order of tips
2 parents 90701ba + b38b42a commit d1108d7

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

mailer.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,17 +560,17 @@ both strings or address objects::
560560
// ...
561561
;
562562

563-
.. versionadded:: 7.2
564-
565-
Support for non-ASCII email addresses (e.g. ``jânë.dœ@ëxãmplę.com``)
566-
was introduced in Symfony 7.2.
567-
568563
.. tip::
569564

570565
Instead of calling ``->from()`` *every* time you create a new email, you can
571566
:ref:`configure emails globally <mailer-configure-email-globally>` to set the
572567
same ``From`` email to all messages.
573568

569+
.. versionadded:: 7.2
570+
571+
Support for non-ASCII email addresses (e.g. ``jânë.dœ@ëxãmplę.com``)
572+
was introduced in Symfony 7.2.
573+
574574
.. note::
575575

576576
The local part of the address (what goes before the ``@``) can include UTF-8

routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ arbitrary matching logic:
298298
# config/routes.yaml
299299
contact:
300300
path: /contact
301-
controller: 'App\Controller\DefaultController::contact'
301+
controller: App\Controller\DefaultController::contact
302302
condition: "context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
303303
# expressions can also include configuration parameters:
304304
# condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'"
@@ -307,7 +307,7 @@ arbitrary matching logic:
307307
308308
post_show:
309309
path: /posts/{id}
310-
controller: 'App\Controller\DefaultController::showPost'
310+
controller: App\Controller\DefaultController::showPost
311311
# expressions can retrieve route parameter values using the "params" variable
312312
condition: "params['id'] < 1000"
313313

serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ The serializer uses a two-step process when (de)serializing objects:
238238
></object>
239239

240240
In both directions, data is always first converted to an array. This splits
241-
the process in two seperate responsibilities:
241+
the process in two separate responsibilities:
242242

243243
Normalizers
244244
These classes convert **objects** into **arrays** and vice versa. They

0 commit comments

Comments
 (0)