Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
erikn69 authored and github-actions[bot] committed Apr 18, 2023
1 parent 4cbfc19 commit 3ef2a6f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/Commands/Show.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function handle()

return implode('_', $name);
})
->prepend('')->toArray(),
->prepend('')->toArray(),
),
$body->toArray(),
$style
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected static function findByParam(array $params = [])
$teamsKey = app(PermissionRegistrar::class)->teamsKey;

$query->where(fn ($q) => $q->whereNull($teamsKey)
->orWhere($teamsKey, $params[$teamsKey] ?? getPermissionsTeamId())
->orWhere($teamsKey, $params[$teamsKey] ?? getPermissionsTeamId())
);
unset($params[$teamsKey]);
}
Expand Down
6 changes: 3 additions & 3 deletions tests/HasPermissionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ public function it_can_check_permission_based_on_logged_in_user_guard()
'guard_name' => 'api',
]));
$response = $this->actingAs($this->testUser, 'api')
->json('GET', '/check-api-guard-permission');
->json('GET', '/check-api-guard-permission');
$response->assertJson([
'status' => true,
]);
Expand All @@ -674,8 +674,8 @@ public function it_can_reject_permission_based_on_logged_in_user_guard()

$this->testUser->givePermissionTo($assignedPermission);
$response = $this->withExceptionHandling()
->actingAs($this->testUser, 'api')
->json('GET', '/check-api-guard-permission');
->actingAs($this->testUser, 'api')
->json('GET', '/check-api-guard-permission');
$response->assertJson([
'status' => false,
]);
Expand Down
14 changes: 7 additions & 7 deletions tests/RouteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public function test_role_function()
$router = $this->getRouter();

$router->get('role-test', $this->getRouteResponse())
->name('role.test')
->role('superadmin');
->name('role.test')
->role('superadmin');

$this->assertEquals(['role:superadmin'], $this->getLastRouteMiddlewareFromRouter($router));
}
Expand All @@ -22,8 +22,8 @@ public function test_permission_function()
$router = $this->getRouter();

$router->get('permission-test', $this->getRouteResponse())
->name('permission.test')
->permission(['edit articles', 'save articles']);
->name('permission.test')
->permission(['edit articles', 'save articles']);

$this->assertEquals(['permission:edit articles|save articles'], $this->getLastRouteMiddlewareFromRouter($router));
}
Expand All @@ -34,9 +34,9 @@ public function test_role_and_permission_function_together()
$router = $this->getRouter();

$router->get('role-permission-test', $this->getRouteResponse())
->name('role-permission.test')
->role('superadmin|admin')
->permission('create user|edit user');
->name('role-permission.test')
->role('superadmin|admin')
->permission('create user|edit user');

$this->assertEquals(
[
Expand Down
10 changes: 5 additions & 5 deletions tests/WildcardRouteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public function test_permission_function()
$router = $this->getRouter();

$router->get('permission-test', $this->getRouteResponse())
->name('permission.test')
->permission(['articles.edit', 'articles.save']);
->name('permission.test')
->permission(['articles.edit', 'articles.save']);

$this->assertEquals(['permission:articles.edit|articles.save'], $this->getLastRouteMiddlewareFromRouter($router));
}
Expand All @@ -26,9 +26,9 @@ public function test_role_and_permission_function_together()
$router = $this->getRouter();

$router->get('role-permission-test', $this->getRouteResponse())
->name('role-permission.test')
->role('superadmin|admin')
->permission('user.create|user.edit');
->name('role-permission.test')
->role('superadmin|admin')
->permission('user.create|user.edit');

$this->assertEquals(
[
Expand Down

0 comments on commit 3ef2a6f

Please sign in to comment.