kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 04:34:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole
2022-10-01 07:15:17 +02:00
parent 697ad5b2b5 93c83fbe7a
commit 749ce2ca9b
39 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
View File

@@ -43,8 +43,8 @@ class MoveTransactionsRequest extends FormRequest
public function getAll(): array public function getAll(): array
{ {
return [ return [
'original_account' => $this->integer('original_account'), 'original_account' => $this->convertInteger('original_account'),
'destination_account' => $this->integer('destination_account'), 'destination_account' => $this->convertInteger('destination_account'),
]; ];
} }

4
app/Api/V1/Requests/Models/Account/StoreRequest.php
View File

@@ -61,8 +61,8 @@ class StoreRequest extends FormRequest
'include_net_worth' => $includeNetWorth, 'include_net_worth' => $includeNetWorth,
'account_type_name' => $this->convertString('type'), 'account_type_name' => $this->convertString('type'),
'account_type_id' => null, 'account_type_id' => null,
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->convertInteger('currency_id'),
'order' => $this->integer('order'), 'order' => $this->convertInteger('order'),
'currency_code' => $this->convertString('currency_code'), 'currency_code' => $this->convertString('currency_code'),
'virtual_balance' => $this->convertString('virtual_balance'), 'virtual_balance' => $this->convertString('virtual_balance'),
'iban' => $this->convertString('iban'), 'iban' => $this->convertString('iban'),

4
app/Api/V1/Requests/Models/Account/UpdateRequest.php
View File

@@ -67,8 +67,8 @@ class UpdateRequest extends FormRequest
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],
'interest' => ['interest', 'convertString'], 'interest' => ['interest', 'convertString'],
'interest_period' => ['interest_period', 'convertString'], 'interest_period' => ['interest_period', 'convertString'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'currency_id' => ['currency_id', 'integer'], 'currency_id' => ['currency_id', 'convertInteger'],
'currency_code' => ['currency_code', 'convertString'], 'currency_code' => ['currency_code', 'convertString'],
'liability_direction' => ['liability_direction', 'convertString'], 'liability_direction' => ['liability_direction', 'convertString'],
'liability_amount' => ['liability_amount', 'convertString'], 'liability_amount' => ['liability_amount', 'convertString'],

2
app/Api/V1/Requests/Models/Attachment/StoreRequest.php
View File

@@ -49,7 +49,7 @@ class StoreRequest extends FormRequest
'title' => $this->convertString('title'), 'title' => $this->convertString('title'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),
'attachable_type' => $this->convertString('attachable_type'), 'attachable_type' => $this->convertString('attachable_type'),
'attachable_id' => $this->integer('attachable_id'), 'attachable_id' => $this->convertInteger('attachable_id'),
]; ];
} }

2
app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
View File

@@ -49,7 +49,7 @@ class UpdateRequest extends FormRequest
'title' => ['title', 'convertString'], 'title' => ['title', 'convertString'],
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],
'attachable_type' => ['attachable_type', 'convertString'], 'attachable_type' => ['attachable_type', 'convertString'],
'attachable_id' => ['attachable_id', 'integer'], 'attachable_id' => ['attachable_id', 'convertInteger'],
]; ];
return $this->getAllData($fields); return $this->getAllData($fields);

2
app/Api/V1/Requests/Models/AvailableBudget/Request.php
View File

