EmilMoe / Guardian

src/Http/Traits/WithPermissions.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use EmilMoe\Guardian\Http\Models\Role;
 use EmilMoe\Guardian\Support\Guardian;
 use EmilMoe\Guardian\Http\Models\Permission;
-
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
      */
     private function hasLocalAccess($permission, $id)
     {
-        if (! $id)
+        if (!$id)
             return false;
 
         $permission = Permission::where('name', $permission);
@@ -138,11 +138,11 @@ 
      */
     private function hasInheritAccess($permission, $id)
     {
-        if (! $id)
+        if (!$id)
             return false;
 
-        if (method_exists(Auth::user(), $permission .'Privilege'))
-            return Auth::user()->{$permission .'Privilege'}($id);
+        if (method_exists(Auth::user(), $permission.'Privilege'))
+            return Auth::user()->{$permission.'Privilege'}($id);
 
         return false;
     }

Braces +33 added lines, -22 removed lines

@@ -32,8 +32,9 @@ 
     {
         $p = collect([]);
 
-        foreach ($this->roles()->get() as $role)
-            $p = $p->merge($role->permissions()->get());
+        foreach ($this->roles()->get() as $role) {
+                    $p = $p->merge($role->permissions()->get());
+        }
 
         return $p->unique();
     }
@@ -49,14 +50,17 @@ 
      */
     public function hasAccess($permission, $id = null)
     {
-        if ($this->hasGlobalAccess($permission))
-            return true;
+        if ($this->hasGlobalAccess($permission)) {
+                    return true;
+        }
 
-        if ($this->hasLocalAccess($permission, $id))
-            return true;
+        if ($this->hasLocalAccess($permission, $id)) {
+                    return true;
+        }
 
-        if ($this->hasInheritAccess($permission, $id))
-            return true;
+        if ($this->hasInheritAccess($permission, $id)) {
+                    return true;
+        }
 
         return false;
     }
@@ -72,13 +76,15 @@ 
      */
     public function hasAccessAny($permission)
     {
-        if ($this->hasAccess($permission))
-            return true;
+        if ($this->hasAccess($permission)) {
+                    return true;
+        }
 
         $permission = Permission::where('name', $permission);
 
-        if ($permission->count() == 0 || $permission->first()->table == null)
-            return false;
+        if ($permission->count() == 0 || $permission->first()->table == null) {
+                    return false;
+        }
 
         return DB::table(Permission::where('name', $permission)->first()->table)
             ->where($permission->first()->user_id_column, Auth::id())
@@ -108,20 +114,23 @@ 
      */
     private function hasLocalAccess($permission, $id)
     {
-        if (! $id)
-            return false;
+        if (! $id) {
+                    return false;
+        }
 
         $permission = Permission::where('name', $permission);
 
-        if ($permission->count() == 0 || $permission->first()->table == null)
-            return false;
+        if ($permission->count() == 0 || $permission->first()->table == null) {
+                    return false;
+        }
 
         if (DB::table($permission->first()->table)
                 ->where($permission->first()->user_id_column, Auth::id())
                 ->where($permission->first()->foreign_id_column, $id)
                 ->where('is_privileged', true)
-                ->count() > 0)
-            return true;
+                ->count() > 0) {
+                    return true;
+        }
 
         return false;
     }
@@ -138,11 +147,13 @@ 
      */
     private function hasInheritAccess($permission, $id)
     {
-        if (! $id)
-            return false;
+        if (! $id) {
+                    return false;
+        }
 
-        if (method_exists(Auth::user(), $permission .'Privilege'))
-            return Auth::user()->{$permission .'Privilege'}($id);
+        if (method_exists(Auth::user(), $permission .'Privilege')) {
+                    return Auth::user()->{$permission .'Privilege'}($id);
+        }
 
         return false;
     }

src/database/migrations/2016_05_03_141741_create_guardian_tables.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
      */
     public function up()
     {
-        Schema::create(config('guardian.table.permission'), function (Blueprint $table) {
+        Schema::create(config('guardian.table.permission'), function(Blueprint $table) {
             $table->increments('id');
             $table->string('name')->unique();
             $table->string('table');
@@ -23,7 +23,7 @@ 
             $table->timestamps();
         });
 
-        Schema::create(config('guardian.table.role'), function (Blueprint $table) {
+        Schema::create(config('guardian.table.role'), function(Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->boolean('locked')->default(false);
@@ -40,7 +40,7 @@ 
                     ->onDelete('cascade');
         });
 
-        Schema::create(config('guardian.table.role') .'_'. config('guardian.table.permission'), function (Blueprint $table) {
+        Schema::create(config('guardian.table.role').'_'.config('guardian.table.permission'), function(Blueprint $table) {
             $table->integer('permission_id')->unsigned();
             $table->integer('role_id')->unsigned();
             $table->timestamps();
@@ -48,7 +48,7 @@ 
             $table->foreign('role_id')->references('id')->on(config('guardian.table.role'))->onDelete('cascade');
         });
 
-        Schema::create(Guardian::getUserTable() .'_'. config('guardian.table.role'), function (Blueprint $table) {
+        Schema::create(Guardian::getUserTable().'_'.config('guardian.table.role'), function(Blueprint $table) {
             $table->integer('user_id')->unsigned();
             $table->integer('role_id')->unsigned();
             $table->timestamps();
@@ -64,7 +64,7 @@ 
      */
     public function down()
     {
-        Schema::drop(config('guardian.table.permission') .'_'. config('guardian.table.role'));
+        Schema::drop(config('guardian.table.permission').'_'.config('guardian.table.role'));
         Schema::drop(config('guardian.table.role'));
         Schema::drop(config('guardian.table.permission'));
     }

Braces +6 added lines, -4 removed lines

@@ -28,16 +28,18 @@
             $table->string('name');
             $table->boolean('locked')->default(false);
 
-            if (Guardian::hasClients())
-                $table->integer(Guardian::getClientColumn())->unsigned();
+            if (Guardian::hasClients()) {
+                            $table->integer(Guardian::getClientColumn())->unsigned();
+            }
 
             $table->timestamps();
 
-            if (Guardian::hasClients())
-                $table->foreign(Guardian::getClientColumn())
+            if (Guardian::hasClients()) {
+                            $table->foreign(Guardian::getClientColumn())
                     ->references(Guardian::getClientKey())
                     ->on(Guardian::getClientTable())
                     ->onDelete('cascade');
+            }
         });
 
         Schema::create(config('guardian.table.role') .'_'. config('guardian.table.permission'), function (Blueprint $table) {

src/Support/Guardian.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
      */
     public static function getClientColumn()
     {
-        return self::getClientTable() .'_'. self::getClientKey();
+        return self::getClientTable().'_'.self::getClientKey();
     }
 
     /**
@@ -76,7 +76,7 @@ 
      */
     public static function getRolesPermissionsTable()
     {
-        return config('guardian.table.role') .'_'. config('guardian.table.permission');
+        return config('guardian.table.role').'_'.config('guardian.table.permission');
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public static function getUsersRolesTable()
     {
-        return self::getUserTable() .'_'. config('guardian.table.role');
+        return self::getUserTable().'_'.config('guardian.table.role');
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -65,8 +65,9 @@
     {
         return Auth::user()->{config('guardian.client.relation')};
 
-        foreach (config('guardian.client') as $step)
-            $user = $user->{$step};
+        foreach (config('guardian.client') as $step) {
+                    $user = $user->{$step};
+        }
 
         return $user;
     }

src/Http/Middleware/GuardianMiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     {
         $this->toCollection($permission);
 
-        if (! $this->hasAccess($request, $permission))
+        if (!$this->hasAccess($request, $permission))
             return Guardian::restricted();
 
         return $next($request);
@@ -50,7 +50,7 @@ 
      */
     private function hasAccess($request, $permission)
     {
-        if (! Auth::check())
+        if (!Auth::check())
             return false;
 
         if ($this->hasGlobalAccess($permission) || $this->hasLocalAccess($request, $permission))

Braces +21 added lines, -14 removed lines

@@ -22,8 +22,9 @@ 
     {
         $this->toCollection($permission);
 
-        if (! $this->hasAccess($request, $permission))
-            return Guardian::restricted();
+        if (! $this->hasAccess($request, $permission)) {
+                    return Guardian::restricted();
+        }
 
         return $next($request);
     }
@@ -50,11 +51,13 @@ 
      */
     private function hasAccess($request, $permission)
     {
-        if (! Auth::check())
-            return false;
+        if (! Auth::check()) {
+                    return false;
+        }
 
-        if ($this->hasGlobalAccess($permission) || $this->hasLocalAccess($request, $permission))
-            return true;
+        if ($this->hasGlobalAccess($permission) || $this->hasLocalAccess($request, $permission)) {
+                    return true;
+        }
 
         return false;
     }
@@ -67,12 +70,14 @@ 
      */
     private function hasGlobalAccess($permission)
     {
-        if (is_string($permission))
-            return Auth::user()->hasAccess($permission);
+        if (is_string($permission)) {
+                    return Auth::user()->hasAccess($permission);
+        }
 
-        foreach ($permission as $perm)
-            if ($this->hasGlobalAccess($perm->getName()))
+        foreach ($permission as $perm) {
+                    if ($this->hasGlobalAccess($perm->getName()))
                 return true;
+        }
 
         return false;
     }
@@ -87,12 +92,14 @@ 
      */
     private function hasLocalAccess($request, $permission, $id = null)
     {
-        if (is_string($permission))
-            return Auth::user()->hasAccess($permission, $id);
+        if (is_string($permission)) {
+                    return Auth::user()->hasAccess($permission, $id);
+        }
 
-        foreach ($permission as $perm)
-            if ($this->hasLocalAccess($request, $perm->getName(), $request->{$perm->getColumn()}))
+        foreach ($permission as $perm) {
+                    if ($this->hasLocalAccess($request, $perm->getName(), $request->{$perm->getColumn()}))
                 return true;
+        }
 
         return false;
     }

src/Http/Models/Role.php

Spacing +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
             if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
                 return;
 
-        if (! $this->users()->get()->contains($userid))
+        if (!$this->users()->get()->contains($userid))
             $this->users()->attach($userid);
     }
 
@@ -154,7 +154,7 @@ 
 
         $id = Permission::where('name', $permission)->first()->id;
 
-        if (! $this->permissions()->get()->contains($id))
+        if (!$this->permissions()->get()->contains($id))
             $this->permissions()->attach($id);
     }
 
@@ -188,7 +188,7 @@ 
      */
     public function scopeClient($query)
     {
-        if (! Guardian::hasClients())
+        if (!Guardian::hasClients())
             return $query;
 
         return $query->where('client_id', Guardian::getClientId());

Braces +42 added lines, -28 removed lines

@@ -37,8 +37,9 @@ 
      */
     public static function create(array $attributes = [])
     {
-        if (Guardian::hasClients())
-            $attributes[Guardian::getClientColumn()] = Guardian::getClientId();
+        if (Guardian::hasClients()) {
+                    $attributes[Guardian::getClientColumn()] = Guardian::getClientId();
+        }
 
         return parent::create($attributes);
     }
@@ -85,11 +86,13 @@ 
      */
     public function update(array $attributes = [], array $options = [])
     {
-        if (Guardian::hasClients())
-            $attributes[Guardian::getClientColumn()] = Guardian::getClientId();
+        if (Guardian::hasClients()) {
+                    $attributes[Guardian::getClientColumn()] = Guardian::getClientId();
+        }
 
-        if ($this->locked)
-            return false;
+        if ($this->locked) {
+                    return false;
+        }
 
         return parent::update($attributes, $options);
     }
@@ -104,15 +107,18 @@ 
      */
     public function addUser($userid)
     {
-        if ($this->locked == true)
-            return;
+        if ($this->locked == true) {
+                    return;
+        }
 
-        if (Guardian::hasClients())
-            if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
+        if (Guardian::hasClients()) {
+                    if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
                 return;
+        }
 
-        if (! $this->users()->get()->contains($userid))
-            $this->users()->attach($userid);
+        if (! $this->users()->get()->contains($userid)) {
+                    $this->users()->attach($userid);
+        }
     }
 
     /**
@@ -125,12 +131,14 @@ 
      */
     public function removeUser($userid)
     {
-        if ($this->locked == true)
-            return;
+        if ($this->locked == true) {
+                    return;
+        }
 
-        if (Guardian::hasClients())
-            if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
+        if (Guardian::hasClients()) {
+                    if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
                 return;
+        }
 
         $this->users()->detach($userid);
     }
@@ -145,17 +153,20 @@ 
      */
     public function addPermission($permission)
     {
-        if ($this->locked == true)
-            return;
+        if ($this->locked == true) {
+                    return;
+        }
 
-        if (Guardian::hasClients())
-            if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
+        if (Guardian::hasClients()) {
+                    if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
                 return;
+        }
 
         $id = Permission::where('name', $permission)->first()->id;
 
-        if (! $this->permissions()->get()->contains($id))
-            $this->permissions()->attach($id);
+        if (! $this->permissions()->get()->contains($id)) {
+                    $this->permissions()->attach($id);
+        }
     }
 
     /**
@@ -168,12 +179,14 @@ 
      */
     public function removePermission($permission)
     {
-        if ($this->locked == true)
-            return;
+        if ($this->locked == true) {
+                    return;
+        }
 
-        if (Guardian::hasClients())
-            if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
+        if (Guardian::hasClients()) {
+                    if (Guardian::getClientId() != $this->{Guardian::getClientColumn()})
                 return;
+        }
 
         $id = Permission::where('name', $permission)->first()->id;
 
@@ -188,8 +201,9 @@ 
      */
     public function scopeClient($query)
     {
-        if (! Guardian::hasClients())
-            return $query;
+        if (! Guardian::hasClients()) {
+                    return $query;
+        }
 
         return $query->where('client_id', Guardian::getClientId());
     }

src/Http/Controllers/PermissionsController.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function __construct()
     {
-        $this->rules = ['name' => 'required|unique:'. Guardian::getPermissionTable()];
+        $this->rules = ['name' => 'required|unique:'.Guardian::getPermissionTable()];
     }
 
     /**

src/Http/routes.php

Spacing +5 added lines, -5 removed lines

@@ -1,22 +1,22 @@
 <?php
 
 Route::resource('permissions', 'PermissionsController', ['only' => ['store', 'index', 'update', 'destroy', 'show']]);
-Route::resource('roles',       'RolesController',       ['only' => ['store', 'index', 'update', 'destroy', 'show']]);
+Route::resource('roles', 'RolesController', ['only' => ['store', 'index', 'update', 'destroy', 'show']]);
 
 Route::group([
     'prefix'    => 'roles/{roles}/permissions',
     'namespace' => 'Roles',
-    'as'        => str_replace('/', '.', config('guardian.api.url')) .'.roles.permissions.'
+    'as'        => str_replace('/', '.', config('guardian.api.url')).'.roles.permissions.'
 ], function() {
-    Route::patch('add/{permissions}',    ['as' => 'add',    'uses' => 'PermissionsController@add']);
+    Route::patch('add/{permissions}', ['as' => 'add', 'uses' => 'PermissionsController@add']);
     Route::patch('remove/{permissions}', ['as' => 'remove', 'uses' => 'PermissionsController@remove']);
 });
 
 Route::group([
     'prefix'    => 'roles/{roles}/users',
     'namespace' => 'Roles',
-    'as'        => str_replace('/', '.', config('guardian.api.url')) .'.roles.users.'
+    'as'        => str_replace('/', '.', config('guardian.api.url')).'.roles.users.'
 ], function() {
-    Route::patch('add/{users}',    ['as' => 'add',    'uses' => 'UsersController@add']);
+    Route::patch('add/{users}', ['as' => 'add', 'uses' => 'UsersController@add']);
     Route::patch('remove/{users}', ['as' => 'remove', 'uses' => 'UsersController@remove']);
 });
\ No newline at end of file

src/GuardianServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -15,14 +15,14 @@ 
     public function boot()
     {
         $this->publishes([
-            __DIR__ .'/config/guardian.php' => config_path('guardian.php'),
+            __DIR__.'/config/guardian.php' => config_path('guardian.php'),
             'config']);
 
         $this->publishes([
-            __DIR__ .'/database/migrations/' => database_path('migrations'),
+            __DIR__.'/database/migrations/' => database_path('migrations'),
             'migrations']);
 
-        $this->mergeConfigFrom(__DIR__ .'/config/guardian.php', 'guardian');
+        $this->mergeConfigFrom(__DIR__.'/config/guardian.php', 'guardian');
     }
 
     /**
@@ -40,8 +40,8 @@ 
                 'namespace'  => 'EmilMoe\Guardian\Http\Controllers',
                 'prefix'     => config('guardian.api.url'),
                 'middleware' => 'auth'
-            ], function () {
-                require __DIR__ .'/Http/routes.php';
+            ], function() {
+                require __DIR__.'/Http/routes.php';
             });
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -35,13 +35,14 @@
         $router = $this->app['router'];
         $router->middleware('guard', GuardianMiddleware::class);
 
-        if (config('guardian.api.enabled'))
-            $router->group([
+        if (config('guardian.api.enabled')) {
+                    $router->group([
                 'namespace'  => 'EmilMoe\Guardian\Http\Controllers',
                 'prefix'     => config('guardian.api.url'),
                 'middleware' => 'auth'
             ], function () {
                 require __DIR__ .'/Http/routes.php';
+        }
             });
     }
 }
\ No newline at end of file