Update Mailer

laravel · Jubeki · Sep 8, 2021 · Sep 8, 2021 · Sep 10, 2021 · Sep 10, 2021
commit e5d598715c583e04b5693dcca6e4a44bdbc165da
diff --git a/src/Illuminate/Contracts/Mail/Mailer.php b/src/Illuminate/Contracts/Mail/Mailer.php
@@ -38,11 +38,4 @@ public function raw($text, $callback);
      * @return void
      */
     public function send($view, array $data = [], $callback = null);
-
-    /**
-     * Get the array of failed recipients.
-     *
-     * @return array
-     */
-    public function failures();
 }
diff --git a/src/Illuminate/Mail/MailManager.php b/src/Illuminate/Mail/MailManager.php
@@ -116,7 +116,7 @@ protected function resolve($name)
         $mailer = new Mailer(
             $name,
             $this->app['view'],
-            $this->createSymfonyMailer($config),
+            $this->createTransport($config),
             $this->app['events']
         );
 
@@ -134,17 +134,6 @@ protected function resolve($name)
         return $mailer;
     }
 
-    /**
-     * Create the Symfony Mailer instance for the given configuration.
-     *
-     * @param  array  $config
-     * @return \Symfony\Component\Mailer\MailerInterface
-     */
-    protected function createSymfonyMailer(array $config)
-    {
-        return new SymfonyMailer($this->createTransport($config));
-    }
-
     /**
      * Create a new transport instance.
      *

diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php
@@ -15,7 +15,7 @@
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Traits\Macroable;
 use InvalidArgumentException;
-use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Mime\Email;
 
 class Mailer implements MailerContract, MailQueueContract
@@ -37,11 +37,11 @@ class Mailer implements MailerContract, MailQueueContract
     protected $views;
 
     /**
-     * The Symfony Mailer instance.
+     * The Symfony Transport instance.
      *
-     * @var \Symfony\Component\Mailer\MailerInterface
+     * @var \Symfony\Component\Mailer\Transport\TransportInterface
      */
-    protected $mailer;
+    protected $transport;
 
     /**
      * The event dispatcher instance.
@@ -85,28 +85,21 @@ class Mailer implements MailerContract, MailQueueContract
      */
     protected $queue;
 
-    /**
-     * Array of failed recipients.
-     *
-     * @var array
-     */
-    protected $failedRecipients = [];
-
     /**
      * Create a new Mailer instance.
      *
      * @param  string  $name
      * @param  \Illuminate\Contracts\View\Factory  $views
-     * @param  \Symfony\Component\Mailer\MailerInterface  $mailer
+     * @param  \Symfony\Component\Mailer\Transport\TransportInterface  $transport
      * @param  \Illuminate\Contracts\Events\Dispatcher|null  $events
      * @return void
      */
-    public function __construct(string $name, Factory $views, MailerInterface $mailer, Dispatcher $events = null)
+    public function __construct(string $name, Factory $views, TransportInterface $transport, Dispatcher $events = null)
     {
         $this->name = $name;
         $this->views = $views;
-        $this->mailer = $mailer;
         $this->events = $events;
+        $this->transport = $transport;
     }
 
     /**
@@ -283,10 +276,10 @@ public function send($view, array $data = [], $callback = null)
         // Next we will determine if the message should be sent.
8000
 We give the developer
         // one final chance to stop this message and then we will send it to all of
         // its recipients. We will then fire the sent event for the sent message.
-        $swiftMessage = $message->getSwiftMessage();
+        $symfonyMessage = $message->getSymfonyMessage();
 
-        if ($this->shouldSendMessage($swiftMessage, $data)) {
-            $this->sendSwiftMessage($swiftMessage);
+        if ($this->shouldSendMessage($symfonyMessage, $data)) {
+            $this->sendSymfonyMessage($symfonyMessage);
 
             $this->dispatchSentEvent($message, $data);
         }
@@ -353,19 +346,15 @@ protected function parseView($view)
     protected function addContent($message, $view, $plain, $raw, $data)
     {
         if (isset($view)) {
-            $message->setBody($this->renderView($view, $data) ?: ' ', 'text/html');
+            $message->html($this->renderView($view, $data) ?: ' ');
         }
 
         if (isset($plain)) {
-            $method = isset($view) ? 'addPart' : 'setBody';
-
-            $message->$method($this->renderView($plain, $data) ?: ' ', 'text/plain');
+            $message->text($this->renderView($plain, $data) ?: ' ');
         }
 
         if (isset($raw)) {
-            $method = (isset($view) || isset($plain)) ? 'addPart' : 'setBody';
-
-            $message->$method($raw, 'text/plain');
+            $message->text($raw);
         }
     }
 
@@ -509,26 +498,24 @@ protected function createMessage()
     }
 
     /**
-     * Send a Swift Message instance.
+     * Send a Symfony Email instance.
     *
-     * @param  \Swift_Message  $message
+     * @param  \Symfony\Component\Mime\Email  $message
      * @return int|null
      */
