Skip to content

Merge #7861 in master #7882

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.

Sign up for GitHub

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

Closed
wants to merge 21 commits into from
Closed

Merge #7861 in master #7882

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a22a973
use namespaced PHPUnit TestCase class
xabbuh Apr 28, 2017
3c9588e
use namespaced PHPUnit TestCase class
xabbuh Apr 28, 2017
fead634
[PhpUnitBridge] fix Stopwatch API usage
xabbuh Apr 28, 2017
879347c
Replace calls to setDefinition() by register()
GuilhemN Apr 30, 2017
b161bd8
update swiftmailer reference
mykiwi Feb 17, 2017
2bd1a22
Minor tweaks
javiereguiluz Feb 19, 2017
0e2853a
add mail transport as deprecated
mykiwi Feb 23, 2017
3333723
Added the missing "versionadded" directives
javiereguiluz Mar 13, 2017
3395258
Fixed ... again ... the versionadded directives
javiereguiluz Mar 13, 2017
8eaccef
Removed "encryption" and "auth_mode" from the list of %env()% compati…
javiereguiluz Mar 13, 2017
1c39991
fix versionadded directives
xabbuh Apr 30, 2017
7dbf4c5
add labels for old headlines
xabbuh May 1, 2017
2b187c8
minor #7867 add labels for old headlines (xabbuh)
xabbuh May 4, 2017
23bdb62
minor #7862 Backport #7510 for the Symfony 2.7 docs (mykiwi, javiereg…
xabbuh May 4, 2017
7ec94fe
minor #7856 [PhpUnitBridge] fix Stopwatch API usage (xabbuh)
xabbuh May 4, 2017
a360e3c
minor #7855 [PhpUnitBridge] use namespaced PHPUnit TestCase class (xa…
xabbuh May 4, 2017
a256fed
minor #7854 [PhpUnitBridge] use namespaced PHPUnit TestCase class (xa…
xabbuh May 4, 2017
5982698
minor #7861 Replace calls to setDefinition() by register() (GuilhemN)
xabbuh May 4, 2017
a481fdf
Merge commit '59826981d604c02eb5dfa53bf679cf6d86d278fc' into DEFINITION
GuilhemN May 6, 2017
36caee0
Merge branch 'DEFINITION' into MERGE3.2
GuilhemN May 6, 2017
08b531a
Merge branch 'MERGE3.2' into MERGEMASTER
GuilhemN May 6, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed "encryption" and "auth_mode" from the list of %env()% compati… 
…ble options
  • Loading branch information
@javiereguiluz @xabbuh
javiereguiluz authored and xabbuh committed Apr 30, 2017
commit 8eaccef25406b80117aa40c22df594487b831499
7 changes: 3 additions & 4 deletions reference/configuration/swiftmailer.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,9 @@ the information will be available in the profiler.

.. tip::

The following configuration options are compatible with ``%env()%`` parameters:
``url``, ``transport``, ``username``, ``password``, ``host``,
``port``, ``timeout``, ``source_ip``, ``local_domain``,
``encryption``, ``auth_mode``.
The following options can be set via environment variables using the
``%env()%`` syntax: ``url``, ``transport``, ``username``, ``password``,
``host``, ``port``, ``timeout``, ``source_ip``, ``local_domain``.
For details, see the :doc:`/configuration/external_parameters` article.

Full Default Configuration
Expand Down