Skip to content

Commit 961d477

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Fix broken class links
2 parents 8d05e46 + 8aa1148 commit 961d477

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

controller/value_resolver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ In addition, some components, bridges and official bundles provide other value r
191191

192192
PSR-7 Objects Resolver:
193193
Injects a Symfony HttpFoundation ``Request`` object created from a PSR-7 object
194-
of type :class:`Psr\\Http\\Message\\ServerRequestInterface`,
195-
:class:`Psr\\Http\\Message\\RequestInterface` or :class:`Psr\\Http\\Message\\MessageInterface`.
194+
of type ``Psr\Http\Message\ServerRequestInterface``,
195+
``Psr\Http\Message\RequestInterface`` or ``Psr\Http\Message\MessageInterface``.
196196
It requires installing :doc:`the PSR-7 Bridge </components/psr7>` component.
197197

198198
Managing Value Resolvers

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1417,7 +1417,7 @@ deferred and will only happen just before the email is sent by the Messenger
14171417
handler.
14181418

14191419
When sending an email asynchronously, its instance must be serializable.
1420-
This is always the case for :class:`Symfony\\Bridge\\Twig\\Mime\\Email`
1420+
This is always the case for :class:`Symfony\\Component\\Mailer\\Mailer`
14211421
instances, but when sending a
14221422
:class:`Symfony\\Bridge\\Twig\\Mime\\TemplatedEmail`, you must ensure that
14231423
the ``context`` is serializable. If you have non-serializable variables,

0 commit comments

Comments
 (0)