From 4474a71e65755c5607653cb1c8e4d98433a27372 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 30 Sep 2022 20:07:01 +0200 Subject: [PATCH] Attempted fix for #6475 --- app/Http/Requests/AccountFormRequest.php | 4 +-- app/Http/Requests/BillStoreRequest.php | 4 +-- app/Http/Requests/BillUpdateRequest.php | 4 +-- app/Http/Requests/BudgetFormStoreRequest.php | 4 +-- app/Http/Requests/BudgetFormUpdateRequest.php | 4 +-- app/Http/Requests/CurrencyFormRequest.php | 2 +- app/Http/Requests/JournalLinkRequest.php | 2 +- app/Http/Requests/PiggyBankStoreRequest.php | 2 +- app/Http/Requests/PiggyBankUpdateRequest.php | 2 +- app/Http/Requests/RecurrenceFormRequest.php | 30 +++++++++---------- app/Http/Requests/RuleFormRequest.php | 2 +- app/Http/Requests/UserFormRequest.php | 4 +-- app/Support/Request/ConvertsDataTypes.php | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index c003facbd9..2fe34b6dd8 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -48,7 +48,7 @@ class AccountFormRequest extends FormRequest 'name' => $this->convertString('name'), 'active' => $this->boolean('active'), 'account_type_name' => $this->convertString('objectType'), - 'currency_id' => $this->integer('currency_id'), + 'currency_id' => $this->convertInteger('currency_id'), 'virtual_balance' => $this->convertString('virtual_balance'), 'iban' => $this->convertString('iban'), 'BIC' => $this->convertString('BIC'), @@ -77,7 +77,7 @@ class AccountFormRequest extends FormRequest // that could have been selected. if ('liabilities' === $data['account_type_name']) { $data['account_type_name'] = null; - $data['account_type_id'] = $this->integer('liability_type_id'); + $data['account_type_id'] = $this->convertInteger('liability_type_id'); if ('' !== $data['opening_balance']) { $data['opening_balance'] = app('steam')->negative($data['opening_balance']); } diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index ebe3dd03fb..da1b3d9a6a 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -43,14 +43,14 @@ class BillStoreRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'amount_min' => $this->convertString('amount_min'), - 'currency_id' => $this->integer('transaction_currency_id'), + 'currency_id' => $this->convertInteger('transaction_currency_id'), 'currency_code' => '', 'amount_max' => $this->convertString('amount_max'), 'date' => $this->getCarbonDate('date'), 'end_date' => $this->getCarbonDate('bill_end_date'), 'extension_date' => $this->getCarbonDate('extension_date'), 'repeat_freq' => $this->convertString('repeat_freq'), - 'skip' => $this->integer('skip'), + 'skip' => $this->convertInteger('skip'), 'notes' => $this->stringWithNewlines('notes'), 'active' => $this->boolean('active'), 'object_group_title' => $this->convertString('object_group'), diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index 258647741d..f48cde128c 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -44,14 +44,14 @@ class BillUpdateRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'amount_min' => $this->convertString('amount_min'), - 'currency_id' => $this->integer('transaction_currency_id'), + 'currency_id' => $this->convertInteger('transaction_currency_id'), 'currency_code' => '', 'amount_max' => $this->convertString('amount_max'), 'date' => $this->getCarbonDate('date'), 'end_date' => $this->getCarbonDate('bill_end_date'), 'extension_date' => $this->getCarbonDate('extension_date'), 'repeat_freq' => $this->convertString('repeat_freq'), - 'skip' => $this->integer('skip'), + 'skip' => $this->convertInteger('skip'), 'notes' => $this->stringWithNewlines('notes'), 'active' => $this->boolean('active'), 'object_group_title' => $this->convertString('object_group'), diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index abf43f34be..065a607a4b 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -46,8 +46,8 @@ class BudgetFormStoreRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'active' => $this->boolean('active'), - 'auto_budget_type' => $this->integer('auto_budget_type'), - 'currency_id' => $this->integer('auto_budget_currency_id'), + 'auto_budget_type' => $this->convertInteger('auto_budget_type'), + 'currency_id' => $this->convertInteger('auto_budget_currency_id'), 'auto_budget_amount' => $this->convertString('auto_budget_amount'), 'auto_budget_period' => $this->convertString('auto_budget_period'), ]; diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 93902889af..700cbfff4a 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -47,8 +47,8 @@ class BudgetFormUpdateRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'active' => $this->boolean('active'), - 'auto_budget_type' => $this->integer('auto_budget_type'), - 'currency_id' => $this->integer('auto_budget_currency_id'), + 'auto_budget_type' => $this->convertInteger('auto_budget_type'), + 'currency_id' => $this->convertInteger('auto_budget_currency_id'), 'auto_budget_amount' => $this->convertString('auto_budget_amount'), 'auto_budget_period' => $this->convertString('auto_budget_period'), ]; diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index f391130bff..d2b1a8dc62 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -45,7 +45,7 @@ class CurrencyFormRequest extends FormRequest 'name' => $this->convertString('name'), 'code' => $this->convertString('code'), 'symbol' => $this->convertString('symbol'), - 'decimal_places' => $this->integer('decimal_places'), + 'decimal_places' => $this->convertInteger('decimal_places'), 'enabled' => $this->boolean('enabled'), ]; } diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php index 0b3c214983..2886cbb4d8 100644 --- a/app/Http/Requests/JournalLinkRequest.php +++ b/app/Http/Requests/JournalLinkRequest.php @@ -45,7 +45,7 @@ class JournalLinkRequest extends FormRequest $linkType = $this->get('link_type'); $parts = explode('_', $linkType); $return['link_type_id'] = (int) $parts[0]; - $return['transaction_journal_id'] = $this->integer('opposing'); + $return['transaction_journal_id'] = $this->convertInteger('opposing'); $return['notes'] = $this->convertString('notes'); $return['direction'] = $parts[1]; diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php index b4ae621013..e71f83bd83 100644 --- a/app/Http/Requests/PiggyBankStoreRequest.php +++ b/app/Http/Requests/PiggyBankStoreRequest.php @@ -43,7 +43,7 @@ class PiggyBankStoreRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'startdate' => $this->getCarbonDate('startdate'), - 'account_id' => $this->integer('account_id'), + 'account_id' => $this->convertInteger('account_id'), 'targetamount' => $this->convertString('targetamount'), 'targetdate' => $this->getCarbonDate('targetdate'), 'notes' => $this->stringWithNewlines('notes'), diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php index 8249894e6b..d48268a5de 100644 --- a/app/Http/Requests/PiggyBankUpdateRequest.php +++ b/app/Http/Requests/PiggyBankUpdateRequest.php @@ -44,7 +44,7 @@ class PiggyBankUpdateRequest extends FormRequest return [ 'name' => $this->convertString('name'), 'startdate' => $this->getCarbonDate('startdate'), - 'account_id' => $this->integer('account_id'), + 'account_id' => $this->convertInteger('account_id'), 'targetamount' => $this->convertString('targetamount'), 'targetdate' => $this->getCarbonDate('targetdate'), 'notes' => $this->stringWithNewlines('notes'), diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index a5c400c88b..e2bf43d001 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -61,14 +61,14 @@ class RecurrenceFormRequest extends FormRequest 'description' => $this->convertString('recurring_description'), 'first_date' => $this->getCarbonDate('first_date'), 'repeat_until' => $this->getCarbonDate('repeat_until'), - 'nr_of_repetitions' => $this->integer('repetitions'), + 'nr_of_repetitions' => $this->convertInteger('repetitions'), 'apply_rules' => $this->boolean('apply_rules'), 'active' => $this->boolean('active'), 'repetition_end' => $this->convertString('repetition_end'), ], 'transactions' => [ [ - 'currency_id' => $this->integer('transaction_currency_id'), + 'currency_id' => $this->convertInteger('transaction_currency_id'), 'currency_code' => null, 'type' => $this->convertString('transaction_type'), 'description' => $this->convertString('transaction_description'), @@ -76,14 +76,14 @@ class RecurrenceFormRequest extends FormRequest 'foreign_amount' => null, 'foreign_currency_id' => null, 'foreign_currency_code' => null, - 'budget_id' => $this->integer('budget_id'), + 'budget_id' => $this->convertInteger('budget_id'), 'budget_name' => null, - 'bill_id' => $this->integer('bill_id'), + 'bill_id' => $this->convertInteger('bill_id'), 'bill_name' => null, 'category_id' => null, 'category_name' => $this->convertString('category'), 'tags' => '' !== $this->convertString('tags') ? explode(',', $this->convertString('tags')) : [], - 'piggy_bank_id' => $this->integer('piggy_bank_id'), + 'piggy_bank_id' => $this->convertInteger('piggy_bank_id'), 'piggy_bank_name' => null, ], ], @@ -91,8 +91,8 @@ class RecurrenceFormRequest extends FormRequest [ 'type' => $repetitionData['type'], 'moment' => $repetitionData['moment'], - 'skip' => $this->integer('skip'), - 'weekend' => $this->integer('weekend'), + 'skip' => $this->convertInteger('skip'), + 'weekend' => $this->convertInteger('weekend'), ], ], @@ -101,7 +101,7 @@ class RecurrenceFormRequest extends FormRequest // fill in foreign currency data if (null !== $this->float('foreign_amount')) { $return['transactions'][0]['foreign_amount'] = $this->convertString('foreign_amount'); - $return['transactions'][0]['foreign_currency_id'] = $this->integer('foreign_currency_id'); + $return['transactions'][0]['foreign_currency_id'] = $this->convertInteger('foreign_currency_id'); } // default values: $return['transactions'][0]['source_id'] = null; @@ -113,16 +113,16 @@ class RecurrenceFormRequest extends FormRequest default: throw new FireflyException(sprintf('Cannot handle transaction type "%s"', $this->convertString('transaction_type'))); case 'withdrawal': - $return['transactions'][0]['source_id'] = $this->integer('source_id'); - $return['transactions'][0]['destination_id'] = $this->integer('withdrawal_destination_id'); + $return['transactions'][0]['source_id'] = $this->convertInteger('source_id'); + $return['transactions'][0]['destination_id'] = $this->convertInteger('withdrawal_destination_id'); break; case 'deposit': - $return['transactions'][0]['source_id'] = $this->integer('deposit_source_id'); - $return['transactions'][0]['destination_id'] = $this->integer('destination_id'); + $return['transactions'][0]['source_id'] = $this->convertInteger('deposit_source_id'); + $return['transactions'][0]['destination_id'] = $this->convertInteger('destination_id'); break; case 'transfer': - $return['transactions'][0]['source_id'] = $this->integer('source_id'); - $return['transactions'][0]['destination_id'] = $this->integer('destination_id'); + $return['transactions'][0]['source_id'] = $this->convertInteger('source_id'); + $return['transactions'][0]['destination_id'] = $this->convertInteger('destination_id'); break; } @@ -219,7 +219,7 @@ class RecurrenceFormRequest extends FormRequest 'category' => 'between:1,255|nullable', 'tags' => 'between:1,255|nullable', ]; - if ($this->integer('foreign_currency_id') > 0) { + if ($this->convertInteger('foreign_currency_id') > 0) { $rules['foreign_currency_id'] = 'exists:transaction_currencies,id'; } diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 0fdd1687dd..9ccdebb399 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -45,7 +45,7 @@ class RuleFormRequest extends FormRequest { return [ 'title' => $this->convertString('title'), - 'rule_group_id' => $this->integer('rule_group_id'), + 'rule_group_id' => $this->convertInteger('rule_group_id'), 'active' => $this->boolean('active'), 'trigger' => $this->convertString('trigger'), 'description' => $this->stringWithNewlines('description'), diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index 816dd754fa..a10ef457b7 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -44,10 +44,10 @@ class UserFormRequest extends FormRequest { return [ 'email' => $this->convertString('email'), - 'blocked' => 1 === $this->integer('blocked'), + 'blocked' => 1 === $this->convertInteger('blocked'), 'blocked_code' => $this->convertString('blocked_code'), 'password' => $this->convertString('password'), - 'is_owner' => 1 === $this->integer('is_owner'), + 'is_owner' => 1 === $this->convertInteger('is_owner'), ]; } diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index 8cd445b9f5..cc0d51b459 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -39,7 +39,7 @@ trait ConvertsDataTypes * * @return int */ - public function integer(string $field): int + public function convertInteger(string $field): int { return (int) $this->get($field); }