Merge pull request #28 from orkhanahmadov/master

Laravel 9 support

Author: mpociot

.gitignore

@@ -2,4 +2,6 @@ build
 composer.lock
 docs
 vendor
-coverage
+coverage
+.phpunit.result.cache
+.idea

.travis.yml

@@ -3,6 +3,8 @@ language: php
 php:
   - 7.3
   - 7.4
+  - 8.0
+  - 8.1
 
 env:
   matrix:

composer.json

@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/view": "^6.0|^7.0|^8.0",
-        "illuminate/console": "^6.0|^7.0|^8.0",
-        "illuminate/mail": "^6.0|^7.0|^8.0"
+        "illuminate/view": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/mail": "^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.1|^6.3",
+        "orchestra/testbench": "^5.1|^6.3|^7.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {
@@ -42,6 +42,7 @@
     "config": {
         "sort-packages": true
     },
+    "minimum-stability": "dev",
     "extra": {
         "laravel": {
             "providers": [

src/HeloLaravelServiceProvider.php

@@ -26,7 +26,7 @@ public function boot()
         Mail::swap($instance);
 
         app()->instance(MailerContract::class, $instance);
-        
+
         if ($this->app->runningInConsole()) {
             View::addNamespace('helo', __DIR__ . '/../resources/views');
         }
@@ -41,7 +41,7 @@ public function register()
             $this->commands([
                 TestMailCommand::class,
             ]);
-            
+
             $this->publishes([
                 __DIR__.'/../config/helo.php' => base_path('config/helo.php'),
             ], 'config');
@@ -50,11 +50,16 @@ public function register()
         $this->mergeConfigFrom(__DIR__.'/../config/helo.php', 'helo');
 
         $this->app->singleton(Mailer::class, function ($app) {
-            if (version_compare($app->version(), '7.0.0', '<')) {
+            $version = (int) Str::of($app->version())->explode('.')->first();
+
+            if ($version < 7) {
                 return $this->createLaravel6Mailer($app);
             }
+            if ($version < 9) {
+                return $this->createLaravel7Mailer($app);
+            }
 
-            return $this->createLaravel7Mailer($app);
+            return $this->createLaravel9Mailer($app);
         });
     }
 
@@ -112,6 +117,35 @@ protected function createLaravel7Mailer($app)
         return $mailer;
     }
 
+    protected function createLaravel9Mailer($app)
+    {
+        $defaultDriver = $app['mail.manager']->getDefaultDriver();
+        $config = $this->getConfig($defaultDriver);
+
+        // We get Symfony Transport from Laravel 9 mailer
+        $symfonyTransport = $app['mail.manager']->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 Laravel7Mailer(
+            'smtp', $app['view'], $symfonyTransport, $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 getConfig($name = 'smtp')
     {
         return $this->app['config']['mail.driver']