Skip to content

Commit d5d9988

Browse files
authored
Merge pull request #211 from jeremykenedy/analysis-PGJJge
Apply fixes from StyleCI
2 parents 5be3af3 + db4334c commit d5d9988

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

src/Database/TestMigrations/2014_10_12_000000_create_users_table.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
use Illuminate\Database\Schema\Blueprint;
77
use Illuminate\Support\Facades\Schema;
88

9-
return new class extends Migration
10-
{
9+
return new class() extends Migration {
1110
/**
1211
* Run the migrations.
1312
*

src/Traits/RolesAndPermissionsHelpersTrait.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ public function getSortedPermissonsWithRolesAndUsers($sortedRolesWithUsers, $per
717717
/**
718718
* Removes an users and permissions from role.
719719
*
720-
* @param Role$role The role
720+
* @param Role $role The role
721721
*
722722
* @return void
723723
*/
@@ -761,7 +761,6 @@ public function removeUsersAndRolesFromPermissions($permission)
761761

762762
foreach ($sortedPermissionsRolesUsers as $sortedPermissionsRolesUsersKey => $sortedPermissionsRolesUsersItem) {
763763
if ($sortedPermissionsRolesUsersItem['permission']->id === $permission->id) {
764-
765764
// Remove Permission from roles
766765
foreach ($sortedPermissionsRolesUsersItem['roles'] as $permissionRoleKey => $permissionRoleItem) {
767766
$permissionRoleItem->detachPermission($permission);

src/routes/web.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
'namespace' => 'jeremykenedy\LaravelRoles\App\Http\Controllers',
1313
'prefix' => config('roles.GUIRoutesPrefix'),
1414
], function () {
15-
1615
// Dashboards and CRUD Routes
1716
Route::resource('roles', 'LaravelRolesController');
1817
Route::resource('permissions', 'LaravelPermissionsController');

tests/Feature/NPlusOneQueriesTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected function setUp(): void
3232
$this->assertEquals($this->rolesCount, config('roles.models.role')::count());
3333
$this->assertEquals($this->permissionsCount, config('roles.models.permission')::count());
3434

35-
DB::listen(function(QueryExecuted $query) {
35+
DB::listen(function (QueryExecuted $query) {
3636
$this->queries++;
3737
});
3838
}
@@ -43,7 +43,7 @@ public function canPreloadRolesOnCollection(): void
4343
$roleIds = config('roles.models.role')::pluck('id');
4444

4545
User::factory($this->usersCount)->create()
46-
->each(function(User $user) use ($roleIds) {
46+
->each(function (User $user) use ($roleIds) {
4747
$user->roles()->attach($roleIds);
4848
});
4949
$this->assertEquals($this->usersCount, User::count() - $this->usersCountCorrection);
@@ -54,7 +54,7 @@ public function canPreloadRolesOnCollection(): void
5454
$users = User::get();
5555
$this->assertQueries(1);
5656

57-
$users->each(function(User $user) {
57+
$users->each(function (User $user) {
5858
$user->getRoles();
5959
});
6060
$this->queries = $this->queries - $this->usersCountCorrection;
@@ -64,7 +64,7 @@ public function canPreloadRolesOnCollection(): void
6464
$users = User::with('roles')->get();
6565
$this->assertQueries(2);
6666

67-
$users->each(function(User $user) {
67+
$users->each(function (User $user) {
6868
$user->getRoles();
6969
});
7070
$this->assertQueries(0);
@@ -142,7 +142,7 @@ public function canPreloadPermissionsOnCollection(): void
142142
$roleIds = config('roles.models.role')::pluck('id');
143143

144144
User::factory($this->usersCount)->create()
145-
->each(function(User $user) use ($roleIds) {
145+
->each(function (User $user) use ($roleIds) {
146146
$user->roles()->attach($roleIds);
147147
});
148148
$this->assertEquals($this->usersCount, User::count() - $this->usersCountCorrection);
@@ -153,7 +153,7 @@ public function canPreloadPermissionsOnCollection(): void
153153
$users = User::get();
154154
$this->assertQueries(1);
155155

156-
$users->each(function(User $user) {
156+
$users->each(function (User $user) {
157157
$user->getPermissions();
158158
});
159159
// rolePermissions(+getRoles) + userPermissions
@@ -164,7 +164,7 @@ public function canPreloadPermissionsOnCollection(): void
164164
$users = User::with('roles', 'userPermissions')->get();
165165
$this->assertQueries(3);
166166

167-
$users->each(function(User $user) {
167+
$users->each(function (User $user) {
168168
$user->getPermissions();
169169
});
170170
// TODO: optimize via relations: userPermissions and rolePermissions

0 commit comments

Comments
 (0)