@@ -47,7 +47,7 @@ class Request extends FormRequest
{ {
// this is the way: // this is the way:
$fields = [ $fields = [
'currency_id' => ['currency_id', 'integer'], 'currency_id' => ['currency_id', 'convertInteger'],
'currency_code' => ['currency_code', 'convertString'], 'currency_code' => ['currency_code', 'convertString'],
'amount' => ['amount', 'convertString'], 'amount' => ['amount', 'convertString'],
'start' => ['start', 'date'], 'start' => ['start', 'date'],

8
app/Api/V1/Requests/Models/Bill/StoreRequest.php
View File

@@ -52,17 +52,17 @@ class StoreRequest extends FormRequest
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'amount_min' => ['amount_min', 'convertString'], 'amount_min' => ['amount_min', 'convertString'],
'amount_max' => ['amount_max', 'convertString'], 'amount_max' => ['amount_max', 'convertString'],
'currency_id' => ['currency_id', 'integer'], 'currency_id' => ['currency_id', 'convertInteger'],
'currency_code' => ['currency_code', 'convertString'], 'currency_code' => ['currency_code', 'convertString'],
'date' => ['date', 'date'], 'date' => ['date', 'date'],
'end_date' => ['end_date', 'date'], 'end_date' => ['end_date', 'date'],
'extension_date' => ['extension_date', 'date'], 'extension_date' => ['extension_date', 'date'],
'repeat_freq' => ['repeat_freq', 'convertString'], 'repeat_freq' => ['repeat_freq', 'convertString'],
'skip' => ['skip', 'integer'], 'skip' => ['skip', 'convertInteger'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],
'object_group_id' => ['object_group_id', 'integer'], 'object_group_id' => ['object_group_id', 'convertInteger'],
'object_group_title' => ['object_group_title', 'convertString'], 'object_group_title' => ['object_group_title', 'convertString'],
]; ];

8
app/Api/V1/Requests/Models/Bill/UpdateRequest.php
View File

@@ -50,17 +50,17 @@ class UpdateRequest extends FormRequest
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'amount_min' => ['amount_min', 'convertString'], 'amount_min' => ['amount_min', 'convertString'],
'amount_max' => ['amount_max', 'convertString'], 'amount_max' => ['amount_max', 'convertString'],
'currency_id' => ['currency_id', 'integer'], 'currency_id' => ['currency_id', 'convertInteger'],
'currency_code' => ['currency_code', 'convertString'], 'currency_code' => ['currency_code', 'convertString'],
'date' => ['date', 'date'], 'date' => ['date', 'date'],
'end_date' => ['end_date', 'date'], 'end_date' => ['end_date', 'date'],
'extension_date' => ['extension_date', 'date'], 'extension_date' => ['extension_date', 'date'],
'repeat_freq' => ['repeat_freq', 'convertString'], 'repeat_freq' => ['repeat_freq', 'convertString'],
'skip' => ['skip', 'integer'], 'skip' => ['skip', 'convertInteger'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],
'object_group_id' => ['object_group_id', 'integer'], 'object_group_id' => ['object_group_id', 'convertInteger'],
'object_group_title' => ['object_group_title', 'convertString'], 'object_group_title' => ['object_group_title', 'convertString'],
]; ];

4
app/Api/V1/Requests/Models/Budget/StoreRequest.php
View File

@@ -49,11 +49,11 @@ class StoreRequest extends FormRequest
$fields = [ $fields = [
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['active', 'integer'], 'order' => ['active', 'convertInteger'],
'notes' => ['notes', 'convertString'], 'notes' => ['notes', 'convertString'],
// auto budget currency: // auto budget currency:
'currency_id' => ['auto_budget_currency_id', 'integer'], 'currency_id' => ['auto_budget_currency_id', 'convertInteger'],
'currency_code' => ['auto_budget_currency_code', 'convertString'], 'currency_code' => ['auto_budget_currency_code', 'convertString'],
'auto_budget_type' => ['auto_budget_type', 'convertString'], 'auto_budget_type' => ['auto_budget_type', 'convertString'],
'auto_budget_amount' => ['auto_budget_amount', 'convertString'], 'auto_budget_amount' => ['auto_budget_amount', 'convertString'],

4
app/Api/V1/Requests/Models/Budget/UpdateRequest.php
View File

@@ -50,9 +50,9 @@ class UpdateRequest extends FormRequest
$fields = [ $fields = [
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'notes' => ['notes', 'convertString'], 'notes' => ['notes', 'convertString'],
'currency_id' => ['auto_budget_currency_id', 'integer'], 'currency_id' => ['auto_budget_currency_id', 'convertInteger'],
'currency_code' => ['auto_budget_currency_code', 'convertString'], 'currency_code' => ['auto_budget_currency_code', 'convertString'],
'auto_budget_type' => ['auto_budget_type', 'convertString'], 'auto_budget_type' => ['auto_budget_type', 'convertString'],
'auto_budget_amount' => ['auto_budget_amount', 'convertString'], 'auto_budget_amount' => ['auto_budget_amount', 'convertString'],

2
app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php
View File

@@ -47,7 +47,7 @@ class StoreRequest extends FormRequest
'start' => $this->getCarbonDate('start'), 'start' => $this->getCarbonDate('start'),
'end' => $this->getCarbonDate('end'), 'end' => $this->getCarbonDate('end'),
'amount' => $this->convertString('amount'), 'amount' => $this->convertString('amount'),
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->convertInteger('currency_id'),
'currency_code' => $this->convertString('currency_code'), 'currency_code' => $this->convertString('currency_code'),
]; ];
} }