-    protected function sendSwiftMessage($message)
+    protected function sendSymfonyMessage(Email $message)
     {
-        $this->failedRecipients = [];
-
         try {
-            return $this->swift->send($message, $this->failedRecipients);
+            return $this->transport->send($message);
         } finally {
             $this->forceReconnection();
         }
     }
 
     /**
-     * Determines if the message can be sent.
+     * Determines if the email can be sent.
      *
-     * @param  \Swift_Message  $message
+     * @param  \Symfony\Component\Mime\Email  $message
      * @param  array  $data
      * @return bool
      */
@@ -568,27 +555,17 @@ protected function dispatchSentEvent($message, $data = [])
      */
     protected function forceReconnection()
     {
-        $this->getSwiftMailer()->getTransport()->stop();
-    }
-
-    /**
-     * Get the array of failed recipients.
-     *
-     * @return array
-     */
-    public function failures()
-    {
-        return $this->failedRecipients;
+        $this->getSymfonyMailer()->getTransport()->stop();
     }
 
     /**
-     * Get the Symfony Mailer instance.
+     * Get the Symfony Transport instance.
      *
-     * @return \Symfony\Component\Mailer\MailerInterface
+     * @return \Symfony\Component\Mailer\Transport\TransportInterface
      */
-    public function getSymfonyMailer()
+    public function getSymfonyTransport()
     {
-        return $this->mailer;
+        return $this->transport;
     }
 
     /**
@@ -602,14 +579,14 @@ public function getViewFactory()
     }
 
     /**
-     * Set the Symfony Mailer instance.
+     * Set the Symfony Transport instance.
      *
-     * @param  \Symfony\Component\Mailer\MailerInterface  $mailer
+     * @param  \Symfony\Component\Mailer\Transport\TransportInterface  $transport
      * @return void
      */
-    public function setSymfonyMailer($mailer)
+    public function setSymfonyTransport($transport)
     {
-        $this->mailer = $mailer;
+        $this->transport = $transport;
     }
 
     /**

diff --git a/src/Illuminate/Mail/Message.php b/src/Illuminate/Mail/Message.php
@@ -18,7 +18,7 @@ class Message
      *
      * @var \Symfony\Component\Mime\Email
      */
-    protected $email;
+    protected $message;
 
     /**
      * CIDs of files embedded in the message.
@@ -30,12 +30,12 @@ class Message
     /**
      * Create a new message instance.
      *
-     * @param  \Symfony\Component\Mime\Email  $email
+     * @param  \Symfony\Component\Mime\Email  $message
      * @return void
      */
