Skip to content

Commit dc913ed

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Mailer] Document new Mailer transport options Flex: Update links to Symfony 5.3
2 parents 5b6818e + 0138c9e commit dc913ed

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

mailer.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,36 @@ the application or when using a self-signed certificate::
242242

243243
$dsn = 'smtp://user:[email protected]?verify_peer=0';
244244

245+
Other Options
246+
~~~~~~~~~~~~~
247+
248+
``command``
249+
Command to be executed by ``sendmail`` transport::
250+
251+
$dsn = 'sendmail://default?command=/usr/sbin/sendmail%20-oi%20-t'
252+
253+
``local_domain``
254+
The domain name to use in ``HELO`` command::
255+
256+
$dsn = 'smtps://smtp.example.com?local_domain=example.org'
257+
258+
``restart_threshold``
259+
The maximum number of messages to send before re-starting the transport. It
260+
can be used together with ``restart_threshold_sleep``::
261+
262+
$dsn = 'smtps://smtp.example.com?restart_threshold=10&restart_threshold_sleep=1'
263+
264+
``restart_threshold_sleep``
265+
The number of seconds to sleep between stopping and re-starting the transport.
266+
It's common to combine it with ``restart_threshold``::
267+
268+
$dsn = 'smtps://smtp.example.com?restart_threshold=10&restart_threshold_sleep=1'
269+
270+
``ping_threshold``
271+
The minimum number of seconds between two messages required to ping the server::
272+
273+
$dsn = 'smtps://smtp.example.com?ping_threshold=200'
274+
245275
Creating & Sending Messages
246276
---------------------------
247277

setup/flex.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ If you customize these paths, some files copied from a recipe still may contain
189189
references to the original path. In other words: you may need to update some things
190190
manually after a recipe is installed.
191191

192-
.. _`default services.yaml file`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/4.2/config/services.yaml
193-
.. _`shown in this example`: https://github.com/symfony/skeleton/blob/8e33fe617629f283a12bbe0a6578bd6e6af417af/composer.json#L24-L33
194-
.. _`shown in this example of the skeleton-project`: https://github.com/symfony/skeleton/blob/8e33fe617629f283a12bbe0a6578bd6e6af417af/composer.json#L44-L46
195-
.. _`copying Symfony's index.php source`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/5.1/public/index.php
196-
.. _`copying Symfony's bin/console source`: https://github.com/symfony/recipes/blob/master/symfony/console/5.1/bin/console
192+
.. _`default services.yaml file`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/5.3/config/services.yaml
193+
.. _`shown in this example`: https://github.com/symfony/skeleton/blob/a0770a7f26eeda9890a104fa3de8f68c4120fca5/composer.json#L30-L39
194+
.. _`shown in this example of the skeleton-project`: https://github.com/symfony/skeleton/blob/a0770a7f26eeda9890a104fa3de8f68c4120fca5/composer.json#L55-L57
195+
.. _`copying Symfony's index.php source`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/5.3/public/index.php
196+
.. _`copying Symfony's bin/console source`: https://github.com/symfony/recipes/blob/master/symfony/console/5.3/bin/console
197197
.. _`Symfony Requirements Checker`: https://github.com/symfony/requirements-checker

0 commit comments

Comments
 (0)