Merge branch 'master' into issue-78

Author: Mateus Junges

CHANGELOG.md

@@ -2,10 +2,15 @@
 
 All notable changes to `mateusjunges/laravel-acl` will be documented in this file.
 
+
 ## [UNRELEASED]
 - Check wildcard permissions
 - Tests for new middleware
 
+## 1.7.5
+- Fix [#93](https://github.com/mateusjunges/laravel-acl/issues/93)
+- Add database connection check before register gates
+
 ## 1.7.4
 - Add package tests
 - Continuous integration with TravisCI

README.md

@@ -1,6 +1,7 @@
 <p align="center">
 <a href="https://packagist.org/packages/mateusjunges/laravel-acl" target="_blank"><img src="https://poser.pugx.org/mateusjunges/laravel-acl/d/total.svg" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/mateusjunges/laravel-acl" target="_blank"><img src="https://poser.pugx.org/mateusjunges/laravel-acl/v/stable.svg" alt="Latest Stable Version"></a>
+<a href="https://codeclimate.com/github/mateusjunges/laravel-acl"><img src="https://codeclimate.com/github/mateusjunges/laravel-acl.svg"></a>
 <a href="https://packagist.org/packages/mateusjunges/laravel-acl" target="_blank"><img src="https://poser.pugx.org/mateusjunges/laravel-acl/license.svg" alt="License"></a>
 <a href="https://github.styleci.io/repos/175907190" target="_blank"><img src="https://github.styleci.io/repos/175907190/shield?style=flat"></a>
 <a href="https://travis-ci.org/mateusjunges/laravel-acl"><img src="https://img.shields.io/travis/mateusjunges/laravel-acl/master.svg?style=flat" alt="Build Status"></a>

src/ACLAuthServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Junges\ACL;
 
+use DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Schema;
@@ -25,13 +26,15 @@ public function boot()
         ? $permissionModel = app(config('acl.models.permission'))
         : $permissionModel = app(\Junges\ACL\Http\Models\Permission::class);
 
-        if (config('acl.tables.permissions') !== null) {
-            if (Schema::hasTable(config('acl.tables.permissions'))) {
-                $permissionModel->all()->map(function ($permission) {
-                    Gate::define($permission->slug, function ($user) use ($permission) {
-                        return $user->hasPermission($permission) || $user->isAdmin();
+        if ($this->checkConnectionStatus()) {
+            if (config('acl.tables.permissions') !== null) {
+                if (Schema::hasTable(config('acl.tables.permissions'))) {
+                    $permissionModel->all()->map(function ($permission) {
+                        Gate::define($permission->slug, function ($user) use ($permission) {
+                            return $user->hasPermission($permission) || $user->isAdmin();
+                        });
                     });
-                });
+                }
             }
         }
 
@@ -137,4 +140,19 @@ private function registerBladeDirectives()
             return '<?php } ?>';
         });
     }
+
+    /**
+     * Check for database connection.
+     * @return bool
+     */
+    private function checkConnectionStatus()
+    {
+        try {
+            DB::connection()->getPdo();
+
+            return true;
+        } catch (\Exception $exception) {
+            return false;
+        }
+    }
 }

src/ACLServiceProvider.php

@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Junges\ACL\Console\Commands\CreateGroup;
-use Junges\ACL\Http\Observers\GroupObserver;
 use Junges\ACL\Console\Commands\ShowPermissions;
 use Junges\ACL\Console\Commands\UserPermissions;
 use Junges\ACL\Console\Commands\CreatePermission;
@@ -40,9 +39,6 @@ public function boot(Dispatcher $events, Repository $config, Factory $view)
 
         //Load translations
         $this->loadTranslations();
-
-        //Load observers
-        $this->loadObservers();
     }
 
     /**
@@ -66,6 +62,9 @@ public function publishConfig()
         ], 'config');
     }
 
+    /**
+     * Load package commands.
+     */
     public function loadCommands()
     {
         if ($this->app->runningInConsole()) {
@@ -78,6 +77,9 @@ public function loadCommands()
         }
     }
 
+    /**
+     * Load package migrations.
+     */
     public function loadMigrations()
     {
         $customMigrations = config('acl.custom_migrations');
@@ -91,6 +93,9 @@ public function loadMigrations()
         ], 'migrations');
     }
 
+    /**
+     * Load package translations.
+     */
     public function loadTranslations()
     {
         $translationsPath = __DIR__.'/resources/lang';
@@ -100,12 +105,6 @@ public function loadTranslations()
         ], 'translations');
     }
 
-    public function loadObservers()
-    {
-//        $groupModel = app(config('acl.models.group'));
-//        $groupModel->observe(GroupObserver::class);
-    }
-
     /**
      * Register any application services.
      *