0.2.x - Support for PHP 8 and Laravel 7 and 8 (#3)

Author: clemblanco

.github/workflows/run-tests.yml

@@ -8,16 +8,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 7.1, 7.4 ]
-        laravel: [ 5.5.*, 6.* ]
-        exclude:
-          - laravel: 6.*
-            php: 7.1
+        php: [ 7.3, 8.0 ]
+        laravel: [ 7.*, 8.* ]
         include:
-          - laravel: 5.5.*
-            testbench: 3.5.*
-          - laravel: 6.*
-            testbench: 4.*
+          - laravel: 7.*
+            testbench: 5.*
+          - laravel: 8.*
+            testbench: 6.*
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

README.md

@@ -13,8 +13,16 @@ This can be useful when wanting to store emails sent for archive purposes.
 
 You can install the package via composer:
 
+For Laravel 5.x and 6.x
+
+```bash
+composer require pod-point/laravel-mail-export:^0.1
+```
+
+For Laravel 7.x and 8.x
+
 ```bash
-composer require pod-point/laravel-mail-export
+composer require pod-point/laravel-mail-export:^0.2
 ```
 
 ### Publishing the config file

composer.json

@@ -11,15 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.1|^7.2|^7.3|^7.4",
-        "nesbot/carbon": "^1.0|^2.0",
-        "illuminate/support": "~5.4|~5.5|~5.6|~5.7|~5.8|^6.0",
-        "illuminate/mail": "~5.4|~5.5|~5.6|~5.7|~5.8|^6.0",
-        "illuminate/filesystem": "~5.4|~5.5|~5.6|~5.7|~5.8|^6.0"
+        "php": "^7.2.5|^8.0",
+        "nesbot/carbon": "^2.0",
+        "illuminate/support": "~7.0|^8.0",
+        "illuminate/mail": "~7.0|^8.0",
+        "illuminate/filesystem": "~7.0|^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.4.0|^3.5.0|^3.6.0|^3.7.0|^3.8.0|^4.0",
-        "phpunit/phpunit": "~5.7|~6.0|^7.0|^7.5|^8.0|^9.0"
+        "orchestra/testbench": "^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,6 +31,9 @@
         }
     },
     "extra": {
+        "branch-alias": {
+            "dev-master": "0.2-dev"
+        },
         "laravel": {
             "providers": [
                 "PodPoint\\MailExport\\MailExportServiceProvider"

src/Concerns/Exportable.php

@@ -2,7 +2,6 @@
 
 namespace PodPoint\MailExport\Concerns;
 
-use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
 use PodPoint\MailExport\Contracts\ShouldExport;
 use PodPoint\MailExport\StorageOptions;
@@ -15,7 +14,7 @@ trait Exportable
     /**
      * @inheritDoc
      */
-    public function send(MailerContract $mailer)
+    public function send($mailer)
     {
         $this->withSwiftMessage(function ($message) {
             if (! $this instanceof ShouldExport) {