Remove support for Laravel 8 and 9, consolidate to GeneralLaravelMailer

Author: mechelon

src/CreatesMailers.php

@@ -4,57 +4,22 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Swift_Mailer;
 
 trait CreatesMailers
 {
-    protected function createLaravel8Mailer($app)
-    {
-        $defaultDriver = $app['mail.manager']->getDefaultDriver();
-        $config = $this->getConfig($defaultDriver);
-
-        $swiftMailer = new Swift_Mailer($app['mail.manager']->createTransport($config));
-
-        // Once we have create the mailer instance, we will set a container instance
-        // on the mailer. This allows us to resolve mailer classes via containers
-        // for maximum testability on said classes instead of passing Closures.
-        $mailer = new Laravel8Mailer(
-            'smtp',
-            $app['view'],
-            $swiftMailer,
-            $app['events']
-        );
-
-        if ($app->bound('queue')) {
-            $mailer->setQueue($app['queue']);
-        }
-
-        // Next we will set all of the global addresses on this mailer, which allows
-        // for easy unification of all "from" addresses as well as easy debugging
-        // of sent messages since they get be sent into a single email address.
-        foreach (['from', 'reply_to', 'to', 'return_path'] as $type) {
-            $this->setGlobalAddress($mailer, $config, $type);
-        }
 
-        return $mailer;
-    }
-
-    protected function createLaravel9Mailer($app)
+    protected function createGeneralLaravelMailer($app)
     {
         $defaultDriver = $app['mail.manager']->getDefaultDriver();
         $config = $this->getConfig($defaultDriver);
 
-        // We get Symfony Transport from Laravel 9 mailer
-        if (version_compare(app()->version(), '10.0.0', '<')) {
-            $symfonyTransport = $app['mail.manager']->getSymfonyTransport();
-        } else {
-            $symfonyTransport = $app['mailer']->getSymfonyTransport();
-        }
+        // We get Symfony Transport from Laravel 10+ mailer
+        $symfonyTransport = $app['mailer']->getSymfonyTransport();
 
         // Once we have create the mailer instance, we will set a container instance
         // on the mailer. This allows us to resolve mailer classes via containers
         // for maximum testability on said classes instead of passing Closures.
-        $mailer = new Laravel9Mailer(
+        $mailer = new GeneralLaravelMailer(
             'smtp',
             $app['view'],
             $symfonyTransport,
@@ -93,11 +58,7 @@ protected function getConfig($name = 'smtp')
      */
     protected function setGlobalAddress($mailer, array $config, $type)
     {
-        if (version_compare(app()->version(), '7.0.0', '<')) {
-            $address = Arr::get($config, $type);
-        } else {
-            $address = Arr::get($config, $type, $this->app['config']['mail.'.$type]);
-        }
+        $address = Arr::get($config, $type, $this->app['config']['mail.'.$type]);
 
         if (is_array($address) && isset($address['address'])) {
             $mailer->{'always'.Str::studly($type)}($address['address'], $address['name']);

src/Laravel8Mailer.php renamed to src/GeneralLaravelMailer.php

@@ -5,7 +5,7 @@
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 
-class Laravel8Mailer extends Mailer implements MailerContract, MailFactory
+class GeneralLaravelMailer extends Mailer implements MailerContract, MailFactory
 {
     public $currentMailer = null;
     protected $app;

src/HeloLaravelServiceProvider.php

@@ -45,13 +45,7 @@ public function register()
         $this->mergeConfigFrom(__DIR__.'/../config/helo.php', 'helo');
 
         $this->app->singleton(Mailer::class, function ($app) {
-            $version = $this->version($app);
-
-            if ($version < 9) {
-                return $this->createLaravel8Mailer($app);
-            }
-
-            return $this->createLaravel9Mailer($app);
+            return $this->createGeneralLaravelMailer($app);
         });
     }