Remove support for older Laravel versions

Author: marickvantuil

src/Sender.php

@@ -26,9 +26,8 @@ public function send(Email $email): void
             $this->buildMessage($message, $email);
         });
 
-        // This is used so we can assert things on the sent message in Laravel 9+ since we cannot use
-        // the Swift Mailer plugin anymore. So this is purely used for in the PHPUnit tests.
-        if (version_compare(app()->version(), '9.0.0', '>=') && !is_null($sentMessage)) {
+        // $sentMessage is null when mocking (Mail::shouldReceive('send')->once())
+        if (!is_null($sentMessage)) {
             event(new MessageSent($sentMessage));
         }
 
@@ -50,13 +49,7 @@ private function buildMessage(Message $message, Email $email): void
             ->subject($email->getSubject())
             ->from($email->getFromAddress(), $email->getFromName());
 
-        if (version_compare(app()->version(), '9.0.0', '>=')) {
-            // Symfony Mailer
-            $message->html($email->getBody());
-        } else {
-            // SwiftMail
-            $message->setBody($email->getBody(), 'text/html');
-        }
+        $message->html($email->getBody());
 
         $attachmentMap = [
             'attachment'    => 'attach',

src/SentMessage.php

@@ -4,7 +4,7 @@
 
 namespace Stackkit\LaravelDatabaseEmails;
 
-use Swift_Mime_SimpleMimeEntity;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Mime\Part\DataPart;
 
 class SentMessage
@@ -19,7 +19,7 @@ class SentMessage
     public $attachments = [];
     public $headers = [];
 
-    public static function createFromSymfonyMailer(\Symfony\Component\Mime\Email $email): SentMessage
+    public static function createFromSymfonyMailer(Email $email): SentMessage
     {
         $sentMessage = new self();
 
@@ -54,25 +54,4 @@ public static function createFromSymfonyMailer(\Symfony\Component\Mime\Email $em
 
         return $sentMessage;
     }
-
-    public static function createFromSwiftMailer(\Swift_Mime_SimpleMessage $message): SentMessage
-    {
-        $sentMessage = new self();
-
-        $sentMessage->from = $message->getFrom();
-        $sentMessage->to = $message->getTo();
-        $sentMessage->cc = $message->getCc();
-        $sentMessage->bcc = $message->getBcc();
-        $sentMessage->replyTo = $message->getReplyTo();
-        $sentMessage->subject = $message->getSubject();
-        $sentMessage->body = $message->getBody();
-        $sentMessage->attachments = array_map(function(Swift_Mime_SimpleMimeEntity $entity) {
-            return [
-                'body' => $entity->getBody(),
-                'disposition' => $entity->getContentType() . ' ' . $entity->getHeaders()->get('content-disposition'),
-            ];
-        }, $message->getChildren());
-
-        return $sentMessage;
-    }
 }

tests/MailableReaderTest.php

@@ -13,10 +13,6 @@ class MailableReaderTest extends TestCase
 {
     private function mailable(): Mailable
     {
-        if (version_compare(app()->version(), '10.0.0', '>=')) {
-            return new Laravel10TestMailable();
-        }
-
         return new TestMailable();
     }
 
@@ -121,41 +117,11 @@ public function it_extracts_the_from_address_and_or_name()
                 ->from(null, 'Marick')
         )->send();
 
-        // 8.x no longer accepts an empty address.
-        // https://github.com/laravel/framework/pull/39035
-        if (version_compare(app()->version(), '8.0.0', '>=')) {
-            $this->assertFalse($email->hasFrom());
-        } else {
-            $this->assertTrue($email->hasFrom());
-            $this->assertEquals(config('mail.from.address'), $email->getFromAddress());
-            $this->assertEquals('Marick', $email->getFromName());
-        }
+        $this->assertFalse($email->hasFrom());
     }
 }
 
 class TestMailable extends Mailable
-{
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this->to('[email protected]')
-            ->cc(['[email protected]', '[email protected]'])
-            ->bcc(['[email protected]', '[email protected]'])
-            ->replyTo(['[email protected]', '[email protected]'])
-            ->subject('Your order has shipped!')
-            ->attach(__DIR__ . '/files/pdf-sample.pdf', [
-                'mime' => 'application/pdf',
-            ])
-            ->attachData('<p>Thanks for your oder</p>', 'order.html')
-            ->view('tests::dummy', ['name' => 'John Doe']);
-    }
-}
-
-class Laravel10TestMailable extends Mailable
 {
     public function content(): Content
     {

tests/SenderTest.php

@@ -6,28 +6,23 @@
 use Illuminate\Support\Facades\Event;
 use Stackkit\LaravelDatabaseEmails\MessageSent;
 use Stackkit\LaravelDatabaseEmails\SentMessage;
-use Swift_Events_SendEvent;
 use Illuminate\Support\Facades\Mail;
 use Stackkit\LaravelDatabaseEmails\Email;
 
 class SenderTest extends TestCase
 {
-    /** @var Swift_Events_SendEvent[] */
+    /** @var array<SentMessage> */
     public $sent = [];
 
     public function setUp(): void
     {
         parent::setUp();
 
-        if (version_compare(app()->version(), '9.0.0', '>=')) {
-            Event::listen(MessageSent::class, function (MessageSent $event) {
-                $this->sent[] = SentMessage::createFromSymfonyMailer(
-                    $event->message->getSymfonySentMessage()->getOriginalMessage()
-                );
-            });
-        } else {
-            Mail::getSwiftMailer()->registerPlugin(new TestingMailEventListener($this));
-        }
+        Event::listen(MessageSent::class, function (MessageSent $event) {
+            $this->sent[] = SentMessage::createFromSymfonyMailer(
+                $event->message->getSymfonySentMessage()->getOriginalMessage()
+            );
+        });
     }
 
     /** @test */