Code cleanup.

This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions

View File

@@ -1,6 +1,5 @@
<?php
/*
* StoreRequest.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -40,9 +39,6 @@ class StoreRequest extends FormRequest
protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
/**
* @return array
*/
public function getAll(): array
{
return [
@@ -50,9 +46,6 @@ class StoreRequest extends FormRequest
];
}
/**
* @return array
*/
public function rules(): array
{
return [

View File

@@ -1,6 +1,5 @@
<?php
/*
* StoreRequest.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -40,9 +39,6 @@ class UpdateMembershipRequest extends FormRequest
protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
/**
* @return array
*/
public function getAll(): array
{
return [
@@ -52,19 +48,17 @@ class UpdateMembershipRequest extends FormRequest
];
}
/**
* @return array
*/
public function rules(): array
{
$validRoles = [];
foreach (UserRoleEnum::cases() as $role) {
$validRoles[] = $role->value;
}
return [
'id' => 'exists:users,id|required_without:email',
'email' => 'exists:users,email|required_without:id',
'roles.*' => 'required|in:' . implode(',', $validRoles),
'roles.*' => 'required|in:'.implode(',', $validRoles),
];
}
}

View File

@@ -1,6 +1,5 @@
<?php
/*
* StoreRequest.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -41,9 +40,6 @@ class UpdateRequest extends FormRequest
protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
/**
* @return array
*/
public function getAll(): array
{
return [
@@ -51,13 +47,11 @@ class UpdateRequest extends FormRequest
];
}
/**
* @return array
*/
public function rules(): array
{
/** @var UserGroup $userGroup */
$userGroup = $this->route()->parameter('userGroup');
return [
'title' => sprintf('required|min:2|max:255|unique:user_groups,title,%d', $userGroup->id),
];