2
app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
View File

@@ -49,7 +49,7 @@ class UpdateRequest extends FormRequest
'start' => ['start', 'date'], 'start' => ['start', 'date'],
'end' => ['end', 'date'], 'end' => ['end', 'date'],
'amount' => ['amount', 'convertString'], 'amount' => ['amount', 'convertString'],
'currency_id' => ['currency_id', 'integer'], 'currency_id' => ['currency_id', 'convertInteger'],
'currency_code' => ['currency_code', 'convertString'], 'currency_code' => ['currency_code', 'convertString'],
]; ];

2
app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php
View File

@@ -44,7 +44,7 @@ class UpdateRequest extends FormRequest
{ {
$fields = [ $fields = [
'title' => ['title', 'convertString'], 'title' => ['title', 'convertString'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
]; ];
return $this->getAllData($fields); return $this->getAllData($fields);

6
app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
View File

@@ -44,17 +44,17 @@ class StoreRequest extends FormRequest
public function getAll(): array public function getAll(): array
{ {
$fields = [ $fields = [
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
]; ];
$data = $this->getAllData($fields); $data = $this->getAllData($fields);
$data['name'] = $this->convertString('name'); $data['name'] = $this->convertString('name');
$data['account_id'] = $this->integer('account_id'); $data['account_id'] = $this->convertInteger('account_id');
$data['targetamount'] = $this->convertString('target_amount'); $data['targetamount'] = $this->convertString('target_amount');
$data['current_amount'] = $this->convertString('current_amount'); $data['current_amount'] = $this->convertString('current_amount');
$data['startdate'] = $this->getCarbonDate('start_date'); $data['startdate'] = $this->getCarbonDate('start_date');
$data['targetdate'] = $this->getCarbonDate('target_date'); $data['targetdate'] = $this->getCarbonDate('target_date');
$data['notes'] = $this->stringWithNewlines('notes'); $data['notes'] = $this->stringWithNewlines('notes');
$data['object_group_id'] = $this->integer('object_group_id'); $data['object_group_id'] = $this->convertInteger('object_group_id');
$data['object_group_title'] = $this->convertString('object_group_title'); $data['object_group_title'] = $this->convertString('object_group_title');
return $data; return $data;

6
app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
View File

@@ -47,15 +47,15 @@ class UpdateRequest extends FormRequest
{ {
$fields = [ $fields = [
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'account_id' => ['account_id', 'integer'], 'account_id' => ['account_id', 'convertInteger'],
'targetamount' => ['target_amount', 'convertString'], 'targetamount' => ['target_amount', 'convertString'],
'current_amount' => ['current_amount', 'convertString'], 'current_amount' => ['current_amount', 'convertString'],
'startdate' => ['start_date', 'date'], 'startdate' => ['start_date', 'date'],
'targetdate' => ['target_date', 'convertString'], 'targetdate' => ['target_date', 'convertString'],
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'object_group_title' => ['object_group_title', 'convertString'], 'object_group_title' => ['object_group_title', 'convertString'],
'object_group_id' => ['object_group_id', 'integer'], 'object_group_id' => ['object_group_id', 'convertInteger'],
]; ];
return $this->getAllData($fields); return $this->getAllData($fields);

2
app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
View File

@@ -54,7 +54,7 @@ class StoreRequest extends FormRequest
'description' => ['description', 'convertString'], 'description' => ['description', 'convertString'],
'first_date' => ['first_date', 'date'], 'first_date' => ['first_date', 'date'],
'repeat_until' => ['repeat_until', 'date'], 'repeat_until' => ['repeat_until', 'date'],
'nr_of_repetitions' => ['nr_of_repetitions', 'integer'], 'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
'apply_rules' => ['apply_rules', 'boolean'], 'apply_rules' => ['apply_rules', 'boolean'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'notes' => ['notes', 'stringWithNewlines'], 'notes' => ['notes', 'stringWithNewlines'],

2
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@@ -55,7 +55,7 @@ class UpdateRequest extends FormRequest
'description' => ['description', 'convertString'], 'description' => ['description', 'convertString'],
'first_date' => ['first_date', 'date'], 'first_date' => ['first_date', 'date'],
'repeat_until' => ['repeat_until', 'date'], 'repeat_until' => ['repeat_until', 'date'],
'nr_of_repetitions' => ['nr_of_repetitions', 'integer'], 'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
'apply_rules' => ['apply_rules', 'boolean'], 'apply_rules' => ['apply_rules', 'boolean'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'notes' => ['notes', 'convertString'], 'notes' => ['notes', 'convertString'],

4
app/Api/V1/Requests/Models/Rule/StoreRequest.php
View File

@@ -48,8 +48,8 @@ class StoreRequest extends FormRequest
$fields = [ $fields = [
'title' => ['title', 'convertString'], 'title' => ['title', 'convertString'],
'description' => ['description', 'convertString'], 'description' => ['description', 'convertString'],
'rule_group_id' => ['rule_group_id', 'integer'], 'rule_group_id' => ['rule_group_id', 'convertInteger'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
'rule_group_title' => ['rule_group_title', 'convertString'], 'rule_group_title' => ['rule_group_title', 'convertString'],
'trigger' => ['trigger', 'convertString'], 'trigger' => ['trigger', 'convertString'],
'strict' => ['strict', 'boolean'], 'strict' => ['strict', 'boolean'],

4
app/Api/V1/Requests/Models/Rule/UpdateRequest.php
View File

@@ -48,12 +48,12 @@ class UpdateRequest extends FormRequest
$fields = [ $fields = [
'title' => ['title', 'convertString'], 'title' => ['title', 'convertString'],
'description' => ['description', 'stringWithNewlines'], 'description' => ['description', 'stringWithNewlines'],
'rule_group_id' => ['rule_group_id', 'integer'], 'rule_group_id' => ['rule_group_id', 'convertInteger'],
'trigger' => ['trigger', 'convertString'], 'trigger' => ['trigger', 'convertString'],
'strict' => ['strict', 'boolean'], 'strict' => ['strict', 'boolean'],
'stop_processing' => ['stop_processing', 'boolean'], 'stop_processing' => ['stop_processing', 'boolean'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
]; ];
$return = $this->getAllData($fields); $return = $this->getAllData($fields);

2
app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php
View File

@@ -49,7 +49,7 @@ class StoreRequest extends FormRequest
$active = $this->boolean('active'); $active = $this->boolean('active');
} }
if (null !== $this->get('order')) { if (null !== $this->get('order')) {
$order = $this->integer('order'); $order = $this->convertInteger('order');
} }
return [ return [

2
app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php
View File

@@ -48,7 +48,7 @@ class UpdateRequest extends FormRequest
'title' => ['title', 'convertString'], 'title' => ['title', 'convertString'],
'description' => ['description', 'stringWithNewlines'], 'description' => ['description', 'stringWithNewlines'],
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
'order' => ['order', 'integer'], 'order' => ['order', 'convertInteger'],
]; ];
return $this->getAllData($fields); return $this->getAllData($fields);

2
app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php
View File

@@ -57,7 +57,7 @@ class StoreRequest extends FormRequest
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'code' => $this->convertString('code'), 'code' => $this->convertString('code'),
'symbol' => $this->convertString('symbol'), 'symbol' => $this->convertString('symbol'),
'decimal_places' => $this->integer('decimal_places'), 'decimal_places' => $this->convertInteger('decimal_places'),
'default' => $default, 'default' => $default,
'enabled' => $enabled, 'enabled' => $enabled,
]; ];

2
app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
View File

@@ -49,7 +49,7 @@ class UpdateRequest extends FormRequest
'name' => ['name', 'convertString'], 'name' => ['name', 'convertString'],
'code' => ['code', 'convertString'], 'code' => ['code', 'convertString'],
'symbol' => ['symbol', 'convertString'], 'symbol' => ['symbol', 'convertString'],
'decimal_places' => ['decimal_places', 'integer'], 'decimal_places' => ['decimal_places', 'convertInteger'],
'default' => ['default', 'boolean'], 'default' => ['default', 'boolean'],
'enabled' => ['enabled', 'boolean'], 'enabled' => ['enabled', 'boolean'],
]; ];

6
app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
View File

@@ -46,10 +46,10 @@ class StoreRequest extends FormRequest
public function getAll(): array public function getAll(): array
{ {
return [ return [
'link_type_id' => $this->integer('link_type_id'), 'link_type_id' => $this->convertInteger('link_type_id'),
'link_type_name' => $this->convertString('link_type_name'), 'link_type_name' => $this->convertString('link_type_name'),
'inward_id' => $this->integer('inward_id'), 'inward_id' => $this->convertInteger('inward_id'),
'outward_id' => $this->integer('outward_id'), 'outward_id' => $this->convertInteger('outward_id'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),
]; ];
} }

6
app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
View File

@@ -46,10 +46,10 @@ class UpdateRequest extends FormRequest
public function getAll(): array public function getAll(): array
{ {
return [ return [
'link_type_id' => $this->integer('link_type_id'), 'link_type_id' => $this->convertInteger('link_type_id'),
'link_type_name' => $this->convertString('link_type_name'), 'link_type_name' => $this->convertString('link_type_name'),
'inward_id' => $this->integer('inward_id'), 'inward_id' => $this->convertInteger('inward_id'),
'outward_id' => $this->integer('outward_id'), 'outward_id' => $this->convertInteger('outward_id'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),
]; ];
} }

2
app/Api/V1/Requests/System/UpdateRequest.php
View File

@@ -54,7 +54,7 @@ class UpdateRequest extends FormRequest
return ['value' => $this->boolean('value')]; return ['value' => $this->boolean('value')];
case 'configuration.permission_update_check': case 'configuration.permission_update_check':
case 'configuration.last_update_check': case 'configuration.last_update_check':
return ['value' => $this->integer('value')]; return ['value' => $this->convertInteger('value')];
} }
return ['value' => $this->convertString('value')]; return ['value' => $this->convertString('value')];

4
app/Http/Requests/AccountFormRequest.php
View File

@@ -48,7 +48,7 @@ class AccountFormRequest extends FormRequest
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'account_type_name' => $this->convertString('objectType'), 'account_type_name' => $this->convertString('objectType'),
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->convertInteger('currency_id'),
'virtual_balance' => $this->convertString('virtual_balance'), 'virtual_balance' => $this->convertString('virtual_balance'),
'iban' => $this->convertString('iban'), 'iban' => $this->convertString('iban'),
'BIC' => $this->convertString('BIC'), 'BIC' => $this->convertString('BIC'),
@@ -77,7 +77,7 @@ class AccountFormRequest extends FormRequest
// that could have been selected. // that could have been selected.
if ('liabilities' === $data['account_type_name']) { if ('liabilities' === $data['account_type_name']) {
$data['account_type_name'] = null; $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']) { if ('' !== $data['opening_balance']) {
$data['opening_balance'] = app('steam')->negative($data['opening_balance']); $data['opening_balance'] = app('steam')->negative($data['opening_balance']);
} }

4
app/Http/Requests/BillStoreRequest.php
View File

@@ -43,14 +43,14 @@ class BillStoreRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'amount_min' => $this->convertString('amount_min'), 'amount_min' => $this->convertString('amount_min'),
'currency_id' => $this->integer('transaction_currency_id'), 'currency_id' => $this->convertInteger('transaction_currency_id'),
'currency_code' => '', 'currency_code' => '',
'amount_max' => $this->convertString('amount_max'), 'amount_max' => $this->convertString('amount_max'),
'date' => $this->getCarbonDate('date'), 'date' => $this->getCarbonDate('date'),
'end_date' => $this->getCarbonDate('bill_end_date'), 'end_date' => $this->getCarbonDate('bill_end_date'),
'extension_date' => $this->getCarbonDate('extension_date'), 'extension_date' => $this->getCarbonDate('extension_date'),
'repeat_freq' => $this->convertString('repeat_freq'), 'repeat_freq' => $this->convertString('repeat_freq'),
'skip' => $this->integer('skip'), 'skip' => $this->convertInteger('skip'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'object_group_title' => $this->convertString('object_group'), 'object_group_title' => $this->convertString('object_group'),

4
app/Http/Requests/BillUpdateRequest.php
View File

@@ -44,14 +44,14 @@ class BillUpdateRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'amount_min' => $this->convertString('amount_min'), 'amount_min' => $this->convertString('amount_min'),
'currency_id' => $this->integer('transaction_currency_id'), 'currency_id' => $this->convertInteger('transaction_currency_id'),
'currency_code' => '', 'currency_code' => '',
'amount_max' => $this->convertString('amount_max'), 'amount_max' => $this->convertString('amount_max'),
'date' => $this->getCarbonDate('date'), 'date' => $this->getCarbonDate('date'),
'end_date' => $this->getCarbonDate('bill_end_date'), 'end_date' => $this->getCarbonDate('bill_end_date'),
'extension_date' => $this->getCarbonDate('extension_date'), 'extension_date' => $this->getCarbonDate('extension_date'),
'repeat_freq' => $this->convertString('repeat_freq'), 'repeat_freq' => $this->convertString('repeat_freq'),
'skip' => $this->integer('skip'), 'skip' => $this->convertInteger('skip'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'object_group_title' => $this->convertString('object_group'), 'object_group_title' => $this->convertString('object_group'),

4
app/Http/Requests/BudgetFormStoreRequest.php
View File

@@ -46,8 +46,8 @@ class BudgetFormStoreRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'auto_budget_type' => $this->integer('auto_budget_type'), 'auto_budget_type' => $this->convertInteger('auto_budget_type'),
'currency_id' => $this->integer('auto_budget_currency_id'), 'currency_id' => $this->convertInteger('auto_budget_currency_id'),
'auto_budget_amount' => $this->convertString('auto_budget_amount'), 'auto_budget_amount' => $this->convertString('auto_budget_amount'),
'auto_budget_period' => $this->convertString('auto_budget_period'), 'auto_budget_period' => $this->convertString('auto_budget_period'),
]; ];

4
app/Http/Requests/BudgetFormUpdateRequest.php
View File

@@ -47,8 +47,8 @@ class BudgetFormUpdateRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'auto_budget_type' => $this->integer('auto_budget_type'), 'auto_budget_type' => $this->convertInteger('auto_budget_type'),
'currency_id' => $this->integer('auto_budget_currency_id'), 'currency_id' => $this->convertInteger('auto_budget_currency_id'),
'auto_budget_amount' => $this->convertString('auto_budget_amount'), 'auto_budget_amount' => $this->convertString('auto_budget_amount'),
'auto_budget_period' => $this->convertString('auto_budget_period'), 'auto_budget_period' => $this->convertString('auto_budget_period'),
]; ];

2
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -45,7 +45,7 @@ class CurrencyFormRequest extends FormRequest
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'code' => $this->convertString('code'), 'code' => $this->convertString('code'),
'symbol' => $this->convertString('symbol'), 'symbol' => $this->convertString('symbol'),
'decimal_places' => $this->integer('decimal_places'), 'decimal_places' => $this->convertInteger('decimal_places'),
'enabled' => $this->boolean('enabled'), 'enabled' => $this->boolean('enabled'),
]; ];
} }

