Skip to content

Commit a89fb70

Browse files
xabbuhxabbuh
committed
minor #5749 complete Swiftmailer XML examples (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- complete Swiftmailer XML examples | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | Commits ------- 927a4a1 complete Swiftmailer XML examples
2 parents 0814f0b + 927a4a1 commit a89fb70

File tree

3 files changed

+61
-47
lines changed

3 files changed

+61
-47
lines changed

‎cookbook/email/dev_environment.rst

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ will not be sent when you run tests, but will continue to be sent in the
3333
.. code-block:: xml
3434
3535
<!-- app/config/config_test.xml -->
36-
37-
<!--
36+
<?xml version="1.0" encoding="UTF-8" ?>
37+
<container xmlns="http://symfony.com/schema/dic/services"
38+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3839
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
39-
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd
40-
-->
40+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
41+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
4142
42-
<swiftmailer:config
43-
disable-delivery="true" />
43+
<swiftmailer:config disable-delivery="true" />
44+
</container>
4445
4546
.. code-block:: php
4647
@@ -70,13 +71,15 @@ via the ``delivery_address`` option:
7071
.. code-block:: xml
7172
7273
<!-- app/config/config_dev.xml -->
73-
74-
<!--
74+
<?xml version="1.0" encoding="UTF-8" ?>
75+
<container xmlns="http://symfony.com/schema/dic/services"
76+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7577
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
76-
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd
77-
-->
78+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
79+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
7880
79-
<swiftmailer:config delivery-address="dev@example.com" />
81+
<swiftmailer:config delivery-address="dev@example.com" />
82+
</container>
8083
8184
.. code-block:: php
8285
@@ -151,16 +154,21 @@ by adding the ``delivery_whitelist`` option:
151154
<!-- app/config/config_dev.xml -->
152155
153156
<?xml version="1.0" charset="UTF-8" ?>
157+
<?xml version="1.0" encoding="UTF-8" ?>
154158
<container xmlns="http://symfony.com/schema/dic/services"
155-
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer">
159+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
160+
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
161+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
162+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
156163
157-
<swiftmailer:config delivery-address="dev@example.com">
158-
<!-- all email addresses matching this regex will *not* be redirected to dev@example.com -->
159-
<swiftmailer:delivery-whitelist-pattern>/@specialdomain\.com$/</swiftmailer:delivery-whitelist-pattern>
164+
<swiftmailer:config delivery-address="dev@example.com">
165+
<!-- all email addresses matching this regex will *not* be redirected to dev@example.com -->
166+
<swiftmailer:delivery-whitelist-pattern>/@specialdomain\.com$/</swiftmailer:delivery-whitelist-pattern>
160167
161-
<!-- all emails sent to admin@mydomain.com won't be redirected to dev@example.com too -->
162-
<swiftmailer:delivery-whitelist-pattern>/^admin@mydomain\.com$/</swiftmailer:delivery-whitelist-pattern>
163-
</swiftmailer:config>
168+
<!-- all emails sent to admin@mydomain.com won't be redirected to dev@example.com too -->
169+
<swiftmailer:delivery-whitelist-pattern>/^admin@mydomain\.com$/</swiftmailer:delivery-whitelist-pattern>
170+
</swiftmailer:config>
171+
</container>
164172
165173
.. code-block:: php
166174

‎cookbook/email/email.rst

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,20 @@ already included:
4141
.. code-block:: xml
4242
4343
<!-- app/config/config.xml -->
44-
45-
<!--
44+
<?xml version="1.0" encoding="UTF-8" ?>
45+
<container xmlns="http://symfony.com/schema/dic/services"
46+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4647
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
47-
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd
48-
-->
49-
50-
<swiftmailer:config
51-
transport="%mailer_transport%"
52-
host="%mailer_host%"
53-
username="%mailer_user%"
54-
password="%mailer_password%" />
48+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
49+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
50+
51+
<swiftmailer:config
52+
transport="%mailer_transport%"
53+
host="%mailer_host%"
54+
username="%mailer_user%"
55+
password="%mailer_password%"
56+
/>
57+
</container>
5558
5659
.. code-block:: php
5760

‎cookbook/email/spool.rst

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ swiftmailer with the memory option, use the following configuration:
3535
.. code-block:: xml
3636
3737
<!-- app/config/config.xml -->
38-
39-
<!--
38+
<?xml version="1.0" encoding="UTF-8" ?>
39+
<container xmlns="http://symfony.com/schema/dic/services"
40+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4041
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
41-
http://symfony.com/schema/dic/swiftmailer
42-
http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd
43-
-->
42+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
43+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
4444
45-
<swiftmailer:config>
46-
<swiftmailer:spool type="memory" />
47-
</swiftmailer:config>
45+
<swiftmailer:config>
46+
<swiftmailer:spool type="memory" />
47+
</swiftmailer:config>
48+
</container>
4849
4950
.. code-block:: php
5051
@@ -73,18 +74,20 @@ In order to use the spool with a file, use the following configuration:
7374
.. code-block:: xml
7475
7576
<!-- app/config/config.xml -->
76-
77-
<!--
77+
<?xml version="1.0" encoding="UTF-8" ?>
78+
<container xmlns="http://symfony.com/schema/dic/services"
79+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7880
xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
79-
http://symfony.com/schema/dic/swiftmailer
80-
http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd
81-
-->
82-
83-
<swiftmailer:config>
84-
<swiftmailer:spool
85-
type="file"
86-
path="/path/to/spool" />
87-
</swiftmailer:config>
81+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
82+
http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
83+
84+
<swiftmailer:config>
85+
<swiftmailer:spool
86+
type="file"
87+
path="/path/to/spool"
88+
/>
89+
</swiftmailer:config>
90+
</container>
8891
8992
.. code-block:: php
9093

0 commit comments

Comments
 (0)