Merge pull request #608 from ricus-zero2one/master

Laravel 8 Compatibility - includes php version bump, change usage of deprecated $app, updated readme and travis/scrutinizer config updated

.scrutinizer.yml

@@ -12,7 +12,7 @@ build:
     php72:
       environment:
         php:
-          version: 7.2.5
+          version: 7.3
       tests:
         override:
           - php-scrutinizer-run

.travis.yml

@@ -5,7 +5,7 @@ env:
 language: php
 
 php:
-    - 7.2
+    - 7.3
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

README.md

@@ -22,7 +22,8 @@ The package documentation can be found on the [official website](http://www.lara
 ## Version Information
  Version   | Illuminate    | Status                  | PHP Version
 :----------|:--------------|:------------------------|:------------
- 10.x      | 5.8.x - 7.x.x | Active support :rocket: | >= 7.2.5
+ 11.x      | 5.8.x - 8.x.x | Active support :rocket: | >= 7.3
+ 10.x      | 5.8.x - 7.x.x | Active support          | >= 7.2.5
  9.x       | 5.8.x - 6.x.x | Active support          | >= 7.1.3
  8.x       | 5.2.x - 5.7.x | Active support          | >= 7.0.13
  7.x       | 5.2.x - 5.6.x | End of life             | >= 7.0.13

composer.json

@@ -39,10 +39,10 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
-        "illuminate/console": "^5.8|^6.0|^7.0",
-        "illuminate/database": "^5.8|^6.0|^7.0",
-        "illuminate/filesystem": "^5.8|^6.0|^7.0"
+        "php": "^7.3",
+        "illuminate/console": "^5.8|^6.0|^7.0|^8.0",
+        "illuminate/database": "^5.8|^6.0|^7.0|^8.0",
+        "illuminate/filesystem": "^5.8|^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",

src/Auditor.php

@@ -30,7 +30,7 @@ protected function createDriver($driver)
             return parent::createDriver($driver);
         } catch (InvalidArgumentException $exception) {
             if (class_exists($driver)) {
-                return $this->app->make($driver);
+                return $this->container->make($driver);
             }
 
             throw $exception;
@@ -70,7 +70,7 @@ public function execute(Auditable $model)
             $driver->prune($model);
         }
 
-        $this->app->make('events')->dispatch(
+        $this->container->make('events')->dispatch(
             new Audited($model, $driver, $audit)
         );
     }
@@ -82,7 +82,7 @@ public function execute(Auditable $model)
      */
     protected function createDatabaseDriver(): Database
     {
-        return $this->app->make(Database::class);
+        return $this->container->make(Database::class);
     }
 
     /**
@@ -95,7 +95,7 @@ protected function createDatabaseDriver(): Database
      */
     protected function fireAuditingEvent(Auditable $model, AuditDriver $driver): bool
     {
-        return $this->app->make('events')->until(
+        return $this->container->make('events')->until(
             new Auditing($model, $driver)
         ) !== false;
     }