From 3ef2a6fc743d1996b3edcec32e6dd0cf3703d74e Mon Sep 17 00:00:00 2001 From: erikn69 Date: Tue, 18 Apr 2023 20:43:03 +0000 Subject: [PATCH] Fix styling --- src/Commands/Show.php | 2 +- src/Models/Role.php | 2 +- tests/HasPermissionsTest.php | 6 +++--- tests/RouteTest.php | 14 +++++++------- tests/WildcardRouteTest.php | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Commands/Show.php b/src/Commands/Show.php index d4f39b003..cdee70e9b 100644 --- a/src/Commands/Show.php +++ b/src/Commands/Show.php @@ -63,7 +63,7 @@ public function handle() return implode('_', $name); }) - ->prepend('')->toArray(), + ->prepend('')->toArray(), ), $body->toArray(), $style diff --git a/src/Models/Role.php b/src/Models/Role.php index 472a93847..7199504d1 100644 --- a/src/Models/Role.php +++ b/src/Models/Role.php @@ -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]); } diff --git a/tests/HasPermissionsTest.php b/tests/HasPermissionsTest.php index 5871ed46c..fdc4c94e5 100644 --- a/tests/HasPermissionsTest.php +++ b/tests/HasPermissionsTest.php @@ -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, ]); @@ -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, ]); diff --git a/tests/RouteTest.php b/tests/RouteTest.php index db5a6cf6b..e4843f0cb 100644 --- a/tests/RouteTest.php +++ b/tests/RouteTest.php @@ -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)); } @@ -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)); } @@ -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( [ diff --git a/tests/WildcardRouteTest.php b/tests/WildcardRouteTest.php index 7292a6cb2..f56dfcb6c 100644 --- a/tests/WildcardRouteTest.php +++ b/tests/WildcardRouteTest.php @@ -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)); } @@ -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( [