2
app/Http/Requests/JournalLinkRequest.php
View File

@@ -45,7 +45,7 @@ class JournalLinkRequest extends FormRequest
$linkType = $this->get('link_type'); $linkType = $this->get('link_type');
$parts = explode('_', $linkType); $parts = explode('_', $linkType);
$return['link_type_id'] = (int) $parts[0]; $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['notes'] = $this->convertString('notes');
$return['direction'] = $parts[1]; $return['direction'] = $parts[1];

2
app/Http/Requests/PiggyBankStoreRequest.php
View File

@@ -43,7 +43,7 @@ class PiggyBankStoreRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'startdate' => $this->getCarbonDate('startdate'), 'startdate' => $this->getCarbonDate('startdate'),
'account_id' => $this->integer('account_id'), 'account_id' => $this->convertInteger('account_id'),
'targetamount' => $this->convertString('targetamount'), 'targetamount' => $this->convertString('targetamount'),
'targetdate' => $this->getCarbonDate('targetdate'), 'targetdate' => $this->getCarbonDate('targetdate'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),

2
app/Http/Requests/PiggyBankUpdateRequest.php
View File

@@ -44,7 +44,7 @@ class PiggyBankUpdateRequest extends FormRequest
return [ return [
'name' => $this->convertString('name'), 'name' => $this->convertString('name'),
'startdate' => $this->getCarbonDate('startdate'), 'startdate' => $this->getCarbonDate('startdate'),
'account_id' => $this->integer('account_id'), 'account_id' => $this->convertInteger('account_id'),
'targetamount' => $this->convertString('targetamount'), 'targetamount' => $this->convertString('targetamount'),
'targetdate' => $this->getCarbonDate('targetdate'), 'targetdate' => $this->getCarbonDate('targetdate'),
'notes' => $this->stringWithNewlines('notes'), 'notes' => $this->stringWithNewlines('notes'),

30
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -61,14 +61,14 @@ class RecurrenceFormRequest extends FormRequest
'description' => $this->convertString('recurring_description'), 'description' => $this->convertString('recurring_description'),
'first_date' => $this->getCarbonDate('first_date'), 'first_date' => $this->getCarbonDate('first_date'),
'repeat_until' => $this->getCarbonDate('repeat_until'), 'repeat_until' => $this->getCarbonDate('repeat_until'),
'nr_of_repetitions' => $this->integer('repetitions'), 'nr_of_repetitions' => $this->convertInteger('repetitions'),
'apply_rules' => $this->boolean('apply_rules'), 'apply_rules' => $this->boolean('apply_rules'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'repetition_end' => $this->convertString('repetition_end'), 'repetition_end' => $this->convertString('repetition_end'),
], ],
'transactions' => [ 'transactions' => [
[ [
'currency_id' => $this->integer('transaction_currency_id'), 'currency_id' => $this->convertInteger('transaction_currency_id'),
'currency_code' => null, 'currency_code' => null,
'type' => $this->convertString('transaction_type'), 'type' => $this->convertString('transaction_type'),
'description' => $this->convertString('transaction_description'), 'description' => $this->convertString('transaction_description'),
@@ -76,14 +76,14 @@ class RecurrenceFormRequest extends FormRequest
'foreign_amount' => null, 'foreign_amount' => null,
'foreign_currency_id' => null, 'foreign_currency_id' => null,
'foreign_currency_code' => null, 'foreign_currency_code' => null,
'budget_id' => $this->integer('budget_id'), 'budget_id' => $this->convertInteger('budget_id'),
'budget_name' => null, 'budget_name' => null,
'bill_id' => $this->integer('bill_id'), 'bill_id' => $this->convertInteger('bill_id'),
'bill_name' => null, 'bill_name' => null,
'category_id' => null, 'category_id' => null,
'category_name' => $this->convertString('category'), 'category_name' => $this->convertString('category'),
'tags' => '' !== $this->convertString('tags') ? explode(',', $this->convertString('tags')) : [], '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, 'piggy_bank_name' => null,
], ],
], ],
@@ -91,8 +91,8 @@ class RecurrenceFormRequest extends FormRequest
[ [
'type' => $repetitionData['type'], 'type' => $repetitionData['type'],
'moment' => $repetitionData['moment'], 'moment' => $repetitionData['moment'],
'skip' => $this->integer('skip'), 'skip' => $this->convertInteger('skip'),
'weekend' => $this->integer('weekend'), 'weekend' => $this->convertInteger('weekend'),
], ],
], ],
@@ -101,7 +101,7 @@ class RecurrenceFormRequest extends FormRequest
// fill in foreign currency data // fill in foreign currency data
if (null !== $this->float('foreign_amount')) { if (null !== $this->float('foreign_amount')) {
$return['transactions'][0]['foreign_amount'] = $this->convertString('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: // default values:
$return['transactions'][0]['source_id'] = null; $return['transactions'][0]['source_id'] = null;
@@ -113,16 +113,16 @@ class RecurrenceFormRequest extends FormRequest
default: default:
throw new FireflyException(sprintf('Cannot handle transaction type "%s"', $this->convertString('transaction_type'))); throw new FireflyException(sprintf('Cannot handle transaction type "%s"', $this->convertString('transaction_type')));
case 'withdrawal': case 'withdrawal':
$return['transactions'][0]['source_id'] = $this->integer('source_id'); $return['transactions'][0]['source_id'] = $this->convertInteger('source_id');
$return['transactions'][0]['destination_id'] = $this->integer('withdrawal_destination_id'); $return['transactions'][0]['destination_id'] = $this->convertInteger('withdrawal_destination_id');
break; break;
case 'deposit': case 'deposit':
$return['transactions'][0]['source_id'] = $this->integer('deposit_source_id'); $return['transactions'][0]['source_id'] = $this->convertInteger('deposit_source_id');
$return['transactions'][0]['destination_id'] = $this->integer('destination_id'); $return['transactions'][0]['destination_id'] = $this->convertInteger('destination_id');
break; break;
case 'transfer': case 'transfer':
$return['transactions'][0]['source_id'] = $this->integer('source_id'); $return['transactions'][0]['source_id'] = $this->convertInteger('source_id');
$return['transactions'][0]['destination_id'] = $this->integer('destination_id'); $return['transactions'][0]['destination_id'] = $this->convertInteger('destination_id');
break; break;
} }
@@ -219,7 +219,7 @@ class RecurrenceFormRequest extends FormRequest
'category' => 'between:1,255|nullable', 'category' => 'between:1,255|nullable',
'tags' => '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'; $rules['foreign_currency_id'] = 'exists:transaction_currencies,id';
} }

