From 16ee3df31fd93c4bead6f240be6224115244b0d3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 5 Nov 2021 07:48:22 +0100 Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/5226 --- app/Http/Requests/BillStoreRequest.php | 2 +- app/Http/Requests/BillUpdateRequest.php | 2 +- app/Http/Requests/BudgetFormStoreRequest.php | 2 +- app/Http/Requests/BudgetFormUpdateRequest.php | 2 +- app/Http/Requests/RecurrenceFormRequest.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index 32ae63a4b2..8c9258f526 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -69,7 +69,7 @@ class BillStoreRequest extends FormRequest 'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'date' => 'required|date', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', - 'skip' => 'required|between:0,31', + 'skip' => 'required|integer|gte:0|lte:31', 'active' => 'boolean', ]; } diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index 13431c7d5a..9a0a52d9b7 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -73,7 +73,7 @@ class BillUpdateRequest extends FormRequest 'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'date' => 'required|date', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', - 'skip' => 'required|between:0,31', + 'skip' => 'required|integer|gte:0|lte:31', 'active' => 'boolean', ]; } diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index f4a18f21ed..945497b671 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -63,7 +63,7 @@ class BudgetFormStoreRequest extends FormRequest return [ 'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name', 'active' => 'numeric|between:0,1', - 'auto_budget_type' => 'numeric|between:0,2', + 'auto_budget_type' => 'numeric|integer|gte:0|lte:2', 'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2', 'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly', diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 0e4f63d7fe..e3e567db81 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -73,7 +73,7 @@ class BudgetFormUpdateRequest extends FormRequest return [ 'name' => $nameRule, 'active' => 'numeric|between:0,1', - 'auto_budget_type' => 'numeric|between:0,2', + 'auto_budget_type' => 'numeric|integer|gte:0|lte:31', 'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2', 'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly', diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index e43c1b3c44..3ef914e280 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -192,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', 'first_date' => 'required|date|after:' . $today->format('Y-m-d'), 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'], - 'skip' => 'required|numeric|between:0,31', + 'skip' => 'required|numeric|integer|gte:0|lte:31', // optional for recurrence: 'recurring_description' => 'between:0,65000',