added auto-start of the transport when sending a message

swiftmailer · Sep 11, 2018 · 2ccc29c · 2ccc29c
1 parent dd8f20b
commit 2ccc29c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/lib/classes/Swift/Mailer.php b/lib/classes/Swift/Mailer.php
@@ -60,6 +60,7 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
     {
         $failedRecipients = (array) $failedRecipients;
 
+        // FIXME: to be removed in 7.0 (as transport must now start themselves on send)
         if (!$this->transport->isStarted()) {
             $this->transport->start();
         }

diff --git a/lib/classes/Swift/Transport.php b/lib/classes/Swift/Transport.php
@@ -61,6 +61,8 @@ public function ping();
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
+     * This is the responsibility of the send method to start the transport if needed.
+     *
      * @param Swift_Mime_SimpleMessage $message
      * @param string[]                 $failedRecipients An array of failures by-reference
      *

diff --git a/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -177,6 +177,10 @@ public function isStarted()
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;