Skip to content

Commit 2e4be7c

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: Complete documentation about mailer integration
2 parents f50e801 + 1da6b0b commit 2e4be7c

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

mailer.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
4646
xsi:schemaLocation="http://symfony.com/schema/dic/services
4747
https://symfony.com/schema/dic/services/services-1.0.xsd
4848
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
49+
4950
<framework:config>
5051
<framework:mailer dsn="%env(MAILER_DSN)%"/>
5152
</framework:config>
@@ -55,6 +56,7 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
5556
5657
// config/packages/mailer.php
5758
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
59+
5860
return static function (ContainerConfigurator $containerConfigurator): void {
5961
$containerConfigurator->extension('framework', [
6062
'mailer' => [
@@ -83,7 +85,7 @@ sendmail ``sendmail://default`` Mailer uses the local se
8385
Using a 3rd Party Transport
8486
~~~~~~~~~~~~~~~~~~~~~~~~~~~
8587

86-
Instead of using your own SMTP server, you can send emails via a 3rd party
88+
Instead of using your own SMTP server or sendmail binary, you can send emails via a 3rd party
8789
provider. Mailer supports several - install whichever you want:
8890

8991
================== ==============================================

reference/configuration/framework.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ Configuration
178178

179179
* :ref:`dsn <mailer-dsn>`
180180
* `transports`_
181+
* `message_bus`_
181182
* `envelope`_
182183

183184
* `sender`_
@@ -926,6 +927,8 @@ This setting is automatically set to true when one of the child settings is conf
926927

927928
.. _http-headers:
928929

930+
.. _http-headers:
931+
929932
headers
930933
.......
931934

@@ -3007,6 +3010,18 @@ transports
30073010
A :ref:`list of DSN <multiple-email-transports>` that can be used by the
30083011
mailer. A transport name is the key and the dsn is the value.
30093012

3013+
message_bus
3014+
...........
3015+
3016+
.. versionadded:: 5.1
3017+
3018+
The ``message_bus`` option was introduced in Symfony 5.1.
3019+
3020+
**type**: ``string`` **default**: ``null`` or default bus if Messenger component is installed
3021+
3022+
Service identifier of the message bus to use when using the
3023+
:doc:`Messenger component </messenger>` (e.g. ``messenger.default_bus``).
3024+
30103025
envelope
30113026
........
30123027

@@ -3061,6 +3076,7 @@ recipients set in the code.
30613076
30623077
// config/packages/mailer.php
30633078
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
3079+
30643080
return static function (ContainerConfigurator $containerConfigurator): void {
30653081
$containerConfigurator->extension('framework', [
30663082
'mailer' => [

0 commit comments

Comments
 (0)