From 360a11dd60025471cbf2c3dd9fd640adb102f7f1 Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Fri, 18 Jan 2019 12:42:31 +0100
Subject: [PATCH] BUGFIX: Replace default Swift_MailTransport with
 Swift_SendmailTransport

The old default is no longer available in Swift Mailer.
---
 Configuration/Settings.yaml |  7 ++++++-
 Documentation/index.rst     | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index e01dfd4..b271d63 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -1,7 +1,7 @@
 Neos:
   SwiftMailer:
     transport:
-      type: 'Swift_MailTransport'
+      type: 'Swift_SendmailTransport'
       arguments: ~
       options: []
 
@@ -27,3 +27,8 @@ Neos:
 #     options:
 #       mboxPathAndFilename: '%FLOW_PATH_DATA%/Persistent/sent-mail'
 
+# Example settings for "sending" emails to the logs:
+#
+# SwiftMailer:
+#   transport:
+#     type: 'Neos\SwiftMailer\Transport\LoggingTransport'
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 1df923d..7825bbe 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -16,8 +16,19 @@ Configuration
 -------------
 
 To set up the mail transport to be used, adjust the settings as needed. Without any further
-configuration, mails will be sent using ``Swift_MailTransport`` which uses the PHP ``mail()``
-function. To use SMTP for sending, follow the following example:
+configuration, mails will be sent using ``Swift_SendmailTransport`` which uses ``sendmail``
+on the server. To adjust the sendmail command, you can use:
+
+.. code-block:: yaml
+
+  Neos:
+    SwiftMailer:
+      transport:
+        type: 'Swift_SendmailTransport'
+        options:
+          command: '/usr/sbin/sendmail -bs'
+
+To use SMTP for sending, follow the following example:
 
 .. code-block:: yaml
 
@@ -39,6 +50,10 @@ Further transports are available with Swift Mailer and can be used as well. Thei
 be looked up the Swift Mailer documentation and they can be set by extrapolating from their
 setter method names (as in: ``setUsername()`` becomes ``username`` in the options.)
 
+The ``Swift_MailTransport`` that was available in the past has been removed with the Swift
+Mailer library 6.0 release, see https://github.com/swiftmailer/swiftmailer/issues/866 for
+background information.
+
 Sending mail
 ------------