Laravel 7 compatibility (#72)

* Allow installation with Laravel 7

* Fixed registration for Laravel 7 compatibility

* Fixed Laravel version requirements

* Removed incompatible PHP version from CI tests

Co-authored-by: Fede Isas <[email protected]>

Author: zupolgec

.travis.yml

@@ -3,12 +3,6 @@ language: php
 
 matrix:
   include:
-    - php: 5.6
-      dist: xenial
-    - php: 7.0
-      dist: xenial
-    - php: 7.1
-      dist: bionic
     - php: 7.2
       dist: bionic
     - php: 7.3

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~5.0|^6.0|^7.0",
+        "illuminate/support": "^7.0",
         "tijsverkoyen/css-to-inline-styles": "~2.0"
     },
     "require-dev" : {

src/LaravelMailCssInlinerServiceProvider.php

@@ -1,8 +1,7 @@
 <?php namespace Fedeisas\LaravelMailCssInliner;
 
+use Illuminate\Mail\MailManager;
 use Illuminate\Support\ServiceProvider;
-use Swift_Mailer;
-use Fedeisas\LaravelMailCssInliner\CssInlinerPlugin;
 
 class LaravelMailCssInlinerServiceProvider extends ServiceProvider
 {
@@ -31,10 +30,9 @@ public function register()
             return new CssInlinerPlugin($app['config']->get('css-inliner'));
         });
 
-        $this->app->extend('swift.mailer', function (Swift_Mailer $swiftMailer, $app) {
-            $inlinerPlugin = $app->make(CssInlinerPlugin::class);
-            $swiftMailer->registerPlugin($inlinerPlugin);
-            return $swiftMailer;
+        $this->app->extend('mail.manager', function (MailManager $mailManager) {
+            $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
+            return $mailManager;
         });
     }
 }