Merge pull request #12 from olssonm/dev

Improved Laravel 6 compatibility

Author: olssonm

.travis.yml

@@ -11,6 +11,12 @@ script:
 
 matrix:
   include:
+    - php: 7.1
+      env:
+        - ILLUMINATE_VERSION=5.8.*
     - php: 7.2
       env:
         - ILLUMINATE_VERSION=5.8.*
+    - php: 7.2
+      env:
+        - ILLUMINATE_VERSION=^6.0

README.md

@@ -13,27 +13,21 @@
 
 Backup Shield simply listens for when the .zip-file generated by Laravel-backup is done, grabs it and applies your password and encryption of your liking.
 
-*Using Laravel 5.2? Check out the [v1 branch](https://github.com/olssonm/laravel-backup-shield/tree/v1).*
+*Using older versions of Laravel? Check out the [v1 branch](https://github.com/olssonm/laravel-backup-shield/tree/v1) (for Laravel 5.2) and the [v2 branch](https://github.com/olssonm/laravel-backup-shield/tree/v2).*
 
 ## Installation
 
 ```bash
 composer require olssonm/laravel-backup-shield
 ```
 
-Requires `PHP: "^7.0"` and `laravel/framework: "^5.3"`. As long as other requirements are met, all versions of `spatie/laravel-backup` above 4.0 should work.
+Requires `PHP: "^7.1"` and `laravel/framework: "^5.8"`. **Compatible with Laravel 6**
 
-In Laravel > 5.5 the service provider will be automatically added. You can also add the service provider to your app.php manually if needed:
-
-```php
-'providers' => [
-    Olssonm\BackupShield\BackupShieldServiceProvider::class
-]
-```
+Please note that `spatie/laravel-backup: "^6"`  and `laravel/framework: "^6.0"` requires PHP 7.2.
 
 ## Configuration
 
-Publish your configuration using `php artisan vendor:publish`. Or if you're using a version of Laravel prior to 5.5 via ```php artisan vendor:publish --provider="Olssonm\BackupShield\BackupShieldServiceProvider"```.
+Publish your configuration using `php artisan vendor:publish` and select `BackupShieldServiceProvider`. Or directly via ```php artisan vendor:publish --provider="Olssonm\BackupShield\BackupShieldServiceProvider"```.
 
 You only have the ability to set two different options; password and encryption.
 

composer.json

@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": "~7.2",
-        "illuminate/support": "^6.0",
+        "php": ">=7.1",
+        "illuminate/support": "~5.8 || ^6.0",
         "nelexa/zip": "^3.1",
         "spatie/laravel-backup": "~5.0|~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5 || ^8.0",
-        "orchestra/testbench": "^3.8"
+        "orchestra/testbench": "^3.8 || ^4"
     },
     "autoload": {
         "psr-4": {