Skip to content

Commit cea243d

Browse files
committed
Merge branch '4.4'
* 4.4: [TwigBridge] Documented the new lint:twig behavior when passing no arguments [Mailer] Change DSN syntax
2 parents fd4102d + fcfbda6 commit cea243d

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

components/mailer.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,28 @@ binary. For third-party providers, refers to the following table:
9898
Failover Transport
9999
------------------
100100

101-
You can create failover transport with the help of `||` operator::
101+
You can create failover transport with the help of ``failover()`` keyword::
102102

103-
$dsn = 'api://id@postmark || smtp://key@sendgrid';
103+
$dsn = 'failover(api://id@postmark smtp://key@sendgrid)';
104104

105105
So if the first transport fails, the mailer will attempt to send through the
106106
second transport.
107107

108+
.. versionadded:: 4.4
109+
110+
The ``failover()`` keyword was introduced in Symfony 4.4.
111+
108112
Round Robin
109113
-----------
110114

111115
If you want to send emails by using multiple transports in a round-robin fashion,
112-
you can use the ``&&`` operator between the transports::
116+
you can use the ``roundrobin()`` keyword with the transports::
117+
118+
$dsn = 'roundrobin(api://id@postmark smtp://key@sendgrid)'
119+
120+
.. versionadded:: 4.4
113121

114-
$dsn = 'api://id@postmark && smtp://key@sendgrid'
122+
The ``roundrobin()`` keyword was introduced in Symfony 4.4.
115123

116124
Sending emails asynchronously
117125
-----------------------------

templates.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,12 +563,18 @@ errors. It's useful to run it before deploying your application to production
563563

564564
.. code-block:: terminal
565565
566-
# check all the templates stored in a directory
567-
$ php bin/console lint:twig templates/
566+
# check all the application templates
567+
$ php bin/console lint:twig
568568
569-
# you can also check individual templates
569+
# you can also check directories and individual templates
570+
$ php bin/console lint:twig templates/email/
570571
$ php bin/console lint:twig templates/article/recent_list.html.twig
571572
573+
.. versionadded:: 4.4
574+
575+
The feature that checks all the application templates when not passing any
576+
arguments to ``lint:twig`` was introduced in Symfony 4.4.
577+
572578
Inspecting Twig Information
573579
~~~~~~~~~~~~~~~~~~~~~~~~~~~
574580

0 commit comments

Comments
 (0)