diff --git a/app/Http/Controllers/Admin/UserManagementController.php b/app/Http/Controllers/Admin/UserManagementController.php index d7388cd..cb88377 100644 --- a/app/Http/Controllers/Admin/UserManagementController.php +++ b/app/Http/Controllers/Admin/UserManagementController.php @@ -25,10 +25,10 @@ class UserManagementController extends Controller public function update(UpdateUserAdminStatusRequest $request, User $user): RedirectResponse { + $validated = $request->validated(); - $user->forceFill([ - 'is_admin' => $request->boolean('is_admin'), - ])->save(); + $user->is_admin = $validated['is_admin']; + $user->save(); $status = $user->is_admin ? "{$user->name} now has admin access." diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 8f87b09..5fa0fb4 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -120,11 +120,7 @@ class ProjectController extends Controller ); $validated = $request->validated(); - $permissions = collect(Arr::get($validated, 'permissions')) - ->map(fn (mixed $permission): string => (string) $permission) - ->unique() - ->values() - ->all(); + $permissions = Arr::get($validated, 'permissions', []); $this->projectPermissionService->syncUserPermissions($project, $user, $permissions); @@ -143,11 +139,7 @@ class ProjectController extends Controller ); $validated = $request->validated(); - $permissions = collect(Arr::get($validated, 'permissions')) - ->map(fn (mixed $permission): string => (string) $permission) - ->unique() - ->values() - ->all(); + $permissions = Arr::get($validated, 'permissions', []); $this->projectPermissionService->syncTeamPermissions($project, $team, $permissions); diff --git a/app/Http/Controllers/Settings/GitConnectionController.php b/app/Http/Controllers/Settings/GitConnectionController.php index c922025..7b575b5 100644 --- a/app/Http/Controllers/Settings/GitConnectionController.php +++ b/app/Http/Controllers/Settings/GitConnectionController.php @@ -23,11 +23,9 @@ class GitConnectionController extends Controller public function edit(Request $request): Response { - $user = $request->user(); - $session = $request->session(); return Inertia::render('settings/GitConnections', [ - 'gitConnections' => $user->gitConnections + 'gitConnections' => $request->user()->gitConnections ->map(fn (UserGitConnection $gitConnection): array => [ 'account_login' => $gitConnection->account_login, 'account_name' => $gitConnection->account_name, @@ -41,7 +39,7 @@ class GitConnectionController extends Controller 'user_id' => $gitConnection->user_id, ]) ->values(), - 'status' => $session->get('status'), + 'status' => $request->session()->get('status'), ]); } @@ -51,7 +49,7 @@ class GitConnectionController extends Controller $apiToken = Arr::get($validated, 'api_token'); $baseUrl = Arr::get($validated, 'base_url'); - $provider = GitProviderKey::from((string) Arr::get($validated, 'provider')); + $provider = GitProviderKey::from(Arr::get($validated, 'provider')); $user = $request->user(); @@ -91,7 +89,7 @@ class GitConnectionController extends Controller $validated = $request->validated(); $apiToken = Arr::get($validated, 'api_token'); $baseUrl = Arr::get($validated, 'base_url'); - $provider = GitProviderKey::from((string) Arr::get($validated, 'provider')); + $provider = GitProviderKey::from(Arr::get($validated, 'provider')); diff --git a/app/Http/Controllers/TeamController.php b/app/Http/Controllers/TeamController.php index 6a63ef8..68891d7 100644 --- a/app/Http/Controllers/TeamController.php +++ b/app/Http/Controllers/TeamController.php @@ -52,11 +52,7 @@ class TeamController extends Controller { $validated = $request->validated(); - $userIds = collect(Arr::get($validated, 'user_ids', [])) - ->map(fn (mixed $userId): int => (int) $userId) - ->unique() - ->values() - ->all(); + $userIds = Arr::get($validated, 'user_ids', []); $this->projectPermissionService->syncTeamMembers($team, $userIds); diff --git a/app/Http/Requests/SyncProjectPermissionsRequest.php b/app/Http/Requests/SyncProjectPermissionsRequest.php index 538c74f..ee397ee 100644 --- a/app/Http/Requests/SyncProjectPermissionsRequest.php +++ b/app/Http/Requests/SyncProjectPermissionsRequest.php @@ -28,6 +28,7 @@ class SyncProjectPermissionsRequest extends FormRequest 'permissions' => ['nullable', 'array'], 'permissions.*' => [ 'string', + 'distinct', Rule::in(ProjectPermissionService::permissions()), ], ]; diff --git a/app/Http/Requests/UpdateProjectTicketRequest.php b/app/Http/Requests/UpdateProjectTicketRequest.php index 427d3be..02191cd 100644 --- a/app/Http/Requests/UpdateProjectTicketRequest.php +++ b/app/Http/Requests/UpdateProjectTicketRequest.php @@ -174,14 +174,6 @@ class UpdateProjectTicketRequest extends FormRequest return $attributes; } - /** - * @return array - */ - private function createsCycle(Ticket $ticket, Ticket $candidateParent): bool { $currentParent = $candidateParent; diff --git a/app/Http/Requests/UpdateTeamMembersRequest.php b/app/Http/Requests/UpdateTeamMembersRequest.php index 222d69c..5d2cec3 100644 --- a/app/Http/Requests/UpdateTeamMembersRequest.php +++ b/app/Http/Requests/UpdateTeamMembersRequest.php @@ -29,7 +29,4 @@ class UpdateTeamMembersRequest extends FormRequest ]; } - /** - * @return array - */ }