Fix #157

santigarcor · Jul 11, 2017 · 941f776 · 941f776
1 parent 0783504
commit 941f776
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/Laratrust/Traits/LaratrustPermissionTrait.php b/src/Laratrust/Traits/LaratrustPermissionTrait.php
@@ -66,7 +66,7 @@ public static function bootLaratrustPermissionTrait()
 
         static::deleting(function ($permission) {
             if (method_exists($permission, 'bootSoftDeletes') && $permission->forceDeleting) {
-                return true;
+                return;
             }
 
             $permission->roles()->sync([]);

diff --git a/src/Laratrust/Traits/LaratrustRoleTrait.php b/src/Laratrust/Traits/LaratrustRoleTrait.php
@@ -78,7 +78,6 @@ public static function bootLaratrustRoleTrait()
     {
         $flushCache = function ($role) {
             $role->flushCache();
-            return true;
         };
 
         // If the role doesn't use SoftDeletes.
@@ -91,7 +90,7 @@ public static function bootLaratrustRoleTrait()
 
         static::deleting(function ($role) {
             if (method_exists($role, 'bootSoftDeletes') && $role->forceDeleting) {
-                return true;
+                return;
             }
 
             $role->permissions()->sync([]);

diff --git a/src/Laratrust/Traits/LaratrustTeamTrait.php b/src/Laratrust/Traits/LaratrustTeamTrait.php
@@ -45,7 +45,7 @@ public static function bootLaratrustTeamTrait()
     {
         static::deleting(function ($team) {
             if (method_exists($team, 'bootSoftDeletes') && $team->forceDeleting) {
-                return true;
+                return;
             }
 
             foreach (array_keys(Config::get('laratrust.user_models')) as $key) {

diff --git a/src/Laratrust/Traits/LaratrustUserTrait.php b/src/Laratrust/Traits/LaratrustUserTrait.php
@@ -105,8 +105,6 @@ public static function bootLaratrustUserTrait()
     {
         $flushCache = function ($user) {
             $user->flushCache();
-
-            return true;
         };
 
         // If the user doesn't use SoftDeletes.
@@ -119,13 +117,11 @@ public static function bootLaratrustUserTrait()
 
         static::deleting(function ($user) {
             if (method_exists($user, 'bootSoftDeletes') && !$user->forceDeleting) {
-                return true;
+                return;
             }
 
             $user->roles()->sync([]);
             $user->permissions()->sync([]);
-
-            return true;
         });
     }