Laravel 8 (#16)

* Set listener in boot-method

* Update for Laravel 8

* Fix Travis YAML-syntax

* Remove old dependencies

* Add back phpunit 8 for php 7.2

Author: olssonm

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 .DS_Store
 .phpunit.result.cache
+*.old

.travis.yml

@@ -13,15 +13,6 @@ script:
 
 jobs:
   include:
-    - php: 7.1
-      env:
-        - ILLUMINATE_VERSION=5.8.*
-    - php: 7.2.24
-      env:
-        - ILLUMINATE_VERSION=5.8.*
-    - php: 7.2.24
-      env:
-        - ILLUMINATE_VERSION=6.0.*
     - php: 7.2.24
       env:
         - ILLUMINATE_VERSION=7.0.*
@@ -37,3 +28,9 @@ jobs:
     - php: 7.4
       env:
         - ILLUMINATE_VERSION=^7.0
+    - php: 7.3
+      env:
+        - ILLUMINATE_VERSION=^8.0
+    - php: 7.4
+      env:
+        - ILLUMINATE_VERSION=^8.0

README.md

@@ -21,8 +21,6 @@ Backup Shield simply listens for when the .zip-file generated by Laravel-backup
 composer require olssonm/laravel-backup-shield
 ```
 
-Supports `laravel/framework: "^5.8"` and above (including Laravel 6 & 7.) Requires `PHP: "^7.1"`.
-
 Please note that `spatie/laravel-backup: "^6"` and `laravel/framework: "^6.0|^7.0"` requires PHP 7.2.
 
 ## Configuration

composer.json

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

src/BackupShieldServiceProvider.php

@@ -3,24 +3,19 @@
 namespace Olssonm\BackupShield;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
+
 use Olssonm\BackupShield\Factories\Password;
 use Olssonm\BackupShield\Encryption;
 
+use Spatie\Backup\Events\BackupZipWasCreated;
+use Olssonm\BackupShield\Listeners\PasswordProtectZip;
+
 /**
  * Laravel service provider for the Backup Shield-package
  */
 class BackupShieldServiceProvider extends ServiceProvider
 {
-    /**
-     * Register listener to the "BackupZipWasCreated" event
-     * @var array
-     */
-    protected $listen = [
-        'Spatie\Backup\Events\BackupZipWasCreated' => [
-            'Olssonm\BackupShield\Listeners\PasswordProtectZip',
-        ],
-    ];
-
     /**
      * Config-path
      * @var string
@@ -50,6 +45,12 @@ public function boot() : void
             $this->config => config_path('backup-shield.php'),
         ]);
 
+        // Listen for the "BackupZipWasCreated" event
+        Event::listen(
+            BackupZipWasCreated::class,
+            PasswordProtectZip::class
+        );
+
         parent::boot();
     }
 

tests/BackupShieldTests.php

@@ -16,7 +16,7 @@ public function setUp(): void
 
     /**
      * Load the package
-     * 
+     *
      * @return array the packages
      */
     protected function getPackageProviders($app)
@@ -59,13 +59,14 @@ public function testListenerReturnData()
 		$path = __DIR__ . '/resources/test.zip';
 		$pathTest = __DIR__ . '/resources/processed.zip';
 
-		// Make backup
+		// Make file ready for testing
 		copy($path, $pathTest);
 
 		// Manually set config
 		config()->set('backup-shield.password', 'M79Y6aKARXa9yLrcZd3srz');
 		config()->set('backup-shield.encryption',  \Olssonm\BackupShield\Encryption::ENCRYPTION_WINZIP_AES_256);
 
+		// Fire event
 		$data = event(new BackupZipWasCreated($pathTest));
 
 		$this->assertEquals($pathTest, $data[0]);