2
app/Http/Requests/RuleFormRequest.php
View File

@@ -45,7 +45,7 @@ class RuleFormRequest extends FormRequest
{ {
return [ return [
'title' => $this->convertString('title'), 'title' => $this->convertString('title'),
'rule_group_id' => $this->integer('rule_group_id'), 'rule_group_id' => $this->convertInteger('rule_group_id'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'trigger' => $this->convertString('trigger'), 'trigger' => $this->convertString('trigger'),
'description' => $this->stringWithNewlines('description'), 'description' => $this->stringWithNewlines('description'),

4
app/Http/Requests/UserFormRequest.php
View File

@@ -44,10 +44,10 @@ class UserFormRequest extends FormRequest
{ {
return [ return [
'email' => $this->convertString('email'), 'email' => $this->convertString('email'),
'blocked' => 1 === $this->integer('blocked'), 'blocked' => 1 === $this->convertInteger('blocked'),
'blocked_code' => $this->convertString('blocked_code'), 'blocked_code' => $this->convertString('blocked_code'),
'password' => $this->convertString('password'), 'password' => $this->convertString('password'),
'is_owner' => 1 === $this->integer('is_owner'), 'is_owner' => 1 === $this->convertInteger('is_owner'),
]; ];
} }

2
app/Support/Request/ConvertsDataTypes.php
View File

@@ -39,7 +39,7 @@ trait ConvertsDataTypes
* *
* @return int * @return int
*/ */
public function integer(string $field): int public function convertInteger(string $field): int
{ {
return (int) $this->get($field); return (int) $this->get($field);
} }