jeremykenedy / laravel-roles

src/RolesServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -67,37 +67,37 @@
     {
         $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
 
-        $blade->directive('role', function ($expression) {
+        $blade->directive('role', function($expression) {
             return "<?php if (Auth::check() && Auth::user()->hasRole({$expression})): ?>";
         });
 
-        $blade->directive('endrole', function () {
+        $blade->directive('endrole', function() {
             return '<?php endif; ?>';
         });
 
-        $blade->directive('permission', function ($expression) {
+        $blade->directive('permission', function($expression) {
             return "<?php if (Auth::check() && Auth::user()->hasPermission({$expression})): ?>";
         });
 
-        $blade->directive('endpermission', function () {
+        $blade->directive('endpermission', function() {
             return '<?php endif; ?>';
         });
 
-        $blade->directive('level', function ($expression) {
+        $blade->directive('level', function($expression) {
             $level = trim($expression, '()');
 
             return "<?php if (Auth::check() && Auth::user()->level() >= {$level}): ?>";
         });
 
-        $blade->directive('endlevel', function () {
+        $blade->directive('endlevel', function() {
             return '<?php endif; ?>';
         });
 
-        $blade->directive('allowed', function ($expression) {
+        $blade->directive('allowed', function($expression) {
             return "<?php if (Auth::check() && Auth::user()->allowed({$expression})): ?>";
         });
 
-        $blade->directive('endallowed', function () {
+        $blade->directive('endallowed', function() {
             return '<?php endif; ?>';
         });
     }

src/Database/Migrations/2016_01_26_115212_create_permissions_table.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $tableCheck = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) {
                 $table->increments('id')->unsigned();
                 $table->string('name');
                 $table->string('slug')->unique();

src/Database/Migrations/2016_01_15_105324_create_roles_table.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $tableCheck = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) {
                 $table->increments('id')->unsigned();
                 $table->string('name');
                 $table->string('slug')->unique();

src/routes/api.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
     'as'            => 'laravelroles::',
     'namespace'     => 'jeremykenedy\LaravelRoles\App\Http\Controllers\Api',
     'prefix'        => 'api',
-], function () {
+], function() {
     Route::apiResource('roles-api', 'LaravelRolesApiController');
 });

src/routes/web.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     'middleware'    => ['web'],
     'as'            => 'laravelroles::',
     'namespace'     => 'jeremykenedy\LaravelRoles\App\Http\Controllers',
-], function () {
+], function() {
 
     // Dashboards and CRUD Routes
     Route::resource('roles', 'LaravelRolesController');

src/Database/Migrations/2016_01_26_115523_create_permission_role_table.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $tableCheck = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable, $rolesTable) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) use ($permissionsTable, $rolesTable) {
                 $table->increments('id')->unsigned();
                 $table->integer('permission_id')->unsigned()->index();
                 $table->foreign('permission_id')->references('id')->on($permissionsTable)->onDelete('cascade');

src/Database/Migrations/2016_01_15_114412_create_role_user_table.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $tableCheck = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) use ($rolesTable) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) use ($rolesTable) {
                 $table->increments('id')->unsigned();
                 $table->integer('role_id')->unsigned()->index();
                 $table->foreign('role_id')->references('id')->on($rolesTable)->onDelete('cascade');

src/Database/Migrations/2016_02_09_132439_create_permission_user_table.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $userTable = app(config('auth.providers.users.model'))->getTable();
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable, $userTable) {
+            Schema::connection($connection)->create($table, function(Blueprint $table) use ($permissionsTable, $userTable) {
                 $table->increments('id')->unsigned();
                 $table->integer('permission_id')->unsigned()->index();
                 $table->foreign('permission_id')->references('id')->on($permissionsTable)->onDelete('cascade');

src/Traits/HasRoleAndPermission.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
      */
     public function checkRole($role)
     {
-        return $this->getRoles()->contains(function ($value) use ($role) {
+        return $this->getRoles()->contains(function($value) use ($role) {
             return $role == $value->id || Str::is($role, $value->slug);
         });
     }
@@ -203,9 +203,9 @@ 
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
                 ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')
-                ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
-                ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
-                ->orWhere($roleTable . '.level', '<', $this->level())
+                ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
+                ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
+                ->orWhere($roleTable.'.level', '<', $this->level())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         } 
         else 
@@ -213,8 +213,8 @@ 
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
                 ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')
-                ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
-                ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
+                ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
+                ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
         }
     }
@@ -305,7 +305,7 @@ 
      */
     public function checkPermission($permission)
     {
-        return $this->getPermissions()->contains(function ($value) use ($permission) {
+        return $this->getPermissions()->contains(function($value) use ($permission) {
             return $permission == $value->id || Str::is($permission, $value->slug);
         });
     }

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
                 ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
                 ->orWhere($roleTable . '.level', '<', $this->level())
                 ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
-        } 
-        else 
+        } else 
         {
             return $permissionModel
                 ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])