Removed support for Laravel 7

Author: mechelon

src/CreatesMailers.php

@@ -8,64 +8,6 @@
 
 trait CreatesMailers
 {
-    protected function createLaravel6Mailer($app)
-    {
-        $config = $this->getConfig();
-
-        // 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 Mailer(
-            $app['view'],
-            $app['swift.mailer'],
-            $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'] as $type) {
-            $this->setGlobalAddress($mailer, $config, $type);
-        }
-
-        return $mailer;
-    }
-
-    protected function createLaravel7Mailer($app)
-    {
-        $defaultDriver = $app['mail.manager']->getDefaultDriver();
-        $config = $this->getConfig($defaultDriver);
-
-        // Laravel 7 no longer bindes the swift.mailer:
-        $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 Laravel7Mailer(
-            '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 createLaravel8Mailer($app)
     {

src/HeloLaravelServiceProvider.php

@@ -47,14 +47,6 @@ public function register()
         $this->app->singleton(Mailer::class, function ($app) {
             $version = $this->version($app);
 
-            if ($version < 7) {
-                return $this->createLaravel6Mailer($app);
-            }
-
-            if ($version < 8) {
-                return $this->createLaravel7Mailer($app);
-            }
-
             if ($version < 9) {
                 return $this->createLaravel8Mailer($app);
             }

src/Laravel7Mailer.php

@@ -5,8 +5,19 @@
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 
-class Laravel8Mailer extends Laravel7Mailer implements MailerContract, MailFactory
+class Laravel8Mailer extends Mailer implements MailerContract, MailFactory
 {
+    public $currentMailer = null;
+    protected $app;
+    protected $mailers = [];
+
+    public function mailer($name = null)
+    {
+        $this->currentMailer = $name;
+
+        return $this;
+    }
+
     /**
      * Set laravel application.
      *

src/Laravel8Mailer.php

@@ -2,7 +2,6 @@
 
 namespace BeyondCode\HeloLaravel\Tests;
 
-use BeyondCode\HeloLaravel\Laravel7Mailer;
 use BeyondCode\HeloLaravel\Mailer;
 use BeyondCode\HeloLaravel\TestMail;
 use BeyondCode\HeloLaravel\TestMailCommand;
@@ -29,9 +28,5 @@
 test('the correct mailer is binded', function () {
     $mailer = app(Mailer::class);
 
-    if (version_compare(app()->version(), '7.0.0', '<')) {
-        $this->assertTrue($mailer instanceof Mailer);
-    } else {
-        $this->assertTrue($mailer instanceof Laravel7Mailer);
-    }
+    $this->assertTrue($mailer instanceof Mailer);
 });