z1haze / laravel-acl

src/z1haze/Acl/Traits/UserAndLevel.php

Spacing +17 added lines, -26 removed lines

@@ -21,8 +21,7 @@ 
         $level = $this->getLevel($level);
 
         return is_a($this, config('laravel-acl.level'), true) ?
-            $this->name == $level->name :
-            $this->level->name == $level->name;
+            $this->name == $level->name : $this->level->name == $level->name;
     }
 
     /**
@@ -38,8 +37,7 @@ 
         $level = $this->getLevel($level);
 
         return is_a($this, config('laravel-acl.level'), true) ?
-            $this->rank <= $level->rank :
-            $this->level->rank <= $level->rank;
+            $this->rank <= $level->rank : $this->level->rank <= $level->rank;
     }
 
     /**
@@ -133,7 +131,7 @@ 
         return \Cache::remember(
             'laravel-acl.getAllPermissionsFor' . $model . '_' . $this->id,
             config('laravel-acl.cacheMinutes'),
-            function () {
+            function() {
                 return $this->cacheGetAllPermissions();
             }
         );
@@ -155,7 +153,7 @@ 
         return \Cache::remember(
             'laravel-acl.getInheritedPermissionsFor' . $model . '_' . $this->id,
             config('laravel-acl.cacheMinutes'),
-            function () {
+            function() {
                 return $this->cacheGetInheritedPermissions();
             }
         );
@@ -177,7 +175,7 @@ 
         return \Cache::remember(
             'laravel-acl.getAvailablePermissionsFor' . $model . '_' . $this->id,
             config('laravel-acl.cacheMinutes'),
-            function () {
+            function() {
                 return $this->cacheGetAvailablePermissions();
             }
         );
@@ -200,7 +198,7 @@ 
         return \Cache::remember(
             'laravel-acl.hasPermissionTo_' . $model . '_' . $this->id . '_Permission_' . $permission,
             config('laravel-acl.cacheMinutes'),
-            function () use ($permission) {
+            function() use ($permission) {
                 return $this->cacheHasPermissionTo($permission);
             }
         );
@@ -217,8 +215,7 @@ 
     public function isLowerThan($other)
     {
         return is_a($this, config('laravel-acl.user'), true) ?
-            $this->level->rank > $other->level->rank :
-            $this->rank > $other->rank;
+            $this->level->rank > $other->level->rank : $this->rank > $other->rank;
     }
 
     /**
@@ -232,8 +229,7 @@ 
     public function isHigherThan($other)
     {
         return is_a($this, config('laravel-acl.user'), true) ?
-            $this->level->rank < $other->level->rank :
-            $this->rank < $other->rank;
+            $this->level->rank < $other->level->rank : $this->rank < $other->rank;
     }
 
     /**
@@ -247,8 +243,7 @@ 
     public function isEqualTo($other)
     {
         return is_a($this, config('laravel-acl.user'), true) ?
-            $this->level->rank == $other->level->rank :
-            $this->rank == $other->rank;
+            $this->level->rank == $other->level->rank : $this->rank == $other->rank;
     }
 
 
@@ -267,14 +262,13 @@ 
     protected function cacheGetAllPermissions()
     {
         $rank = is_a($this, config('laravel-acl.level'), true) ?
-            $this->rank :
-            $this->level->rank;
+            $this->rank : $this->level->rank;
 
         $levels = config('laravel-acl.level', Level::class)::where('rank', '>=', $rank)->with('permissions')->get();
 
         $allPerms = new Collection();
 
-        $levels->each(function ($level, $key) use (&$allPerms) {
+        $levels->each(function($level, $key) use (&$allPerms) {
             $allPerms = $allPerms->merge($level->permissions);
         });
 
@@ -290,16 +284,14 @@ 
     protected function cacheGetInheritedPermissions()
     {
         $rank = is_a($this, config('laravel-acl.level'), true) ?
-            $this->rank :
-            $this->level->rank;
+            $this->rank : $this->level->rank;
 
         $levels = is_a($this, config('laravel-acl.user'), true) ?
-            config('laravel-acl.level', Level::class)::where('rank', '>=', $rank)->with('permissions')->get() :
-            config('laravel-acl.level', Level::class)::where('rank', '>', $rank)->with('permissions')->get();
+            config('laravel-acl.level', Level::class)::where('rank', '>=', $rank)->with('permissions')->get() : config('laravel-acl.level', Level::class)::where('rank', '>', $rank)->with('permissions')->get();
 
         $inheritedPerms = new Collection();
 
-        $levels->each(function ($level, $key) use (&$inheritedPerms) {
+        $levels->each(function($level, $key) use (&$inheritedPerms) {
             $inheritedPerms = $inheritedPerms->merge($level->permissions->load('level'));
         });
 
@@ -396,8 +388,7 @@ 
                 $permissionsObjects[$permission->id] = ['negated' => true];
             } else {
                 $model == 'User' ?
-                    array_push($permissionsObjects, $permission->id) :
-                    array_push($permissionsObjects, $permission);
+                    array_push($permissionsObjects, $permission->id) : array_push($permissionsObjects, $permission);
             }
         }
 
@@ -433,7 +424,7 @@ 
             $this->permissions()->detach($permissionObjects);
 
         if ($model == 'Level') {
-            config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function ($permission) {
+            config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function($permission) {
                 return $permission->id;
             }, $permissionObjects))->update(['level_id' => null]);
         }
@@ -454,7 +445,7 @@ 
         if ($model == 'Level') {
             $this->clearPermissions();
 
-            config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function ($permission) {
+            config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function($permission) {
                 return $permission->id;
             }, $permissionObjects))
                 ->update(['level_id' => $this->id]);

Braces +27 added lines, -18 removed lines

@@ -105,11 +105,13 @@ 
      */
     public function clearPermissions()
     {
-        if (is_a($this, config('laravel-acl.user'), true))
-            $this->permissions()->detach();
+        if (is_a($this, config('laravel-acl.user'), true)) {
+                    $this->permissions()->detach();
+        }
 
-        if (is_a($this, config('laravel-acl.level'), true))
-            config('laravel-acl.permission', Permission::class)::whereLevelId($this->id)->update(['level_id' => null]);
+        if (is_a($this, config('laravel-acl.level'), true)) {
+                    config('laravel-acl.permission', Permission::class)::whereLevelId($this->id)->update(['level_id' => null]);
+        }
     }
 
 
