-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
[SwiftMailer] Update future reference #7510
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SwiftMailer] Update future reference #7510
Conversation
e5e29e6
to
4ae12d2
Compare
@@ -191,6 +225,13 @@ logging | |||
If true, Symfony's data collector will be activated for Swift Mailer and | |||
the information will be available in the profiler. | |||
|
|||
.. tip:: | |||
|
|||
The following configuration can used environment variable: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The following configuration options are compatible with %env()%
parameters (with link to doc about them?)
e769f16
to
3b45d89
Compare
3b45d89
to
287b71f
Compare
|
||
**type**: ``string`` | ||
|
||
The URL to configure swift mailer. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Swiftmailer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"The URL" doesn't look precise enough to me. What about "The URL describing the mail server to connect with"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@mykiwi thanks a lot for this! Your contribution was great, but I've proposed some minor tweaks on top of it. Thanks!
619f626
to
635a0ab
Compare
…kiwi) This PR was merged into the 2.5-dev branch. Discussion ---------- allow using env variables in transport configuration Example: ```yml # MAILER_URL=transport://user:pass@host:port/?encryption=...&auth_mode=... swiftmailer: url: "%env(MAILER_URL)%" ``` To do: - [x] add the doc symfony/symfony-docs/pull/7510 - [x] add tests Commits ------- 183b291 allow using env variables in transport configuration
@@ -37,6 +41,15 @@ Configuration | |||
* `disable_delivery`_ | |||
* `logging`_ | |||
|
|||
url | |||
~~~ | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing version added? (same for other options below)
|
||
**type**: ``string`` | ||
|
||
The entire SwiftMailer configuration using a DSN-like URL format. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"using" => "uses"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think "using" is correct here. We're not saying that Swift "uses" this ... but that the "url" option is all the Swift config using a DSN format.
@@ -97,20 +100,29 @@ timeout | |||
|
|||
**type**: ``integer`` | |||
|
|||
.. versionadded:: 2.4.2 | |||
The ``url`` option was added in SwiftMailerBundle 2.4.2. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parameter looks wrong here and below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😭 it's fixed now!
The following configuration options are compatible with ``%env()%`` parameters: | ||
``url``, ``transport``, ``username``, ``password``, ``host``, | ||
``port``, ``timeout``, ``source_ip``, ``local_domain``, | ||
``encryption``, ``auth_mode``. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Considering symfony/swiftmailer-bundle#159 (comment), we should remove these two parameters for now, wdyt?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mykiwi @javiereguiluz
Merging it because the related PR was already merged. Thanks Romain! |
…luz) This PR was merged into the master branch. Discussion ---------- [SwiftMailer] Update future reference - [x] Require symfony/swiftmailer-bundle#159 Commits ------- 6aa0117 Removed "encryption" and "auth_mode" from the list of %env()% compatible options 76ce6af Fixed ... again ... the versionadded directives ef7536c Added the missing "versionadded" directives 635a0ab add mail transport as deprecated 54ad41c Minor tweaks 287b71f update swiftmailer reference
…uiluz, xabbuh) This PR was merged into the 2.7 branch. Discussion ---------- Backport #7510 for the Symfony 2.7 docs All the documented options are part of SwiftmailerBundle releases that are compatible with Symfony 2.7. Commits ------- 1c39991 fix versionadded directives 8eaccef Removed "encryption" and "auth_mode" from the list of %env()% compatible options 3395258 Fixed ... again ... the versionadded directives 3333723 Added the missing "versionadded" directives 0e2853a add mail transport as deprecated 2bd1a22 Minor tweaks b161bd8 update swiftmailer reference
Uh oh!
There was an error while loading. Please reload this page.