| @@ -61,7 +61,7 @@ | ||
| 61 | 61 | * | 
| 62 | 62 | * @see \Illuminate\Database\Console\Migrations\BaseCommand | 
| 63 | 63 | */ | 
| 64 | - '--path' => realpath(__DIR__ . '/../src/Database/Migrations'), | |
| 64 | + '--path' => realpath(__DIR__.'/../src/Database/Migrations'), | |
| 65 | 65 | '--realpath' => true, | 
| 66 | 66 | ]; | 
| 67 | 67 | } | 
| @@ -77,7 +77,7 @@ discard block | ||
| 77 | 77 | */ | 
| 78 | 78 | private function loadSeedsFrom() | 
| 79 | 79 |      { | 
| 80 | -        $this->app->afterResolving('seed.handler', function ($handler) { | |
| 80 | +        $this->app->afterResolving('seed.handler', function($handler) { | |
| 81 | 81 |              if (config('roles.defaultSeeds.PermissionsTableSeeder')) { | 
| 82 | 82 | $handler->register( | 
| 83 | 83 | DefaultPermissionsTableSeeder::class | 
| @@ -150,37 +150,37 @@ discard block | ||
| 150 | 150 |      { | 
| 151 | 151 |          $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler(); | 
| 152 | 152 | |
| 153 | -        $blade->directive('role', function ($expression) { | |
| 153 | +        $blade->directive('role', function($expression) { | |
| 154 | 154 |              return "<?php if (Auth::check() && Auth::user()->hasRole({$expression})): ?>"; | 
| 155 | 155 | }); | 
| 156 | 156 | |
| 157 | -        $blade->directive('endrole', function () { | |
| 157 | +        $blade->directive('endrole', function() { | |
| 158 | 158 | return '<?php endif; ?>'; | 
| 159 | 159 | }); | 
| 160 | 160 | |
| 161 | -        $blade->directive('permission', function ($expression) { | |
| 161 | +        $blade->directive('permission', function($expression) { | |
| 162 | 162 |              return "<?php if (Auth::check() && Auth::user()->hasPermission({$expression})): ?>"; | 
| 163 | 163 | }); | 
| 164 | 164 | |
| 165 | -        $blade->directive('endpermission', function () { | |
| 165 | +        $blade->directive('endpermission', function() { | |
| 166 | 166 | return '<?php endif; ?>'; | 
| 167 | 167 | }); | 
| 168 | 168 | |
| 169 | -        $blade->directive('level', function ($expression) { | |
| 169 | +        $blade->directive('level', function($expression) { | |
| 170 | 170 | $level = trim($expression, '()'); | 
| 171 | 171 | |
| 172 | 172 |              return "<?php if (Auth::check() && Auth::user()->level() >= {$level}): ?>"; | 
| 173 | 173 | }); | 
| 174 | 174 | |
| 175 | -        $blade->directive('endlevel', function () { | |
| 175 | +        $blade->directive('endlevel', function() { | |
| 176 | 176 | return '<?php endif; ?>'; | 
| 177 | 177 | }); | 
| 178 | 178 | |
| 179 | -        $blade->directive('allowed', function ($expression) { | |
| 179 | +        $blade->directive('allowed', function($expression) { | |
| 180 | 180 |              return "<?php if (Auth::check() && Auth::user()->allowed({$expression})): ?>"; | 
| 181 | 181 | }); | 
| 182 | 182 | |
| 183 | -        $blade->directive('endallowed', function () { | |
| 183 | +        $blade->directive('endallowed', function() { | |
| 184 | 184 | return '<?php endif; ?>'; | 
| 185 | 185 | }); | 
| 186 | 186 | } | 
| @@ -13,7 +13,7 @@ | ||
| 13 | 13 | */ | 
| 14 | 14 | public function up() | 
| 15 | 15 |      { | 
| 16 | -        Schema::create('users', function (Blueprint $table) { | |
| 16 | +        Schema::create('users', function(Blueprint $table) { | |
| 17 | 17 | $table->id(); | 
| 18 | 18 |              $table->string('name'); | 
| 19 | 19 |              $table->string('email')->unique(); | 
| @@ -53,7 +53,7 @@ | ||
| 53 | 53 | 'level' => $RoleItem['level'], | 
| 54 | 54 | ]); | 
| 55 | 55 | $this->command->getOutput()->writeln( | 
| 56 | - "<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:" . $RoleItem['slug'] | |
| 56 | + "<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:".$RoleItem['slug'] | |
| 57 | 57 | ); | 
| 58 | 58 | } | 
| 59 | 59 | } | 
| @@ -27,7 +27,7 @@ discard block | ||
| 27 | 27 |          $this->assertEquals($this->rolesCount, config('roles.models.role')::count()); | 
| 28 | 28 |          $this->assertEquals($this->permissionsCount, config('roles.models.permission')::count()); | 
| 29 | 29 | |
| 30 | -        DB::listen(function (QueryExecuted $query) { | |
| 30 | +        DB::listen(function(QueryExecuted $query) { | |
| 31 | 31 | $this->queries++; | 
| 32 | 32 | }); | 
| 33 | 33 | } | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 |          $roleIds = config('roles.models.role')::pluck('id'); | 
| 39 | 39 | |
| 40 | 40 | User::factory($this->usersCount)->create() | 
| 41 | -            ->each(function (User $user) use ($roleIds) { | |
| 41 | +            ->each(function(User $user) use ($roleIds) { | |
| 42 | 42 | $user->roles()->attach($roleIds); | 
| 43 | 43 | }); | 
| 44 | 44 | $this->assertEquals($this->usersCount, User::count()); | 
| @@ -49,7 +49,7 @@ discard block | ||
| 49 | 49 | $users = User::get(); | 
| 50 | 50 | $this->assertQueries(1); | 
| 51 | 51 | |
| 52 | -        $users->each(function (User $user) { | |
| 52 | +        $users->each(function(User $user) { | |
| 53 | 53 | $user->getRoles(); | 
| 54 | 54 | }); | 
| 55 | 55 | $this->assertQueries($this->usersCount); | 
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 |          $users = User::with('roles')->get(); | 
| 59 | 59 | $this->assertQueries(2); | 
| 60 | 60 | |
| 61 | -        $users->each(function (User $user) { | |
| 61 | +        $users->each(function(User $user) { | |
| 62 | 62 | $user->getRoles(); | 
| 63 | 63 | }); | 
| 64 | 64 | $this->assertQueries(0); | 
| @@ -136,7 +136,7 @@ discard block | ||
| 136 | 136 |          $roleIds = config('roles.models.role')::pluck('id'); | 
| 137 | 137 | |
| 138 | 138 | User::factory($this->usersCount)->create() | 
| 139 | -            ->each(function (User $user) use ($roleIds) { | |
| 139 | +            ->each(function(User $user) use ($roleIds) { | |
| 140 | 140 | $user->roles()->attach($roleIds); | 
| 141 | 141 | }); | 
| 142 | 142 | $this->assertEquals($this->usersCount, User::count()); | 
| @@ -147,7 +147,7 @@ discard block | ||
| 147 | 147 | $users = User::get(); | 
| 148 | 148 | $this->assertQueries(1); | 
| 149 | 149 | |
| 150 | -        $users->each(function (User $user) { | |
| 150 | +        $users->each(function(User $user) { | |
| 151 | 151 | $user->getPermissions(); | 
| 152 | 152 | }); | 
| 153 | 153 | // rolePermissions(+getRoles) + userPermissions | 
| @@ -158,7 +158,7 @@ discard block | ||
| 158 | 158 |          $users = User::with('roles', 'userPermissions')->get(); | 
| 159 | 159 | $this->assertQueries(3); | 
| 160 | 160 | |
| 161 | -        $users->each(function (User $user) { | |
| 161 | +        $users->each(function(User $user) { | |
| 162 | 162 | $user->getPermissions(); | 
| 163 | 163 | }); | 
| 164 | 164 | // TODO: optimize via relations: userPermissions and rolePermissions | 
| @@ -44,11 +44,11 @@ | ||
| 44 | 44 | */ | 
| 45 | 45 | public function getEnvironmentSetUp($app) | 
| 46 | 46 |      { | 
| 47 | -        $app->singleton('seed.handler', function ($app) { | |
| 47 | +        $app->singleton('seed.handler', function($app) { | |
| 48 | 48 | return new SeedHandler($app, collect()); | 
| 49 | 49 | }); | 
| 50 | 50 | |
| 51 | - include_once __DIR__ . '/../src/Database/TestMigrations/create_users_table.php'; | |
| 51 | + include_once __DIR__.'/../src/Database/TestMigrations/create_users_table.php'; | |
| 52 | 52 | |
| 53 | 53 | (new \jeremykenedy\LaravelRoles\Database\TestMigrations\CreateUsersTable())->up(); | 
| 54 | 54 | } |