@@ -413,11 +415,13 @@ 
      */
     protected function addOrNegate($model, $permissionObjects, $action)
     {
-        if ($model == 'User')
-            $this->permissions()->attach($permissionObjects);
+        if ($model == 'User') {
+                    $this->permissions()->attach($permissionObjects);
+        }
 
-        if ($model == 'Level')
-            $this->permissions()->saveMany($permissionObjects);
+        if ($model == 'Level') {
+                    $this->permissions()->saveMany($permissionObjects);
+        }
     }
 
     /**
@@ -429,8 +433,9 @@ 
      */
     protected function remove($model, $permissionObjects)
     {
-        if ($model == 'User')
-            $this->permissions()->detach($permissionObjects);
+        if ($model == 'User') {
+                    $this->permissions()->detach($permissionObjects);
+        }
 
         if ($model == 'Level') {
             config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function ($permission) {
@@ -448,8 +453,9 @@ 
      */
     protected function sync($model, $permissionObjects)
     {
-        if ($model == 'User')
-            $this->permissions()->sync($permissionObjects);
+        if ($model == 'User') {
+                    $this->permissions()->sync($permissionObjects);
+        }
 
         if ($model == 'Level') {
             $this->clearPermissions();
@@ -472,14 +478,17 @@ 
      */
     protected function getPermission($permission)
     {
-        if (is_string($permission))
-            $permission = config('laravel-acl.permission', Permission::class)::whereName($permission)->first();
+        if (is_string($permission)) {
+                    $permission = config('laravel-acl.permission', Permission::class)::whereName($permission)->first();
+        }
 
-        if (is_int($permission))
-            $permission = config('laravel-acl.permission', Permission::class)::find($permission);
+        if (is_int($permission)) {
+                    $permission = config('laravel-acl.permission', Permission::class)::find($permission);
+        }
 
-        if (!$permission)
-            throw new PermissionNotFoundException;
+        if (!$permission) {
+                    throw new PermissionNotFoundException;
+        }
 
         return $permission;
     }