diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index 76049d4c14..e10670f5a0 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -101,7 +101,7 @@ class StoreRequest extends FormRequest 'type' => 'required|max:1024|min:1|'.sprintf('in:%s', $types), 'iban' => ['iban', 'nullable', new UniqueIban(null, $type)], 'bic' => 'bic|nullable', - 'account_number' => ['between:1,255', 'nullable', new UniqueAccountNumber(null, $type)], + 'account_number' => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)], 'opening_balance' => 'numeric|required_with:opening_balance_date|nullable', 'opening_balance_date' => 'date|required_with:opening_balance|nullable', 'virtual_balance' => 'numeric|nullable', @@ -117,7 +117,7 @@ class StoreRequest extends FormRequest 'liability_amount' => ['required_with:liability_start_date', new IsValidPositiveAmount()], 'liability_start_date' => 'required_with:liability_amount|date', 'liability_direction' => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit', - 'interest' => 'between:0,100|numeric', + 'interest' => 'min:0|max:100|numeric', 'interest_period' => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))), 'notes' => 'min:0|max:65536', ]; diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index ff2ddc8c7f..998e57b6d9 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -91,7 +91,7 @@ class UpdateRequest extends FormRequest 'type' => sprintf('in:%s', $types), 'iban' => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))], 'bic' => 'bic|nullable', - 'account_number' => ['between:1,255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))], + 'account_number' => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))], 'opening_balance' => 'numeric|required_with:opening_balance_date|nullable', 'opening_balance_date' => 'date|required_with:opening_balance|nullable', 'virtual_balance' => 'numeric|nullable', @@ -105,7 +105,7 @@ class UpdateRequest extends FormRequest 'monthly_payment_date' => 'date|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull', 'liability_type' => 'required_if:type,liability|in:loan,debt,mortgage', 'liability_direction' => 'required_if:type,liability|in:credit,debit', - 'interest' => 'required_if:type,liability|between:0,100|numeric', + 'interest' => 'required_if:type,liability|min:0|max:100|numeric', 'interest_period' => 'required_if:type,liability|in:daily,monthly,yearly', 'notes' => 'min:0|max:65536', ]; diff --git a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php index f41a4657f1..174cd2f543 100644 --- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php @@ -66,9 +66,9 @@ class StoreRequest extends FormRequest $model = $this->convertString('attachable_type'); return [ - 'filename' => 'required|between:1,255', - 'title' => 'between:1,255', - 'notes' => 'between:1,65000', + 'filename' => 'required|min:1|max:255', + 'title' => ['min:1', 'max:255'], + 'notes' => 'min:1|max:32768', 'attachable_type' => sprintf('required|in:%s', $models), 'attachable_id' => ['required', 'numeric', new IsValidAttachmentModel($model)], ]; diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php index db3adf119e..0ec07affd5 100644 --- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php @@ -68,9 +68,9 @@ class UpdateRequest extends FormRequest $model = $this->convertString('attachable_type'); return [ - 'filename' => 'between:1,255', - 'title' => 'between:1,255', - 'notes' => 'between:1,65000', + 'filename' => ['min:1', 'max:255'], + 'title' => ['min:1', 'max:255'], + 'notes' => 'min:1|max:32768', 'attachable_type' => sprintf('in:%s', $models), 'attachable_id' => ['numeric', new IsValidAttachmentModel($model)], ]; diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php index 110bfc6635..4c518dde55 100644 --- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php @@ -72,7 +72,7 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'between:1,255|uniqueObjectForUser:bills,name', + 'name' => 'min:1|max:255|uniqueObjectForUser:bills,name', 'amount_min' => ['required', new IsValidPositiveAmount()], 'amount_max' => ['required', new IsValidPositiveAmount()], 'currency_id' => 'numeric|exists:transaction_currencies,id', @@ -81,7 +81,7 @@ class StoreRequest extends FormRequest 'end_date' => 'date|after:date', 'extension_date' => 'date|after:date', 'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly|required', - 'skip' => 'between:0,31', + 'skip' => 'min:0|max:31|numeric', 'active' => [new IsBoolean()], 'notes' => 'min:1|max:32768', ]; diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php index 87ccf2cd59..99771a6651 100644 --- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php @@ -75,7 +75,7 @@ class UpdateRequest extends FormRequest $bill = $this->route()->parameter('bill'); return [ - 'name' => sprintf('between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id), + 'name' => sprintf('min:1|max:255|uniqueObjectForUser:bills,name,%d', $bill->id), 'amount_min' => ['nullable', new IsValidPositiveAmount()], 'amount_max' => ['nullable', new IsValidPositiveAmount()], 'currency_id' => 'numeric|exists:transaction_currencies,id', @@ -84,7 +84,7 @@ class UpdateRequest extends FormRequest 'end_date' => 'date|after:date', 'extension_date' => 'date|after:date', 'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly', - 'skip' => 'between:0,31', + 'skip' => 'min:0|max:31|numeric', 'active' => [new IsBoolean()], 'notes' => 'min:1|max:32768', ]; diff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.php index 3867b0352d..aae677e4e2 100644 --- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php @@ -68,7 +68,7 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name', + 'name' => 'required|min:1|max:255|uniqueObjectForUser:budgets,name', 'active' => [new IsBoolean()], 'currency_id' => 'exists:transaction_currencies,id', 'currency_code' => 'exists:transaction_currencies,code', diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php index 5f495b5e87..77ef888622 100644 --- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php @@ -81,7 +81,7 @@ class UpdateRequest extends FormRequest $budget = $this->route()->parameter('budget'); return [ - 'name' => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id), + 'name' => sprintf('min:1|max:100|uniqueObjectForUser:budgets,name,%d', $budget->id), 'active' => [new IsBoolean()], 'notes' => 'nullable|min:1|max:32768', 'auto_budget_type' => 'in:reset,rollover,adjusted,none', diff --git a/app/Api/V1/Requests/Models/Category/StoreRequest.php b/app/Api/V1/Requests/Models/Category/StoreRequest.php index c37695f265..a1cc9268de 100644 --- a/app/Api/V1/Requests/Models/Category/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Category/StoreRequest.php @@ -52,7 +52,7 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,100|uniqueObjectForUser:categories,name', + 'name' => 'required|min:1|max:100|uniqueObjectForUser:categories,name', ]; } } diff --git a/app/Api/V1/Requests/Models/Category/UpdateRequest.php b/app/Api/V1/Requests/Models/Category/UpdateRequest.php index 7d26e95c11..48653cf597 100644 --- a/app/Api/V1/Requests/Models/Category/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Category/UpdateRequest.php @@ -58,7 +58,7 @@ class UpdateRequest extends FormRequest $category = $this->route()->parameter('category'); return [ - 'name' => sprintf('between:1,100|uniqueObjectForUser:categories,name,%d', $category->id), + 'name' => sprintf('min:1|max:100|uniqueObjectForUser:categories,name,%d', $category->id), ]; } } diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php index 58aafada70..f6069a68ed 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php @@ -64,11 +64,11 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,255|uniquePiggyBankForUser', + 'name' => 'required|min:1|max:255|uniquePiggyBankForUser', 'current_amount' => ['nullable', new IsValidPositiveAmount()], 'account_id' => 'required|numeric|belongsToUser:accounts,id', 'object_group_id' => 'numeric|belongsToUser:object_groups,id', - 'object_group_title' => 'between:1,255', + 'object_group_title' => ['min:1', 'max:255'], 'target_amount' => ['required', new IsValidPositiveAmount()], 'start_date' => 'date|nullable', 'target_date' => 'date|nullable|after:start_date', diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php index f2abb703cc..a169e0434c 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php @@ -69,7 +69,7 @@ class UpdateRequest extends FormRequest $piggyBank = $this->route()->parameter('piggyBank'); return [ - 'name' => 'between:1,255|uniquePiggyBankForUser:'.$piggyBank->id, + 'name' => 'min:1|max:255|uniquePiggyBankForUser:'.$piggyBank->id, 'current_amount' => ['nullable', new LessThanPiggyTarget(), new IsValidPositiveAmount()], 'target_amount' => ['nullable', new IsValidPositiveAmount()], 'start_date' => 'date|nullable', diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index dfdec0eb6f..ebd113c5e1 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -79,20 +79,20 @@ class StoreRequest extends FormRequest { return [ 'type' => 'required|in:withdrawal,transfer,deposit', - 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', - 'description' => 'between:1,65000', + 'title' => 'required|min:1|max:255|uniqueObjectForUser:recurrences,title', + 'description' => 'min:1|max:32768', 'first_date' => 'required|date', 'apply_rules' => [new IsBoolean()], 'active' => [new IsBoolean()], 'repeat_until' => 'nullable|date', - 'nr_of_repetitions' => 'nullable|numeric|between:1,31', + 'nr_of_repetitions' => 'nullable|numeric|min:1|max:31', 'repetitions.*.type' => 'required|in:daily,weekly,ndom,monthly,yearly', - 'repetitions.*.moment' => 'between:0,10', - 'repetitions.*.skip' => 'nullable|numeric|between:0,31', + 'repetitions.*.moment' => 'min:0|max:10', + 'repetitions.*.skip' => 'nullable|numeric|min:0|max:31', 'repetitions.*.weekend' => 'numeric|min:1|max:4', - 'transactions.*.description' => 'required|between:1,255', + 'transactions.*.description' => 'required|min:1|max:255', 'transactions.*.amount' => ['required', new IsValidPositiveAmount()], 'transactions.*.foreign_amount' => ['nullable', new IsValidPositiveAmount()], 'transactions.*.currency_id' => 'nullable|numeric|exists:transaction_currencies,id', @@ -100,18 +100,18 @@ class StoreRequest extends FormRequest 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.source_name' => 'between:1,255|nullable', + 'transactions.*.source_name' => 'min:1|max:255|nullable', 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.destination_name' => 'between:1,255|nullable', + 'transactions.*.destination_name' => 'min:1|max:255|nullable', // new and updated fields: 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.budget_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()], - 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.category_name' => 'min:1|max:255|nullable', 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], - 'transactions.*.tags' => 'nullable|between:1,255', + 'transactions.*.piggy_bank_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], + 'transactions.*.tags' => 'nullable|min:1|max:255', ]; } diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 111f915303..42bf020df7 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -86,20 +86,20 @@ class UpdateRequest extends FormRequest $recurrence = $this->route()->parameter('recurrence'); return [ - 'title' => sprintf('between:1,255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id), - 'description' => 'between:1,65000', + 'title' => sprintf('min:1|max:255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id), + 'description' => 'min:1|max:32768', 'first_date' => 'date', 'apply_rules' => [new IsBoolean()], 'active' => [new IsBoolean()], 'repeat_until' => 'nullable|date', - 'nr_of_repetitions' => 'nullable|numeric|between:1,31', + 'nr_of_repetitions' => 'nullable|numeric|min:1|max:31', 'repetitions.*.type' => 'in:daily,weekly,ndom,monthly,yearly', - 'repetitions.*.moment' => 'between:0,10', - 'repetitions.*.skip' => 'nullable|numeric|between:0,31', + 'repetitions.*.moment' => 'min:0|max:10|numeric', + 'repetitions.*.skip' => 'nullable|numeric|min:0|max:31', 'repetitions.*.weekend' => 'nullable|numeric|min:1|max:4', - 'transactions.*.description' => 'between:1,255', + 'transactions.*.description' => ['min:1', 'max:255'], 'transactions.*.amount' => [new IsValidPositiveAmount()], 'transactions.*.foreign_amount' => ['nullable', new IsValidPositiveAmount()], 'transactions.*.currency_id' => 'nullable|numeric|exists:transaction_currencies,id', @@ -107,18 +107,18 @@ class UpdateRequest extends FormRequest 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.source_name' => 'between:1,255|nullable', + 'transactions.*.source_name' => 'min:1|max:255|nullable', 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.destination_name' => 'between:1,255|nullable', + 'transactions.*.destination_name' => 'min:1|max:255|nullable', // new and updated fields: 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.budget_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()], - 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.category_name' => 'min:1|max:255|nullable', 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], - 'transactions.*.tags' => 'nullable|between:1,255', + 'transactions.*.piggy_bank_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], + 'transactions.*.tags' => 'nullable|min:1|max:255', ]; } diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index a00485d6a1..a7166c953a 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -76,10 +76,10 @@ class StoreRequest extends FormRequest $contextActions = implode(',', config('firefly.context-rule-actions')); return [ - 'title' => 'required|between:1,100|uniqueObjectForUser:rules,title', - 'description' => 'between:1,5000|nullable', + 'title' => 'required|min:1|max:100|uniqueObjectForUser:rules,title', + 'description' => 'min:1|max:32768|nullable', 'rule_group_id' => 'belongsToUser:rule_groups|required_without:rule_group_title', - 'rule_group_title' => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title', + 'rule_group_title' => 'nullable|min:1|max:255|required_without:rule_group_id|belongsToUser:rule_groups,title', 'trigger' => 'required|in:store-journal,update-journal', 'triggers.*.type' => 'required|in:'.implode(',', $validTriggers), 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024', diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index acdd8d120b..933c573c8c 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -85,10 +85,10 @@ class UpdateRequest extends FormRequest $contextActions = implode(',', config('firefly.context-rule-actions')); return [ - 'title' => sprintf('between:1,100|uniqueObjectForUser:rules,title,%d', $rule->id), - 'description' => 'between:1,5000|nullable', + 'title' => sprintf('min:1|max:100|uniqueObjectForUser:rules,title,%d', $rule->id), + 'description' => 'min:1|max:32768|nullable', 'rule_group_id' => 'belongsToUser:rule_groups', - 'rule_group_title' => 'nullable|between:1,255|belongsToUser:rule_groups,title', + 'rule_group_title' => 'nullable|min:1|max:255|belongsToUser:rule_groups,title', 'trigger' => 'in:store-journal,update-journal', 'triggers.*.type' => 'required|in:'.implode(',', $validTriggers), 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024', @@ -101,7 +101,7 @@ class UpdateRequest extends FormRequest 'strict' => [new IsBoolean()], 'stop_processing' => [new IsBoolean()], 'active' => [new IsBoolean()], - 'order' => 'numeric|between:1,1337', + 'order' => 'numeric|min:1|max:2048', ]; } diff --git a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php index 4adf20d099..fbefe0606b 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php @@ -64,8 +64,8 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'title' => 'required|between:1,100|uniqueObjectForUser:rule_groups,title', - 'description' => 'between:1,5000|nullable', + 'title' => 'required|min:1|max:100|uniqueObjectForUser:rule_groups,title', + 'description' => 'min:1|max:32768|nullable', 'active' => [new IsBoolean()], ]; } diff --git a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php index 8d5b6afa65..3889c2ee61 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php @@ -62,8 +62,8 @@ class UpdateRequest extends FormRequest $ruleGroup = $this->route()->parameter('ruleGroup'); return [ - 'title' => 'between:1,100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id, - 'description' => 'between:1,5000|nullable', + 'title' => 'min:1|max:100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id, + 'description' => 'min:1|max:32768|nullable', 'active' => [new IsBoolean()], ]; } diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php index ad1bf27f88..a345c37b37 100644 --- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php @@ -78,7 +78,7 @@ class StoreRequest extends FormRequest return [ // basic fields for group: - 'group_title' => 'between:1,1000|nullable', + 'group_title' => 'min:1|max:1000|nullable', 'error_if_duplicate_hash' => [new IsBoolean()], 'apply_rules' => [new IsBoolean()], @@ -98,37 +98,37 @@ class StoreRequest extends FormRequest 'transactions.*.foreign_amount' => ['nullable', new IsValidZeroOrMoreAmount()], // description - 'transactions.*.description' => 'nullable|between:1,1000', + 'transactions.*.description' => 'nullable|min:1|max:1000', // source of transaction 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.source_name' => 'between:1,255|nullable', - 'transactions.*.source_iban' => 'between:1,255|nullable|iban', - 'transactions.*.source_number' => 'between:1,255|nullable', - 'transactions.*.source_bic' => 'between:1,255|nullable|bic', + 'transactions.*.source_name' => 'min:1|max:255|nullable', + 'transactions.*.source_iban' => 'min:1|max:255|nullable|iban', + 'transactions.*.source_number' => 'min:1|max:255|nullable', + 'transactions.*.source_bic' => 'min:1|max:255|nullable|bic', // destination of transaction 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.destination_name' => 'between:1,255|nullable', - 'transactions.*.destination_iban' => 'between:1,255|nullable|iban', - 'transactions.*.destination_number' => 'between:1,255|nullable', - 'transactions.*.destination_bic' => 'between:1,255|nullable|bic', + 'transactions.*.destination_name' => 'min:1|max:255|nullable', + 'transactions.*.destination_iban' => 'min:1|max:255|nullable|iban', + 'transactions.*.destination_number' => 'min:1|max:255|nullable', + 'transactions.*.destination_bic' => 'min:1|max:255|nullable|bic', // budget, category, bill and piggy 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser()], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.budget_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser(), 'nullable'], - 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.category_name' => 'min:1|max:255|nullable', 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()], - 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.bill_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], 'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser()], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.piggy_bank_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], // other interesting fields 'transactions.*.reconciled' => [new IsBoolean()], - 'transactions.*.notes' => 'min:1|max:50000|nullable', - 'transactions.*.tags' => 'between:0,255', - 'transactions.*.tags.*' => 'between:0,255', + 'transactions.*.notes' => 'min:1|max:32768|nullable', + 'transactions.*.tags' => 'min:0|max:255', + 'transactions.*.tags.*' => 'min:0|max:255', // meta info fields 'transactions.*.internal_reference' => 'min:1|max:255|nullable', diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index 9b01bf6be3..79653e751d 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -99,7 +99,7 @@ class UpdateRequest extends FormRequest return [ // basic fields for group: - 'group_title' => 'between:1,1000|nullable', + 'group_title' => 'min:1|max:1000|nullable', 'apply_rules' => [new IsBoolean()], // transaction rules (in array for splits): @@ -121,29 +121,29 @@ class UpdateRequest extends FormRequest 'transactions.*.foreign_amount' => ['nullable', new IsValidZeroOrMoreAmount()], // description - 'transactions.*.description' => 'nullable|between:1,1000', + 'transactions.*.description' => 'nullable|min:1|max:1000', // source of transaction 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.source_name' => 'between:1,255|nullable', + 'transactions.*.source_name' => 'min:1|max:255|nullable', // destination of transaction 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.destination_name' => 'between:1,255|nullable', + 'transactions.*.destination_name' => 'min:1|max:255|nullable', // budget, category, bill and piggy 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser(), 'nullable'], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.budget_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser(), 'nullable'], - 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.category_name' => 'min:1|max:255|nullable', 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()], - 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.bill_name' => ['min:1', 'max:255', 'nullable', new BelongsUser()], // other interesting fields 'transactions.*.reconciled' => [new IsBoolean()], - 'transactions.*.notes' => 'min:1|max:50000|nullable', - 'transactions.*.tags' => 'between:0,255|nullable', - 'transactions.*.tags.*' => 'between:0,255', + 'transactions.*.notes' => 'min:1|max:32768|nullable', + 'transactions.*.tags' => 'min:0|max:255|nullable', + 'transactions.*.tags.*' => 'min:0|max:255', // meta info fields 'transactions.*.internal_reference' => 'min:1|max:255|nullable', diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php index 63ffd590bc..17ec1b4e3b 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php @@ -66,10 +66,10 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,255|unique:transaction_currencies,name', - 'code' => 'required|between:3,51|unique:transaction_currencies,code', - 'symbol' => 'required|between:1,51|unique:transaction_currencies,symbol', - 'decimal_places' => 'between:0,20|numeric|min:0|max:12', + 'name' => 'required|min:1|max:255|unique:transaction_currencies,name', + 'code' => 'required|min:3|max:32|unique:transaction_currencies,code', + 'symbol' => 'required|min:1|max:32|unique:transaction_currencies,symbol', + 'decimal_places' => 'numeric|min:0|max:12', 'enabled' => [new IsBoolean()], 'default' => [new IsBoolean()], ]; diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index b5fd776f0e..cf5f3bdfba 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -64,10 +64,10 @@ class UpdateRequest extends FormRequest $currency = $this->route()->parameter('currency_code'); return [ - 'name' => sprintf('between:1,255|unique:transaction_currencies,name,%d', $currency->id), - 'code' => sprintf('between:3,51|unique:transaction_currencies,code,%d', $currency->id), - 'symbol' => sprintf('between:1,51|unique:transaction_currencies,symbol,%d', $currency->id), - 'decimal_places' => 'between:0,20|numeric|min:0|max:12', + 'name' => sprintf('min:1|max:255|unique:transaction_currencies,name,%d', $currency->id), + 'code' => sprintf('min:3|max:32|unique:transaction_currencies,code,%d', $currency->id), + 'symbol' => sprintf('min:1|max:32|unique:transaction_currencies,symbol,%d', $currency->id), + 'decimal_places' => 'numeric|min:0|max:12', 'enabled' => [new IsBoolean()], 'default' => [new IsBoolean()], ]; diff --git a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php index 441149ff03..20fcad293e 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php @@ -63,7 +63,7 @@ class StoreRequest extends FormRequest 'link_type_name' => 'exists:link_types,name|required_without:link_type_id', 'inward_id' => 'required|belongsToUser:transaction_journals,id|different:outward_id', 'outward_id' => 'required|belongsToUser:transaction_journals,id|different:inward_id', - 'notes' => 'between:0,65000', + 'notes' => 'min:1|max:32768|nullable', ]; } diff --git a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php index 33b5b766f1..8d69b3944f 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php @@ -63,7 +63,7 @@ class UpdateRequest extends FormRequest 'link_type_name' => 'exists:link_types,name', 'inward_id' => 'belongsToUser:transaction_journals,id|different:outward_id', 'outward_id' => 'belongsToUser:transaction_journals,id|different:inward_id', - 'notes' => 'between:0,65000', + 'notes' => 'min:1|max:32768|nullable', ]; } diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index 5c12611879..94e58c9ffa 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -72,7 +72,7 @@ class CreateRequest extends FormRequest $validProtocols = config('firefly.valid_url_protocols'); return [ - 'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title', + 'title' => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title', 'active' => [new IsBoolean()], 'trigger' => sprintf('required|in:%s', $triggers), 'response' => sprintf('required|in:%s', $responses), diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index 8705c0d655..5fc21ee4f2 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -85,7 +85,7 @@ class UpdateRequest extends FormRequest $webhook = $this->route()->parameter('webhook'); return [ - 'title' => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id), + 'title' => sprintf('min:1|max:255|uniqueObjectForUser:webhooks,title,%d', $webhook->id), 'active' => [new IsBoolean()], 'trigger' => sprintf('in:%s', $triggers), 'response' => sprintf('in:%s', $responses), diff --git a/app/Api/V1/Requests/System/UpdateRequest.php b/app/Api/V1/Requests/System/UpdateRequest.php index 92bbf52ca3..2f9c39af0e 100644 --- a/app/Api/V1/Requests/System/UpdateRequest.php +++ b/app/Api/V1/Requests/System/UpdateRequest.php @@ -65,7 +65,7 @@ class UpdateRequest extends FormRequest return ['value' => ['required', new IsBoolean()]]; } if ('configuration.permission_update_check' === $name) { - return ['value' => 'required|numeric|between:-1,1']; + return ['value' => 'required|numeric|min:-1|max:1']; } if ('configuration.last_update_check' === $name) { return ['value' => 'required|numeric|min:464272080']; diff --git a/app/Api/V2/Request/Model/Transaction/StoreRequest.php b/app/Api/V2/Request/Model/Transaction/StoreRequest.php index d73b234ea6..d5ad470488 100644 --- a/app/Api/V2/Request/Model/Transaction/StoreRequest.php +++ b/app/Api/V2/Request/Model/Transaction/StoreRequest.php @@ -91,7 +91,7 @@ class StoreRequest extends FormRequest return [ // basic fields for group: - 'group_title' => 'between:1,1000|nullable', + 'group_title' => 'min:1|max:1000|nullable', 'error_if_duplicate_hash' => [new IsBoolean()], 'apply_rules' => [new IsBoolean()], @@ -111,37 +111,37 @@ class StoreRequest extends FormRequest 'transactions.*.foreign_amount' => ['nullable', new IsValidPositiveAmount()], // description - 'transactions.*.description' => 'nullable|between:1,1000', + 'transactions.*.description' => 'nullable|min:1|max:1000', // source of transaction 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUserGroup($userGroup)], - 'transactions.*.source_name' => 'between:1,255|nullable', - 'transactions.*.source_iban' => 'between:1,255|nullable|iban', - 'transactions.*.source_number' => 'between:1,255|nullable', - 'transactions.*.source_bic' => 'between:1,255|nullable|bic', + 'transactions.*.source_name' => 'min:1|max:255|nullable', + 'transactions.*.source_iban' => 'min:1|max:255|nullable|iban', + 'transactions.*.source_number' => 'min:1|max:255|nullable', + 'transactions.*.source_bic' => 'min:1|max:255|nullable|bic', // destination of transaction 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUserGroup($userGroup)], - 'transactions.*.destination_name' => 'between:1,255|nullable', - 'transactions.*.destination_iban' => 'between:1,255|nullable|iban', - 'transactions.*.destination_number' => 'between:1,255|nullable', - 'transactions.*.destination_bic' => 'between:1,255|nullable|bic', + 'transactions.*.destination_name' => 'min:1|max:255|nullable', + 'transactions.*.destination_iban' => 'min:1|max:255|nullable|iban', + 'transactions.*.destination_number' => 'min:1|max:255|nullable', + 'transactions.*.destination_bic' => 'min:1|max:255|nullable|bic', // budget, category, bill and piggy 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUserGroup($userGroup)], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)], + 'transactions.*.budget_name' => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)], 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUserGroup($userGroup), 'nullable'], - 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.category_name' => 'min:1|max:255|nullable', 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUserGroup($userGroup)], - 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)], + 'transactions.*.bill_name' => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)], 'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUserGroup($userGroup)], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)], + 'transactions.*.piggy_bank_name' => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)], // other interesting fields 'transactions.*.reconciled' => [new IsBoolean()], - 'transactions.*.notes' => 'min:1|max:50000|nullable', - 'transactions.*.tags' => 'between:0,1024', - 'transactions.*.tags*' => 'between:0,1024', + 'transactions.*.notes' => 'min:1|max:32768|nullable', + 'transactions.*.tags' => 'min:0|max:255', + 'transactions.*.tags.*' => 'min:0|max:255', // meta info fields 'transactions.*.internal_reference' => 'min:1|max:255|nullable', diff --git a/app/Api/V2/Request/UserGroup/StoreRequest.php b/app/Api/V2/Request/UserGroup/StoreRequest.php index 376f8e9919..38685c84d9 100644 --- a/app/Api/V2/Request/UserGroup/StoreRequest.php +++ b/app/Api/V2/Request/UserGroup/StoreRequest.php @@ -49,7 +49,7 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'title' => 'unique:user_groups,title|required|min:2|max:255', + 'title' => 'unique:user_groups,title|required|min:1|max:255', ]; } } diff --git a/app/Api/V2/Request/UserGroup/UpdateRequest.php b/app/Api/V2/Request/UserGroup/UpdateRequest.php index fa21e6b5d4..c0e0e50bb4 100644 --- a/app/Api/V2/Request/UserGroup/UpdateRequest.php +++ b/app/Api/V2/Request/UserGroup/UpdateRequest.php @@ -53,7 +53,7 @@ class UpdateRequest extends FormRequest $userGroup = $this->route()->parameter('userGroup'); return [ - 'title' => sprintf('required|min:2|max:255|unique:user_groups,title,%d', $userGroup->id), + 'title' => sprintf('required|min:1|max:255|unique:user_groups,title,%d', $userGroup->id), ]; } } diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 7ebe7acf7b..9369d9890e 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -108,7 +108,7 @@ class AccountFormRequest extends FormRequest 'BIC' => 'bic|nullable', 'virtual_balance' => ['nullable', new IsValidAmount()], 'currency_id' => 'exists:transaction_currencies,id', - 'account_number' => 'between:1,255|uniqueAccountNumberForUser|nullable', + 'account_number' => 'min:1|max:255|uniqueAccountNumberForUser|nullable', 'account_role' => 'in:'.$accountRoles, 'active' => 'boolean', 'cc_type' => 'in:'.$ccPaymentTypes, diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 09b8919508..737dca20fc 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -53,7 +53,7 @@ class AttachmentFormRequest extends FormRequest { // fixed return [ - 'title' => 'between:1,255|nullable', + 'title' => 'min:1|max:255|nullable', 'notes' => 'min:1|max:32768|nullable', ]; } diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index a45e2e5446..0de8e046bd 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -64,7 +64,7 @@ class BillStoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,255|uniqueObjectForUser:bills,name', + 'name' => 'required|min:1|max:255|uniqueObjectForUser:bills,name', 'amount_min' => ['required', new IsValidPositiveAmount()], 'amount_max' => ['required', new IsValidPositiveAmount()], 'transaction_currency_id' => 'required|exists:transaction_currencies,id', diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index 6c2907bae7..be34f9abc6 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -68,7 +68,7 @@ class BillUpdateRequest extends FormRequest $bill = $this->route()->parameter('bill'); return [ - 'name' => sprintf('required|between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id), + 'name' => sprintf('required|min:1|max:255|uniqueObjectForUser:bills,name,%d', $bill->id), 'amount_min' => ['required', new IsValidPositiveAmount()], 'amount_max' => ['required', new IsValidPositiveAmount()], 'transaction_currency_id' => 'required|exists:transaction_currencies,id', diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index 2b44ba1dd8..580d4d88f6 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -61,8 +61,8 @@ class BudgetFormStoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name', - 'active' => 'numeric|between:0,1', + 'name' => 'required|min:1|max:255|uniqueObjectForUser:budgets,name', + 'active' => 'numeric|min:0|max:1', 'auto_budget_type' => 'numeric|integer|gte:0|lte:3', 'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_amount' => ['required_if:auto_budget_type,1', 'required_if:auto_budget_type,2', new IsValidPositiveAmount()], diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 0c109bf577..36e67db774 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -60,18 +60,18 @@ class BudgetFormUpdateRequest extends FormRequest */ public function rules(): array { - $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name'; + $nameRule = 'required|min:1|max:255|uniqueObjectForUser:budgets,name'; /** @var null|Budget $budget */ $budget = $this->route()->parameter('budget'); if (null !== $budget) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,'.$budget->id; + $nameRule = 'required|min:1|max:255|uniqueObjectForUser:budgets,name,'.$budget->id; } return [ 'name' => $nameRule, - 'active' => 'numeric|between:0,1', + 'active' => 'numeric|min:0|max:1', 'auto_budget_type' => 'numeric|integer|gte:0|lte:31', 'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_amount' => ['required_if:auto_budget_type,1', 'required_if:auto_budget_type,2|numeric', new IsValidPositiveAmount()], diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 59b2f0505d..f9e50c26ba 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -52,13 +52,13 @@ class CategoryFormRequest extends FormRequest */ public function rules(): array { - $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name'; + $nameRule = 'required|min:1|max:255|uniqueObjectForUser:categories,name'; /** @var null|Category $category */ $category = $this->route()->parameter('category'); if (null !== $category) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,'.$category->id; + $nameRule = 'required|min:1|max:255|uniqueObjectForUser:categories,name,'.$category->id; } // fixed diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 7d47107919..e72782d588 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -51,8 +51,8 @@ class ConfigurationRequest extends FormRequest { // fixed return [ - 'single_user_mode' => 'between:0,1|numeric', - 'is_demo_site' => 'between:0,1|numeric', + 'single_user_mode' => 'min:0|max:1|numeric', + 'is_demo_site' => 'min:0|max:1|numeric', ]; } } diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index 9955455972..4a41a5d333 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -43,7 +43,7 @@ class NewUserFormRequest extends FormRequest { // fixed return [ - 'bank_name' => 'required|between:1,200', + 'bank_name' => 'required|min:1|max:255', 'bank_balance' => ['required', new IsValidAmount()], 'savings_balance' => ['nullable', new IsValidAmount()], 'credit_card_limit' => ['nullable', new IsValidAmount()], diff --git a/app/Http/Requests/ObjectGroupFormRequest.php b/app/Http/Requests/ObjectGroupFormRequest.php index 7cb795afee..b6ed300ea9 100644 --- a/app/Http/Requests/ObjectGroupFormRequest.php +++ b/app/Http/Requests/ObjectGroupFormRequest.php @@ -53,10 +53,10 @@ class ObjectGroupFormRequest extends FormRequest { /** @var null|ObjectGroup $objectGroup */ $objectGroup = $this->route()->parameter('objectGroup'); - $titleRule = 'required|between:1,255|uniqueObjectGroup'; + $titleRule = 'required|min:1|max:255|uniqueObjectGroup'; if (null !== $objectGroup) { - $titleRule = sprintf('required|between:1,255|uniqueObjectGroup:%d', $objectGroup->id); + $titleRule = sprintf('required|min:1|max:255|uniqueObjectGroup:%d', $objectGroup->id); } return [ diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php index 5140fb03a9..0893d607ce 100644 --- a/app/Http/Requests/PiggyBankStoreRequest.php +++ b/app/Http/Requests/PiggyBankStoreRequest.php @@ -58,7 +58,7 @@ class PiggyBankStoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|between:1,255|uniquePiggyBankForUser', + 'name' => 'required|min:1|max:255|uniquePiggyBankForUser', 'account_id' => 'required|belongsToUser:accounts', 'targetamount' => ['nullable', new IsValidPositiveAmount()], 'startdate' => 'date', diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php index 971efe3754..bf0afb361e 100644 --- a/app/Http/Requests/PiggyBankUpdateRequest.php +++ b/app/Http/Requests/PiggyBankUpdateRequest.php @@ -62,7 +62,7 @@ class PiggyBankUpdateRequest extends FormRequest $piggy = $this->route()->parameter('piggyBank'); return [ - 'name' => sprintf('required|between:1,255|uniquePiggyBankForUser:%d', $piggy->id), + 'name' => sprintf('required|min:1|max:255|uniquePiggyBankForUser:%d', $piggy->id), 'account_id' => 'required|belongsToUser:accounts', 'targetamount' => ['nullable', new IsValidPositiveAmount()], 'startdate' => 'date', diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 217e9e63e1..544788e740 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -159,26 +159,26 @@ class RecurrenceFormRequest extends FormRequest $before = today(config('app.timezone'))->addYears(25); $rules = [ // mandatory info for recurrence. - 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', + 'title' => 'required|min:1|max:255|uniqueObjectForUser:recurrences,title', 'first_date' => sprintf('required|date|before:%s|after:%s', $before->format('Y-m-d'), $today->format('Y-m-d')), - 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'between:1,20'], + 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'min:1', 'max:32'], 'skip' => 'required|numeric|integer|gte:0|lte:31', 'notes' => 'min:1|max:32768|nullable', // optional for recurrence: - 'recurring_description' => 'between:0,65000', - 'active' => 'numeric|between:0,1', - 'apply_rules' => 'numeric|between:0,1', + 'recurring_description' => 'min:0|max:32768', + 'active' => 'numeric|min:0|max:1', + 'apply_rules' => 'numeric|min:0|max:1', // mandatory for transaction: - 'transaction_description' => 'required|between:1,255', + 'transaction_description' => 'required|min:1|max:255', 'transaction_type' => 'required|in:withdrawal,deposit,transfer', 'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'amount' => ['required', new IsValidPositiveAmount()], // mandatory account info: 'source_id' => 'numeric|belongsToUser:accounts,id|nullable', - 'source_name' => 'between:1,255|nullable', + 'source_name' => 'min:1|max:255|nullable', 'destination_id' => 'numeric|belongsToUser:accounts,id|nullable', - 'destination_name' => 'between:1,255|nullable', + 'destination_name' => 'min:1|max:255|nullable', // foreign amount data: 'foreign_amount' => ['nullable', new IsValidPositiveAmount()], @@ -186,8 +186,8 @@ class RecurrenceFormRequest extends FormRequest // optional fields: 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', 'bill_id' => 'mustExist:bills,id|belongsToUser:bills,id|nullable', - 'category' => 'between:1,255|nullable', - 'tags' => 'between:1,255|nullable', + 'category' => 'min:1|max:255|nullable', + 'tags' => 'min:1|max:255|nullable', ]; if ($this->convertInteger('foreign_currency_id') > 0) { $rules['foreign_currency_id'] = 'exists:transaction_currencies,id'; @@ -195,7 +195,7 @@ class RecurrenceFormRequest extends FormRequest // if ends after X repetitions, set another rule if ('times' === $this->convertString('repetition_end')) { - $rules['repetitions'] = 'required|numeric|between:0,254'; + $rules['repetitions'] = 'required|numeric|min:0|max:255'; } // if foreign amount, currency must be different. if (null !== $this->convertFloat('foreign_amount')) { // intentional float, used because it defaults to null. @@ -211,10 +211,10 @@ class RecurrenceFormRequest extends FormRequest $type = strtolower($this->convertString('transaction_type')); if (strtolower(TransactionType::WITHDRAWAL) === $type) { $rules['source_id'] = 'required|exists:accounts,id|belongsToUser:accounts'; - $rules['destination_name'] = 'between:1,255|nullable'; + $rules['destination_name'] = 'min:1|max:255|nullable'; } if (strtolower(TransactionType::DEPOSIT) === $type) { - $rules['source_name'] = 'between:1,255|nullable'; + $rules['source_name'] = 'min:1|max:255|nullable'; $rules['destination_id'] = 'required|exists:accounts,id|belongsToUser:accounts'; } if (strtolower(TransactionType::TRANSFER) === $type) { @@ -228,7 +228,7 @@ class RecurrenceFormRequest extends FormRequest $recurrence = $this->route()->parameter('recurrence'); if ($recurrence instanceof Recurrence) { $rules['id'] = 'required|numeric|exists:recurrences,id'; - $rules['title'] = 'required|between:1,255|uniqueObjectForUser:recurrences,title,'.$recurrence->id; + $rules['title'] = 'required|min:1|max:255|uniqueObjectForUser:recurrences,title,'.$recurrence->id; $rules['first_date'] = 'required|date'; } diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 8460775da4..02a7c1c819 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -97,8 +97,8 @@ class RuleFormRequest extends FormRequest // initial set of rules: $rules = [ - 'title' => 'required|between:1,100|uniqueObjectForUser:rules,title', - 'description' => 'between:1,5000|nullable', + 'title' => 'required|min:1|max:255|uniqueObjectForUser:rules,title', + 'description' => 'min:1|max:32768|nullable', 'stop_processing' => 'boolean', 'rule_group_id' => 'required|belongsToUser:rule_groups', 'trigger' => 'required|in:store-journal,update-journal', @@ -113,7 +113,7 @@ class RuleFormRequest extends FormRequest $rule = $this->route()->parameter('rule'); if (null !== $rule) { - $rules['title'] = 'required|between:1,100|uniqueObjectForUser:rules,title,'.$rule->id; + $rules['title'] = 'required|min:1|max:255|uniqueObjectForUser:rules,title,'.$rule->id; } return $rules; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index ccea91076b..c2d96a6994 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -59,18 +59,18 @@ class RuleGroupFormRequest extends FormRequest */ public function rules(): array { - $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; + $titleRule = 'required|min:1|max:255|uniqueObjectForUser:rule_groups,title'; /** @var null|RuleGroup $ruleGroup */ $ruleGroup = $this->route()->parameter('ruleGroup'); if (null !== $ruleGroup) { - $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id; + $titleRule = 'required|min:1|max:255|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id; } return [ 'title' => $titleRule, - 'description' => 'between:1,5000|nullable', + 'description' => 'min:1|max:32768|nullable', 'active' => [new IsBoolean()], ]; } diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index c095f64a29..e0dc080ef9 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -58,9 +58,9 @@ class UserFormRequest extends FormRequest 'id' => 'required|exists:users,id', 'email' => 'email|required', 'password' => 'confirmed|secure_password', - 'blocked_code' => 'between:0,30|nullable', - 'blocked' => 'between:0,1|numeric', - 'is_owner' => 'between:0,1|numeric', + 'blocked_code' => 'min:0|max:32|nullable', + 'blocked' => 'min:0|max:1|numeric', + 'is_owner' => 'min:0|max:1|numeric', ]; } }