Added Laravel 5.6 compatibility

Author: mikebronner

README.md

@@ -17,8 +17,8 @@ Provide a simple method of managing ACL in a Laravel application built on the
  for Laravel.
 
 ## Requirements
-- PHP >=7.0.0
-- Laravel 5.4
+- PHP >=7.1.3
+- Laravel >= 5.4
 - Bootstrap 3 (needs to be included in your layout file)
 - FontAwesome 4 (needs to be included in your layout file)
 
@@ -38,7 +38,7 @@ composer require genealabs/laravel-governor
 ```php
 'providers' => [
 // [...]
-    GeneaLabs\LaravelGovernor\Providers\LaravelGovernorService::class,
+    GeneaLabs\LaravelGovernor\Providers\Service::class,
 // [...]
 ],
 ```

composer.json

@@ -9,24 +9,19 @@
     }
   ],
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.1.3",
     "genealabs/laravel-casts": "*",
-    "illuminate/support": "5.*"
+    "illuminate/support": "5.5 - 5.6"
   },
   "require-dev": {
-      "doctrine/dbal": "^2.5",
-      "fzaninotto/faker": "~1.4",
-      "jakub-onderka/php-parallel-lint": "0.9.*",
-      "laravel/laravel": "5.4.*",
-      "mockery/mockery": "0.9.*",
-      "pdepend/pdepend": "^2.2",
-      "phploc/phploc": "^3.0",
-      "phpmd/phpmd": "^2.4",
-      "phpunit/phpunit": "~5.0",
-      "sebastian/phpcpd": "^2.0",
-      "squizlabs/php_codesniffer": "^2.7",
-      "symfony/css-selector": "3.2.*",
-      "symfony/dom-crawler": "3.2.*"
+        "codedungeon/phpunit-result-printer": "*",
+        "doctrine/dbal": "^2.5",
+        "fzaninotto/faker": "~1.4",
+        "laravel/laravel": "5.6.*",
+        "mockery/mockery": "~1.0",
+        "nunomaduro/collision": "~1.1",
+        "phpunit/phpunit": "*",
+        "symfony/thanks": "^1.0"
   },
   "autoload": {
     "classmap": [
@@ -41,7 +36,7 @@
   "extra": {
       "laravel": {
           "providers": [
-              "GeneaLabs\\LaravelGovernor\\Providers\\LaravelGovernorService"
+              "GeneaLabs\\LaravelGovernor\\Providers\\Service"
           ]
       }
   },

phpunit.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit
+    backupGlobals="false"
     backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
+    printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
     stopOnFailure="false"
     syntaxCheck="true"
-    bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="Governor for Laravel Test Suite">

src/Providers/LaravelGovernorService.php

@@ -1,7 +1,7 @@
 <?php namespace GeneaLabs\LaravelGovernor\Providers;
 
 use GeneaLabs\LaravelGovernor\Console\Commands\Publish;
-use GeneaLabs\LaravelCasts\Providers\LaravelCastsService;
+use GeneaLabs\LaravelCasts\Providers\Service as LaravelCastsService;
 use GeneaLabs\LaravelGovernor\Listeners\CreatedListener;
 use GeneaLabs\LaravelGovernor\Listeners\CreatingListener;
 use GeneaLabs\LaravelGovernor\Http\ViewComposers\Layout;

tests/TestCase.php

@@ -25,34 +25,4 @@ protected function setUp()
         ]);
         $this->withoutExceptionHandling();
     }
-
-    protected function withoutExceptionHandling()
-    {
-        $this->oldExceptionHandler = $this->app->make(ExceptionHandler::class);
-        $this->app->instance(ExceptionHandler::class, new class extends Handler {
-            public function __construct()
-            {
-                //
-            }
-
-            public function report(Exception $exception)
-            {
-                //
-            }
-
-            public function render($request, Exception $exception)
-            {
-                throw $exception;
-            }
-        });
-
-        return $this;
-    }
-
-    protected function withExceptionHandling()
-    {
-        $this->app->instance(ExceptionHandler::class, $this->oldExceptionHandler);
-
-        return $this;
-    }
 }