-    public function __construct(Email $email)
+    public function __construct(Email $message)
     {
-        $this->email = $email;
+        $this->message = $message;
     }
 
     /**
@@ -48,8 +48,8 @@ public function __construct(Email $email)
     public function from($address, $name = null)
     {
         is_array($address)
-            ? $this->email->from(...$address)
-            : $this->email->from(new Address($address, (string) $name));
+            ? $this->message->from(...$address)
+            : $this->message->from(new Address($address, (string) $name));
 
         return $this;
     }
@@ -64,8 +64,8 @@ public function from($address, $name = null)
     public function sender($address, $name = null)
     {
         is_array($address)
-            ? $this->email->sender(...$address)
-            : $this->email->sender(new Address($address, (string) $name));
+            ? $this->message->sender(...$address)
+            : $this->message->sender(new Address($address, (string) $name));
 
         return $this;
     }
@@ -78,7 +78,7 @@ public function sender($address, $name = null)
      */
     public function returnPath($address)
     {
-        $this->email->returnPath($address);
+        $this->message->returnPath($address);
 
         return $this;
     }
@@ -95,8 +95,8 @@ public function to($address, $name = null, $override = false)
     {
         if ($override) {
             is_array($address)
-                ? $this->email->to(...$address)
-                : $this->email->to(new Address($address, (string) $name));
+                ? $this->message->to(...$address)
+                : $this->message->to(new Address($address, (string) $name));
 
             return $this;
         }
@@ -116,8 +116,8 @@ public function cc($address, $name = null, $override = false)
     {
         if ($override) {
             is_array($address)
-                ? $this->email->cc(...$address)
-                : $this->email->cc(new Address($address, (string) $name));
+                ? $this->message->cc(...$address)
+                : $this->message->cc(new Address($address, (string) $name));
 
             return $this;
         }
@@ -137,8 +137,8 @@ public function bcc($address, $name = null, $override = false)
     {
         if ($override) {
             is_array($address)
-                ? $this->email->bcc(...$address)
-                : $this->email->bcc(new Address($address, (string) $name));
+                ? $this->message->bcc(...$address)
+                : $this->message->bcc(new Address($address, (string) $name));
 
             return $this;
         }
@@ -179,9 +179,9 @@ protected function addAddresses($address, $name, $type)
                 return $address;
             })->all();
 
-            $this->email->{"{$type}"}(...$addresses);
+            $this->message->{"{$type}"}(...$addresses);
         } else {
-            $this->email->{"add{$type}"}(new Address($address, (string) $name));
+            $this->message->{"add{$type}"}(new Address($address, (string) $name));
         }
 
         return $this;
@@ -195,7 +195,7 @@ protected function addAddresses($address, $name, $type)
      */
     public function subject($subject)
     {
-        $this->email->subject($subject);
+        $this->message->subject($subject);
 
         return $this;
     }
@@ -208,7 +208,7 @@ public function subject($subject)
      */
     public function priority($level)
     {
-        $this->email->priority($level);
+        $this->message->priority($level);
 
         return $this;
     }
@@ -222,7 +222,7 @@ public function priority($level)
      */
     public function attach($file, array $options = [])
     {
-        $this->email->attachFromPath($file, $options['as'] ?? null, $options['mime'] ?? null);
+        $this->message->attachFromPath($file, $options['as'] ?? null, $options['mime'] ?? null);
 
         return $this;
     }
@@ -237,7 +237,7 @@ public function attach($file, array $options = [])
      */
     public function attachData($data, $name, array $options = [])
     {
-        $this->email->attach($data, $name, $options['mime'] ?? null);
+        $this->message->attach($data, $name, $options['mime'] ?? null);
 
         return $this;
     }
@@ -250,7 +250,7 @@ public function attachData($data, $name, array $options = [])
      */
     public function embed($file)
     {
-        $this->email->embedFromPath($file);
+        $this->message->embedFromPath($file);
 
         return $this;
     }
@@ -265,7 +265,7 @@ public function embed($file)
      */
     public function embedData($data, $name, $contentType = null)
     {
-        $this->email->embed($data, $name, $contentType);
+        $this->message->embed($data, $name, $contentType);
 
         return $this;
     }
@@ -277,7 +277,7 @@ public function embedData($data, $name, $contentType = null)
      */
     public function getSymfonyMessage()
     {
-        return $this->email;
+        return $this->message;
     }
 
     /**