diff --git a/.ci/php-cs-fixer/.php-cs-fixer.php b/.ci/php-cs-fixer/.php-cs-fixer.php index 39da58fb06..f96d462c28 100644 --- a/.ci/php-cs-fixer/.php-cs-fixer.php +++ b/.ci/php-cs-fixer/.php-cs-fixer.php @@ -23,7 +23,7 @@ $current = __DIR__; $paths = [ $current . '/../../app', -// $current . '/../../config', + $current . '/../../config', // $current . '/../../database', // $current . '/../../routes', // $current . '/../../tests', diff --git a/app/Console/Commands/Correction/DeleteEmptyGroups.php b/app/Console/Commands/Correction/DeleteEmptyGroups.php index 3ba5ea8515..aa769e9dde 100644 --- a/app/Console/Commands/Correction/DeleteEmptyGroups.php +++ b/app/Console/Commands/Correction/DeleteEmptyGroups.php @@ -47,7 +47,7 @@ class DeleteEmptyGroups extends Command { $groupIds = TransactionGroup::leftJoin('transaction_journals', 'transaction_groups.id', '=', 'transaction_journals.transaction_group_id') - ->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray() + ->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray() ; $total = count($groupIds); diff --git a/app/Console/Commands/System/ForceDecimalSize.php b/app/Console/Commands/System/ForceDecimalSize.php index 383f004554..19cda1faa2 100644 --- a/app/Console/Commands/System/ForceDecimalSize.php +++ b/app/Console/Commands/System/ForceDecimalSize.php @@ -74,19 +74,19 @@ class ForceDecimalSize extends Command private string $regularExpression; private array $tables = [ - 'accounts' => ['virtual_balance'], - 'auto_budgets' => ['amount'], - 'available_budgets' => ['amount'], - 'bills' => ['amount_min', 'amount_max'], - 'budget_limits' => ['amount'], - 'currency_exchange_rates' => ['rate', 'user_rate'], - 'limit_repetitions' => ['amount'], - 'piggy_bank_events' => ['amount'], - 'piggy_bank_repetitions' => ['currentamount'], - 'piggy_banks' => ['targetamount'], - 'recurrences_transactions' => ['amount', 'foreign_amount'], - 'transactions' => ['amount', 'foreign_amount'], - ]; + 'accounts' => ['virtual_balance'], + 'auto_budgets' => ['amount'], + 'available_budgets' => ['amount'], + 'bills' => ['amount_min', 'amount_max'], + 'budget_limits' => ['amount'], + 'currency_exchange_rates' => ['rate', 'user_rate'], + 'limit_repetitions' => ['amount'], + 'piggy_bank_events' => ['amount'], + 'piggy_bank_repetitions' => ['currentamount'], + 'piggy_banks' => ['targetamount'], + 'recurrences_transactions' => ['amount', 'foreign_amount'], + 'transactions' => ['amount', 'foreign_amount'], + ]; /** * Execute the console command. diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 3bd4679bae..cdf815f7db 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -296,11 +296,11 @@ class IndexController extends Controller // also calculate how much left from budgeted: $sums['left'][$currencyId] ??= [ - 'amount' => '0', - 'currency_id' => $budgeted['currency_id'], - 'currency_symbol' => $budgeted['currency_symbol'], - 'currency_decimal_places' => $budgeted['currency_decimal_places'], - ]; + 'amount' => '0', + 'currency_id' => $budgeted['currency_id'], + 'currency_symbol' => $budgeted['currency_symbol'], + 'currency_decimal_places' => $budgeted['currency_decimal_places'], + ]; } } diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 6239ef4d6e..cc7a13bd24 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -247,11 +247,11 @@ class CategoryController extends Controller $chartData[$inKey] = [ - 'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']), - 'entries' => [], - 'type' => 'bar', - 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green - ]; + 'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']), + 'entries' => [], + 'type' => 'bar', + 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green + ]; // loop empty periods: foreach (array_keys($periods) as $period) { $label = $periods[$period]; diff --git a/app/Models/Account.php b/app/Models/Account.php index c6ed9908e7..9736462044 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -122,13 +122,13 @@ class Account extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'user_id' => 'integer', - 'deleted_at' => 'datetime', - 'active' => 'boolean', - 'encrypted' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'user_id' => 'integer', + 'deleted_at' => 'datetime', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index a3c37ed271..799543776c 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -59,9 +59,9 @@ class AccountMeta extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + ]; protected $fillable = ['account_id', 'name', 'data']; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index c2a942460a..54036c23ab 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -72,9 +72,9 @@ class AccountType extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + ]; protected $fillable = ['type']; diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index e2ef680150..c0dedb7db3 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -97,11 +97,11 @@ class Attachment extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'uploaded' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'uploaded' => 'boolean', + ]; protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 8a3d8c7e91..95bdaa6120 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -80,13 +80,13 @@ class AvailableBudget extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'start_date' => 'date', - 'end_date' => 'date', - 'transaction_currency_id' => 'int', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'start_date' => 'date', + 'end_date' => 'date', + 'transaction_currency_id' => 'int', + ]; protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 5b7e65ce61..ff50cc7aa6 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -114,36 +114,36 @@ class Bill extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'date' => 'date', - 'end_date' => 'date', - 'extension_date' => 'date', - 'skip' => 'int', - 'automatch' => 'boolean', - 'active' => 'boolean', - 'name_encrypted' => 'boolean', - 'match_encrypted' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'date' => 'date', + 'end_date' => 'date', + 'extension_date' => 'date', + 'skip' => 'int', + 'automatch' => 'boolean', + 'active' => 'boolean', + 'name_encrypted' => 'boolean', + 'match_encrypted' => 'boolean', + ]; protected $fillable = [ - 'name', - 'match', - 'amount_min', - 'user_id', - 'user_group_id', - 'amount_max', - 'date', - 'repeat_freq', - 'skip', - 'automatch', - 'active', - 'transaction_currency_id', - 'end_date', - 'extension_date', - ]; + 'name', + 'match', + 'amount_min', + 'user_id', + 'user_group_id', + 'amount_max', + 'date', + 'repeat_freq', + 'skip', + 'automatch', + 'active', + 'transaction_currency_id', + 'end_date', + 'extension_date', + ]; protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted']; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 3c13dba221..dd7f9a5a6b 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -97,12 +97,12 @@ class Budget extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'active' => 'boolean', - 'encrypted' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id']; diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 58bc881614..e8528e5e40 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -74,18 +74,18 @@ class BudgetLimit extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'start_date' => 'date', - 'end_date' => 'date', - 'auto_budget' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'start_date' => 'date', + 'end_date' => 'date', + 'auto_budget' => 'boolean', + ]; protected $dispatchesEvents = [ - 'created' => Created::class, - 'updated' => Updated::class, - 'deleted' => Deleted::class, - ]; + 'created' => Created::class, + 'updated' => Updated::class, + 'deleted' => Deleted::class, + ]; protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id']; diff --git a/app/Models/Category.php b/app/Models/Category.php index 007d95d0f5..5901af1e7c 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -86,11 +86,11 @@ class Category extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'encrypted' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'encrypted' => 'boolean', + ]; protected $fillable = ['user_id', 'user_group_id', 'name']; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 9d07d927f0..815e3aaa63 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -62,10 +62,10 @@ class Configuration extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + ]; /** @var string The table to store the data in */ protected $table = 'configuration'; diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index eb3f5f9f15..f08edd46c8 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -72,11 +72,11 @@ class LinkType extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'editable' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'editable' => 'boolean', + ]; protected $fillable = ['name', 'inward', 'outward', 'editable']; diff --git a/app/Models/Location.php b/app/Models/Location.php index 885e5449de..c7e1a7358f 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -71,13 +71,13 @@ class Location extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'zoomLevel' => 'int', - 'latitude' => 'float', - 'longitude' => 'float', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'zoomLevel' => 'int', + 'latitude' => 'float', + 'longitude' => 'float', + ]; protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level']; diff --git a/app/Models/Note.php b/app/Models/Note.php index d1fb218940..d3238150da 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -69,10 +69,10 @@ class Note extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + ]; protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type']; diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 0ae5b7432d..912748415f 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -92,15 +92,15 @@ class PiggyBank extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'startdate' => 'date', - 'targetdate' => 'date', - 'order' => 'int', - 'active' => 'boolean', - 'encrypted' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'startdate' => 'date', + 'targetdate' => 'date', + 'order' => 'int', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active']; diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 0fc4268c03..75eef73b50 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -63,10 +63,10 @@ class PiggyBankEvent extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'date' => 'date', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'date' => 'date', + ]; protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 5ef34f96ad..5926e1a7bc 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -64,11 +64,11 @@ class PiggyBankRepetition extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'startdate' => 'date', - 'targetdate' => 'date', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'startdate' => 'date', + 'targetdate' => 'date', + ]; protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 82758bf0b8..005c9769f8 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -63,10 +63,10 @@ class Preference extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'data' => 'array', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'data' => 'array', + ]; protected $fillable = ['user_id', 'data', 'name']; diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index e6a1d8fed1..7b9756c31b 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -104,19 +104,19 @@ class Recurrence extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'title' => 'string', - 'id' => 'int', - 'description' => 'string', - 'first_date' => 'date', - 'repeat_until' => 'date', - 'latest_date' => 'date', - 'repetitions' => 'int', - 'active' => 'bool', - 'apply_rules' => 'bool', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'title' => 'string', + 'id' => 'int', + 'description' => 'string', + 'first_date' => 'date', + 'repeat_until' => 'date', + 'latest_date' => 'date', + 'repetitions' => 'int', + 'active' => 'bool', + 'apply_rules' => 'bool', + ]; protected $fillable = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active']; diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index d3d34abf10..d7bd0c060d 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -67,12 +67,12 @@ class RecurrenceMeta extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'name' => 'string', - 'value' => 'string', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'name' => 'string', + 'value' => 'string', + ]; protected $fillable = ['recurrence_id', 'name', 'value']; diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index c63a456434..efcb09c1b4 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -76,14 +76,14 @@ class RecurrenceRepetition extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'repetition_type' => 'string', - 'repetition_moment' => 'string', - 'repetition_skip' => 'int', - 'weekend' => 'int', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'repetition_type' => 'string', + 'repetition_moment' => 'string', + 'repetition_skip' => 'int', + 'weekend' => 'int', + ]; protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip']; diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 0d4364e8c7..f3bf0a5791 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -91,25 +91,25 @@ class RecurrenceTransaction extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'amount' => 'string', - 'foreign_amount' => 'string', - 'description' => 'string', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'amount' => 'string', + 'foreign_amount' => 'string', + 'description' => 'string', + ]; protected $fillable = [ - 'recurrence_id', - 'transaction_currency_id', - 'foreign_currency_id', - 'source_id', - 'destination_id', - 'amount', - 'foreign_amount', - 'description', - ]; + 'recurrence_id', + 'transaction_currency_id', + 'foreign_currency_id', + 'source_id', + 'destination_id', + 'amount', + 'foreign_amount', + 'description', + ]; /** @var string The table to store the data in */ protected $table = 'recurrences_transactions'; diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index 6bb4eea372..e0a60d4163 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -67,12 +67,12 @@ class RecurrenceTransactionMeta extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'name' => 'string', - 'value' => 'string', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'name' => 'string', + 'value' => 'string', + ]; protected $fillable = ['rt_id', 'name', 'value']; diff --git a/app/Models/Role.php b/app/Models/Role.php index 39a6216f1f..b356c6fc15 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -62,9 +62,9 @@ class Role extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + ]; protected $fillable = ['name', 'display_name', 'description']; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index befb9640b1..8ccc7c44bc 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -95,15 +95,15 @@ class Rule extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'active' => 'boolean', - 'order' => 'int', - 'stop_processing' => 'boolean', - 'id' => 'int', - 'strict' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + 'id' => 'int', + 'strict' => 'boolean', + ]; protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index a8756a5d50..f8f8e5fe12 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -66,12 +66,12 @@ class RuleAction extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'active' => 'boolean', - 'order' => 'int', - 'stop_processing' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + ]; protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing']; diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index a363e72919..67e6c42f23 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -85,13 +85,13 @@ class RuleGroup extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'active' => 'boolean', - 'stop_processing' => 'boolean', - 'order' => 'int', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'active' => 'boolean', + 'stop_processing' => 'boolean', + 'order' => 'int', + ]; protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active']; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 6d14358ebd..e617ee8b21 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -66,12 +66,12 @@ class RuleTrigger extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'active' => 'boolean', - 'order' => 'int', - 'stop_processing' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + ]; protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing']; diff --git a/app/Models/Tag.php b/app/Models/Tag.php index c5fa90814f..9ba92bc9f3 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -93,14 +93,14 @@ class Tag extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'date' => 'date', - 'zoomLevel' => 'int', - 'latitude' => 'float', - 'longitude' => 'float', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'date' => 'date', + 'zoomLevel' => 'int', + 'latitude' => 'float', + 'longitude' => 'float', + ]; protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode']; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 6d955d77ec..e8e520e9b0 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -99,27 +99,27 @@ class Transaction extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'identifier' => 'int', - 'encrypted' => 'boolean', // model does not have these fields though - 'bill_name_encrypted' => 'boolean', - 'reconciled' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'identifier' => 'int', + 'encrypted' => 'boolean', // model does not have these fields though + 'bill_name_encrypted' => 'boolean', + 'reconciled' => 'boolean', + ]; protected $fillable = [ - 'account_id', - 'transaction_journal_id', - 'description', - 'amount', - 'identifier', - 'transaction_currency_id', - 'foreign_currency_id', - 'foreign_amount', - 'reconciled', - ]; + 'account_id', + 'transaction_journal_id', + 'description', + 'amount', + 'identifier', + 'transaction_currency_id', + 'foreign_currency_id', + 'foreign_amount', + 'reconciled', + ]; protected $hidden = ['encrypted']; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 8d0c58d319..886bc8a4c8 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -89,12 +89,12 @@ class TransactionCurrency extends Model public ?bool $userGroupEnabled; protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'decimal_places' => 'int', - 'enabled' => 'bool', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'decimal_places' => 'int', + 'enabled' => 'bool', + ]; protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled']; diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 6922513c49..76e4d64a82 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -78,13 +78,13 @@ class TransactionGroup extends Model protected $casts = [ - 'id' => 'integer', - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'title' => 'string', - 'date' => 'datetime', - ]; + 'id' => 'integer', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'title' => 'string', + 'date' => 'datetime', + ]; protected $fillable = ['user_id', 'user_group_id', 'title']; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index fd26fbcc05..b5e77ee825 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -138,32 +138,32 @@ class TransactionJournal extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - 'date' => 'datetime', - 'interest_date' => 'date', - 'book_date' => 'date', - 'process_date' => 'date', - 'order' => 'int', - 'tag_count' => 'int', - 'encrypted' => 'boolean', - 'completed' => 'boolean', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'date' => 'datetime', + 'interest_date' => 'date', + 'book_date' => 'date', + 'process_date' => 'date', + 'order' => 'int', + 'tag_count' => 'int', + 'encrypted' => 'boolean', + 'completed' => 'boolean', + ]; protected $fillable = [ - 'user_id', - 'user_group_id', - 'transaction_type_id', - 'bill_id', - 'tag_count', - 'transaction_currency_id', - 'description', - 'completed', - 'order', - 'date', - ]; + 'user_id', + 'user_group_id', + 'transaction_type_id', + 'bill_id', + 'tag_count', + 'transaction_currency_id', + 'description', + 'completed', + 'order', + 'date', + ]; protected $hidden = ['encrypted']; diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index 01923e8318..f3237f4664 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -71,9 +71,9 @@ class TransactionJournalLink extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + ]; /** @var string The table to store the data in */ protected $table = 'journal_links'; diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 767eccd314..2b94815cfa 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -69,10 +69,10 @@ class TransactionJournalMeta extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + ]; protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index e888294824..7e9c4551bc 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -73,10 +73,10 @@ class TransactionType extends Model protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', - 'deleted_at' => 'datetime', - ]; + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + ]; protected $fillable = ['type']; /** diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index d74749f2df..1da423c8b0 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -75,9 +75,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface $journalId = (int)$journal['transaction_journal_id']; $array[$currencyId]['categories'][0]['transaction_journals'][$journalId] = [ - 'amount' => app('steam')->negative($journal['amount']), - 'date' => $journal['date'], - ]; + 'amount' => app('steam')->negative($journal['amount']), + 'date' => $journal['date'], + ]; } return $array; @@ -128,9 +128,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface $journalId = (int)$journal['transaction_journal_id']; $array[$currencyId]['categories'][0]['transaction_journals'][$journalId] = [ - 'amount' => app('steam')->positive($journal['amount']), - 'date' => $journal['date'], - ]; + 'amount' => app('steam')->positive($journal['amount']), + 'date' => $journal['date'], + ]; } return $array; diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index 6df894dfd4..3bc00be090 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -146,10 +146,10 @@ class UniqueIban implements ValidationRule } $query = auth()->user() - ->accounts() - ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') - ->where('accounts.iban', $iban) - ->whereIn('account_types.type', $typesArray) + ->accounts() + ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') + ->where('accounts.iban', $iban) + ->whereIn('account_types.type', $typesArray) ; if (null !== $this->account) { diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index 9a09e68db1..c11ee90e7c 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -452,13 +452,13 @@ trait PeriodOverview } $entries[] = [ - 'title' => $title, - 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]), - 'total_transactions' => count($spent) + count($earned) + count($transferred), - 'spent' => $this->groupByCurrency($spent), - 'earned' => $this->groupByCurrency($earned), - 'transferred' => $this->groupByCurrency($transferred), - ]; + 'title' => $title, + 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]), + 'total_transactions' => count($spent) + count($earned) + count($transferred), + 'spent' => $this->groupByCurrency($spent), + 'earned' => $this->groupByCurrency($earned), + 'transferred' => $this->groupByCurrency($transferred), + ]; } return $entries; diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.php index 7628b36d1a..62a7cde382 100644 --- a/app/Support/Report/Budget/BudgetReportGenerator.php +++ b/app/Support/Report/Budget/BudgetReportGenerator.php @@ -250,16 +250,16 @@ class BudgetReportGenerator // make sum information: $this->report['sums'][$currencyId] ??= [ - 'budgeted' => '0', - 'spent' => '0', - 'left' => '0', - 'overspent' => '0', - 'currency_id' => $currencyId, - 'currency_code' => $limitCurrency->code, - 'currency_name' => $limitCurrency->name, - 'currency_symbol' => $limitCurrency->symbol, - 'currency_decimal_places' => $limitCurrency->decimal_places, - ]; + 'budgeted' => '0', + 'spent' => '0', + 'left' => '0', + 'overspent' => '0', + 'currency_id' => $currencyId, + 'currency_code' => $limitCurrency->code, + 'currency_name' => $limitCurrency->name, + 'currency_symbol' => $limitCurrency->symbol, + 'currency_decimal_places' => $limitCurrency->decimal_places, + ]; $this->report['sums'][$currencyId]['budgeted'] = bcadd($this->report['sums'][$currencyId]['budgeted'], $limit->amount); $this->report['sums'][$currencyId]['spent'] = bcadd($this->report['sums'][$currencyId]['spent'], $spent); $this->report['sums'][$currencyId]['left'] = bcadd($this->report['sums'][$currencyId]['left'], bcadd($limit->amount, $spent)); diff --git a/config/app.php b/config/app.php index 9cfcb5b34a..8f179f6221 100644 --- a/config/app.php +++ b/config/app.php @@ -145,12 +145,12 @@ return [ 'Google2FA' => PragmaRX\Google2FALaravel\Facade::class, 'Twig' => TwigBridge\Facade\Twig::class, - 'Arr' => Illuminate\Support\Arr::class, - 'Http' => Illuminate\Support\Facades\Http::class, - 'Str' => Illuminate\Support\Str::class, + 'Arr' => Illuminate\Support\Arr::class, + 'Http' => Illuminate\Support\Facades\Http::class, + 'Str' => Illuminate\Support\Str::class, ], - 'asset_url' => env('ASSET_URL', null), + 'asset_url' => env('ASSET_URL', null), /* |-------------------------------------------------------------------------- @@ -163,5 +163,5 @@ return [ | */ - 'faker_locale' => 'en_US', + 'faker_locale' => 'en_US', ]; diff --git a/config/auth.php b/config/auth.php index 87bb7ce6c5..535b97ab5e 100644 --- a/config/auth.php +++ b/config/auth.php @@ -37,12 +37,12 @@ return [ | */ - 'defaults' => [ + 'defaults' => [ 'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'), 'passwords' => 'users', ], - 'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'), - 'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null), + 'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'), + 'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null), /* |-------------------------------------------------------------------------- @@ -61,7 +61,7 @@ return [ | */ - 'guards' => [ + 'guards' => [ 'web' => [ 'driver' => 'session', 'provider' => 'users', @@ -93,7 +93,7 @@ return [ | */ - 'providers' => [ + 'providers' => [ 'users' => [ 'driver' => 'eloquent', 'model' => FireflyIII\User::class, @@ -119,7 +119,7 @@ return [ | */ - 'passwords' => [ + 'passwords' => [ 'users' => [ 'provider' => 'users', 'table' => 'password_resets', diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index c1c3dbcb2b..097cdd92e8 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -46,7 +46,7 @@ return [ | */ - 'view' => 'partials/layout/breadcrumbs', + 'view' => 'partials/layout/breadcrumbs', /* |-------------------------------------------------------------------------- diff --git a/config/broadcasting.php b/config/broadcasting.php index 1996f5af12..fb84f4aa64 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -35,7 +35,7 @@ return [ | */ - 'default' => env('BROADCAST_DRIVER', 'null'), + 'default' => env('BROADCAST_DRIVER', 'null'), /* |-------------------------------------------------------------------------- @@ -67,21 +67,21 @@ return [ ], ], - 'ably' => [ + 'ably' => [ 'driver' => 'ably', 'key' => env('ABLY_KEY'), ], - 'redis' => [ + 'redis' => [ 'driver' => 'redis', 'connection' => 'default', ], - 'log' => [ + 'log' => [ 'driver' => 'log', ], - 'null' => [ + 'null' => [ 'driver' => 'null', ], ], diff --git a/config/cache.php b/config/cache.php index bac320509d..94cc4d9f14 100644 --- a/config/cache.php +++ b/config/cache.php @@ -48,23 +48,23 @@ return [ | */ - 'stores' => [ - 'apc' => [ + 'stores' => [ + 'apc' => [ 'driver' => 'apc', ], - 'array' => [ + 'array' => [ 'driver' => 'array', 'serialize' => false, ], - 'database' => [ + 'database' => [ 'driver' => 'database', 'table' => 'cache', 'connection' => null, ], - 'file' => [ + 'file' => [ 'driver' => 'file', 'path' => storage_path('framework/cache/data'), ], @@ -88,11 +88,11 @@ return [ ], ], - 'redis' => [ + 'redis' => [ 'driver' => 'redis', 'connection' => 'default', ], - 'dynamodb' => [ + 'dynamodb' => [ 'driver' => 'dynamodb', 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), @@ -113,5 +113,5 @@ return [ | */ - 'prefix' => env('CACHE_PREFIX', 'firefly'), + 'prefix' => env('CACHE_PREFIX', 'firefly'), ]; diff --git a/config/cors.php b/config/cors.php index cbfc4d044e..a921cdfc57 100644 --- a/config/cors.php +++ b/config/cors.php @@ -36,19 +36,19 @@ return [ | */ - 'paths' => ['api/*', 'sanctum/csrf-cookie'], + 'paths' => ['api/*', 'sanctum/csrf-cookie'], - 'allowed_methods' => ['*'], + 'allowed_methods' => ['*'], - 'allowed_origins' => ['*'], + 'allowed_origins' => ['*'], 'allowed_origins_patterns' => ['*'], - 'allowed_headers' => ['*'], + 'allowed_headers' => ['*'], - 'exposed_headers' => [], + 'exposed_headers' => [], - 'max_age' => 0, + 'max_age' => 0, - 'supports_credentials' => false, + 'supports_credentials' => false, ]; diff --git a/config/database.php b/config/database.php index 34755ed3a8..67410f7f7d 100644 --- a/config/database.php +++ b/config/database.php @@ -23,12 +23,12 @@ declare(strict_types=1); use Illuminate\Support\Str; -$databaseUrl = getenv('DATABASE_URL'); -$host = ''; -$username = ''; -$password = ''; -$database = ''; -$port = ''; +$databaseUrl = getenv('DATABASE_URL'); +$host = ''; +$username = ''; +$password = ''; +$database = ''; +$port = ''; if (false !== $databaseUrl) { $options = parse_url($databaseUrl); @@ -47,8 +47,8 @@ $mysql_ssl_key = envNonEmpty('MYSQL_SSL_KEY', null); $mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER', null); $mysql_ssl_verify = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null); -$mySqlSSLOptions = []; -$useSSL = envNonEmpty('MYSQL_USE_SSL', false); +$mySqlSSLOptions = []; +$useSSL = envNonEmpty('MYSQL_USE_SSL', false); if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) { if (null !== $mysql_ssl_ca_dir) { $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir; diff --git a/config/debugbar.php b/config/debugbar.php index e2cf2bf6b1..8260a9d88b 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -34,8 +34,8 @@ return [ | */ - 'enabled' => env('DEBUGBAR_ENABLED', null), - 'except' => [ + 'enabled' => env('DEBUGBAR_ENABLED', null), + 'except' => [ 'telescope*', ], @@ -51,7 +51,7 @@ return [ | can also be used. For PDO, run the package migrations first. | */ - 'storage' => [ + 'storage' => [ 'enabled' => true, 'driver' => 'file', // redis, file, pdo, custom 'path' => storage_path('debugbar'), // For file driver @@ -120,7 +120,7 @@ return [ | */ - 'collectors' => [ + 'collectors' => [ 'phpinfo' => true, // Php version 'messages' => true, // Messages 'time' => true, // Time Datalogger @@ -154,7 +154,7 @@ return [ | */ - 'options' => [ + 'options' => [ 'auth' => [ 'show_name' => true, // Also show the users name/email in the debugbar ], @@ -197,7 +197,7 @@ return [ | */ - 'inject' => true, + 'inject' => true, /* |-------------------------------------------------------------------------- @@ -209,7 +209,7 @@ return [ | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97 | */ - 'route_prefix' => '_debugbar', + 'route_prefix' => '_debugbar', /* |-------------------------------------------------------------------------- @@ -219,5 +219,5 @@ return [ | By default DebugBar route served from the same domain that request served. | To override default domain, specify it as a non-empty value. */ - 'route_domain' => null, + 'route_domain' => null, ]; diff --git a/config/filesystems.php b/config/filesystems.php index a15413d68b..2d2998984c 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -51,7 +51,7 @@ return [ | */ - 'disks' => [ + 'disks' => [ 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), @@ -85,7 +85,7 @@ return [ 'root' => base_path('resources'), ], - 'public' => [ + 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), 'url' => env('APP_URL').'/storage', diff --git a/config/firefly.php b/config/firefly.php index 6edc877339..be1f5fa60b 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -431,7 +431,7 @@ return [ 'transfers' => 'fa-exchange', ], - 'bindables' => [ + 'bindables' => [ // models 'account' => Account::class, 'attachment' => Attachment::class, @@ -488,7 +488,7 @@ return [ 'userGroupBill' => UserGroupBill::class, 'userGroup' => UserGroup::class, ], - 'rule-actions' => [ + 'rule-actions' => [ 'set_category' => SetCategory::class, 'clear_category' => ClearCategory::class, 'set_budget' => SetBudget::class, @@ -519,7 +519,7 @@ return [ 'set_source_to_cash' => SetSourceToCashAccount::class, 'set_destination_to_cash' => SetDestinationToCashAccount::class, ], - 'context-rule-actions' => [ + 'context-rule-actions' => [ 'set_category', 'set_budget', 'add_tag', @@ -538,13 +538,13 @@ return [ 'convert_transfer', ], - 'test-triggers' => [ + 'test-triggers' => [ 'limit' => 10, 'range' => 200, ], // expected source types for each transaction type, in order of preference. - 'expected_source_types' => [ + 'expected_source_types' => [ 'source' => [ TransactionTypeModel::WITHDRAWAL => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], TransactionTypeEnum::DEPOSIT->value => [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::REVENUE, AccountType::CASH], @@ -589,7 +589,7 @@ return [ TransactionTypeModel::LIABILITY_CREDIT => [AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], ], ], - 'allowed_opposing_types' => [ + 'allowed_opposing_types' => [ 'source' => [ AccountType::ASSET => [ AccountType::ASSET, @@ -679,7 +679,7 @@ return [ ], ], // depending on the account type, return the allowed transaction types: - 'allowed_transaction_types' => [ + 'allowed_transaction_types' => [ 'source' => [ AccountType::ASSET => [ TransactionTypeModel::WITHDRAWAL, @@ -748,7 +748,7 @@ return [ ], // having the source + dest will tell you the transaction type. - 'account_to_transaction' => [ + 'account_to_transaction' => [ AccountType::ASSET => [ AccountType::ASSET => TransactionTypeModel::TRANSFER, AccountType::CASH => TransactionTypeModel::WITHDRAWAL, @@ -813,7 +813,7 @@ return [ ], // allowed source -> destination accounts. - 'source_dests' => [ + 'source_dests' => [ TransactionTypeModel::WITHDRAWAL => [ AccountType::ASSET => [AccountType::EXPENSE, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::CASH], AccountType::LOAN => [AccountType::EXPENSE, AccountType::CASH], @@ -852,7 +852,7 @@ return [ ], ], // if you add fields to this array, don't forget to update the export routine (ExportDataGenerator). - 'journal_meta_fields' => [ + 'journal_meta_fields' => [ // sepa 'sepa_cc', 'sepa_ct_op', @@ -886,28 +886,28 @@ return [ 'recurrence_count', 'recurrence_date', ], - 'webhooks' => [ + 'webhooks' => [ 'max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3), ], - 'can_have_virtual_amounts' => [AccountType::ASSET], - 'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], - 'dynamic_creation_allowed' => [ + 'can_have_virtual_amounts' => [AccountType::ASSET], + 'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], + 'dynamic_creation_allowed' => [ AccountType::EXPENSE, AccountType::REVENUE, AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION, AccountType::LIABILITY_CREDIT, ], - 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'], - 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'], - 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'], + 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'], + 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'], + 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'], // dynamic date ranges are as follows: - 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'], + 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'], // only used in v1 - 'allowed_sort_parameters' => ['order', 'name', 'iban'], + 'allowed_sort_parameters' => ['order', 'name', 'iban'], // preselected account lists possibilities: - 'preselected_accounts' => ['all', 'assets', 'liabilities'], + 'preselected_accounts' => ['all', 'assets', 'liabilities'], ]; diff --git a/config/google2fa.php b/config/google2fa.php index bcf0b19822..a765f3ef25 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -26,22 +26,22 @@ use PragmaRX\Google2FALaravel\Support\Constants; return [ // Auth container binding - 'enabled' => true, + 'enabled' => true, /* * Lifetime in minutes. * In case you need your users to be asked for a new one time passwords from time to time. */ - 'lifetime' => 0, // 0 = eternal + 'lifetime' => 0, // 0 = eternal // Renew lifetime at every new request. - 'keep_alive' => true, + 'keep_alive' => true, // Auth container binding - 'auth' => 'auth', + 'auth' => 'auth', // 2FA verified session var @@ -70,7 +70,7 @@ return [ // Throw exceptions or just fire events? 'throw_exceptions' => true, - 'store_in_cookie' => true, + 'store_in_cookie' => true, 'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG, ]; diff --git a/config/hashing.php b/config/hashing.php index 5a928e2e5e..87143f8ab8 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -64,7 +64,7 @@ return [ | */ - 'argon' => [ + 'argon' => [ 'memory' => 65536, 'threads' => 1, 'time' => 4, diff --git a/config/ide-helper.php b/config/ide-helper.php index 2ead082aff..ba5106bd66 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -31,10 +31,10 @@ return [ | */ - 'filename' => '_ide_helper', - 'format' => 'php', + 'filename' => '_ide_helper', + 'format' => 'php', - 'meta_filename' => '.phpstorm.meta.php', + 'meta_filename' => '.phpstorm.meta.php', /* |-------------------------------------------------------------------------- @@ -45,7 +45,7 @@ return [ | */ - 'include_fluent' => true, + 'include_fluent' => true, /* |-------------------------------------------------------------------------- @@ -56,7 +56,7 @@ return [ | */ - 'write_model_magic_where' => true, + 'write_model_magic_where' => true, /* |-------------------------------------------------------------------------- @@ -83,9 +83,9 @@ return [ | */ - 'include_helpers' => false, + 'include_helpers' => false, - 'helper_files' => [ + 'helper_files' => [ base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php', ], @@ -99,7 +99,7 @@ return [ | */ - 'model_locations' => [ + 'model_locations' => [ 'app', ], @@ -112,12 +112,12 @@ return [ | */ - 'extra' => [ + 'extra' => [ 'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'], 'Session' => ['Illuminate\Session\Store'], ], - 'magic' => [ + 'magic' => [ 'Log' => [ 'debug' => 'Monolog\Logger::addDebug', 'info' => 'Monolog\Logger::addInfo', diff --git a/config/intro.php b/config/intro.php index fcfbd0aa01..c65b946c40 100644 --- a/config/intro.php +++ b/config/intro.php @@ -25,7 +25,7 @@ declare(strict_types=1); return [ // index - 'index' => [ + 'index' => [ 'intro' => [], 'accounts-chart' => ['element' => '#accounts-chart'], 'box_out_holder' => ['element' => '#box_out_holder'], @@ -35,11 +35,11 @@ return [ 'outro' => [], ], // accounts: create - 'accounts_create' => [ + 'accounts_create' => [ 'iban' => ['element' => '#ffInput_iban'], ], // transactions: create - 'transactions_create' => [ + 'transactions_create' => [ 'basic_info' => ['element' => '#transaction-info', 'position' => 'right'], 'amount_info' => ['element' => '#amount-info', 'position' => 'bottom'], 'optional_info' => ['element' => '#optional-info', 'position' => 'left'], @@ -49,21 +49,21 @@ return [ 'transactions_create_withdrawal' => [ ], - 'transactions_create_deposit' => [ + 'transactions_create_deposit' => [ ], - 'transactions_create_transfer' => [ + 'transactions_create_transfer' => [ ], // extra text for asset account creation. - 'accounts_create_asset' => [ + 'accounts_create_asset' => [ 'opening_balance' => ['element' => '#ffInput_opening_balance'], 'currency' => ['element' => '#ffInput_currency_id'], 'virtual' => ['element' => '#ffInput_virtual_balance'], ], // budgets: index - 'budgets_index' => [ + 'budgets_index' => [ 'intro' => [], 'set_budget' => ['element' => '#availableBar'], 'see_expenses_bar' => ['element' => '#spentBar'], @@ -73,59 +73,59 @@ return [ 'outro' => [], ], // reports: index, default report, audit, budget, cat, tag - 'reports_index' => [ + 'reports_index' => [ 'intro' => [], 'inputReportType' => ['element' => '#inputReportType'], 'inputAccountsSelect' => ['element' => '#inputAccountsSelect'], 'inputDateRange' => ['element' => '#inputDateRange'], 'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'], ], - 'reports_report_default' => [ + 'reports_report_default' => [ 'intro' => [], ], - 'reports_report_audit' => [ + 'reports_report_audit' => [ 'intro' => [], 'optionsBox' => ['element' => '#optionsBox'], ], - 'reports_report_category' => [ + 'reports_report_category' => [ 'intro' => [], 'pieCharts' => ['element' => '#pieCharts'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], ], - 'reports_report_tag' => [ + 'reports_report_tag' => [ 'intro' => [], 'pieCharts' => ['element' => '#pieCharts'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], ], - 'reports_report_budget' => [ + 'reports_report_budget' => [ 'intro' => [], 'pieCharts' => ['element' => '#pieCharts'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], ], // piggies: index, create, show - 'piggy-banks_index' => [ + 'piggy-banks_index' => [ 'saved' => ['element' => '.piggySaved'], 'button' => ['element' => '.piggyBar'], 'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'], ], - 'piggy-banks_create' => [ + 'piggy-banks_create' => [ 'name' => ['element' => '#ffInput_name'], 'date' => ['element' => '#ffInput_targetdate'], ], - 'piggy-banks_show' => [ + 'piggy-banks_show' => [ 'piggyChart' => ['element' => '#piggyChart'], 'piggyDetails' => ['element' => '#piggyDetails'], 'piggyEvents' => ['element' => '#piggyEvents'], ], // bills: index, create, show - 'bills_index' => [ + 'bills_index' => [ 'rules' => ['element' => '.rules'], 'paid_in_period' => ['element' => '.paid_in_period'], 'expected_in_period' => ['element' => '.expected_in_period'], ], - 'bills_create' => [ + 'bills_create' => [ 'intro' => [], 'name' => ['element' => '#name_holder'], // 'match' => ['element' => '#match_holder'], @@ -133,13 +133,13 @@ return [ 'repeat_freq_holder' => ['element' => '#repeat_freq_holder'], 'skip_holder' => ['element' => '#skip_holder'], ], - 'bills_show' => [ + 'bills_show' => [ 'billInfo' => ['element' => '#billInfo'], 'billButtons' => ['element' => '#billButtons'], 'billChart' => ['element' => '#billChart', 'position' => 'top'], ], // rules: index, create-rule, edit-rule - 'rules_index' => [ + 'rules_index' => [ 'intro' => [], 'new_rule_group' => ['element' => '#new_rule_group'], 'new_rule' => ['element' => '.new_rule'], @@ -148,23 +148,23 @@ return [ 'rule-triggers' => ['element' => '.rule-triggers'], 'outro' => [], ], - 'rules_create' => [ + 'rules_create' => [ 'mandatory' => ['element' => '#mandatory'], 'ruletriggerholder' => ['element' => '.rule-trigger-box'], 'test_rule_triggers' => ['element' => '.test_rule_triggers'], 'actions' => ['element' => '.rule-action-box', 'position' => 'top'], ], // preferences: index - 'preferences_index' => [ + 'preferences_index' => [ 'tabs' => ['element' => '.nav-tabs'], ], // currencies: index, create - 'currencies_index' => [ + 'currencies_index' => [ 'intro' => [], 'default' => ['element' => '#default-currency'], 'buttons' => ['element' => '.buttons'], ], - 'currencies_create' => [ + 'currencies_create' => [ 'code' => ['element' => '#ffInput_code'], ], ]; diff --git a/config/logging.php b/config/logging.php index 667ec95e05..53108ae1cb 100644 --- a/config/logging.php +++ b/config/logging.php @@ -25,16 +25,16 @@ use FireflyIII\Support\Logging\AuditLogger; use Monolog\Handler\SyslogUdpHandler; // standard config for both log things: -$defaultChannels = ['daily', 'stdout']; -$auditChannels = ['audit_daily', 'audit_stdout']; +$defaultChannels = ['daily', 'stdout']; +$auditChannels = ['audit_daily', 'audit_stdout']; // validChannels is missing 'stack' because we already check for that one. $validChannels = ['single', 'papertrail', 'stdout', 'daily', 'syslog', 'errorlog']; $validAuditChannels = ['audit_papertrail', 'audit_stdout', 'audit_stdout', 'audit_daily', 'audit_syslog', 'audit_errorlog']; // which settings did the user set, if any? -$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack'); -$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', ''); +$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack'); +$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', ''); if ('stack' === $defaultLogChannel) { $defaultChannels = ['daily', 'stdout']; @@ -59,8 +59,8 @@ return [ | */ - 'default' => envNonEmpty('LOG_CHANNEL', 'stack'), - 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), + 'default' => envNonEmpty('LOG_CHANNEL', 'stack'), + 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), /* |-------------------------------------------------------------------------- | Log Channels diff --git a/config/mail.php b/config/mail.php index 59ea401c04..1bf2552615 100644 --- a/config/mail.php +++ b/config/mail.php @@ -32,10 +32,10 @@ return [ | and used as needed; however, this mailer will be used by default. | */ - 'default' => envNonEmpty('MAIL_MAILER', 'log'), + 'default' => envNonEmpty('MAIL_MAILER', 'log'), - 'mailers' => [ - 'smtp' => [ + 'mailers' => [ + 'smtp' => [ 'transport' => 'smtp', 'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'), 'port' => (int)env('MAIL_PORT', 2525), @@ -46,11 +46,11 @@ return [ 'verify_peer' => null !== env('MAIL_ENCRYPTION'), ], - 'ses' => [ + 'ses' => [ 'transport' => 'ses', ], - 'mailgun' => [ + 'mailgun' => [ 'transport' => 'mailgun', ], @@ -77,7 +77,7 @@ return [ 'level' => 'notice', ], - 'array' => [ + 'array' => [ 'transport' => 'array', ], ], diff --git a/config/passport.php b/config/passport.php index 76579537d9..cc33818b0a 100644 --- a/config/passport.php +++ b/config/passport.php @@ -34,7 +34,7 @@ return [ | */ - 'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'), + 'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'), /* |-------------------------------------------------------------------------- @@ -47,9 +47,9 @@ return [ | */ - 'private_key' => env('PASSPORT_PRIVATE_KEY'), + 'private_key' => env('PASSPORT_PRIVATE_KEY'), - 'public_key' => env('PASSPORT_PUBLIC_KEY'), + 'public_key' => env('PASSPORT_PUBLIC_KEY'), /* |-------------------------------------------------------------------------- @@ -62,7 +62,7 @@ return [ | */ - 'client_uuids' => false, + 'client_uuids' => false, /* |-------------------------------------------------------------------------- diff --git a/config/queue.php b/config/queue.php index 559e245a95..ad87f1e717 100644 --- a/config/queue.php +++ b/config/queue.php @@ -34,7 +34,7 @@ return [ | */ - 'default' => env('QUEUE_CONNECTION', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'sync'), /* |-------------------------------------------------------------------------- @@ -50,11 +50,11 @@ return [ */ 'connections' => [ - 'sync' => [ + 'sync' => [ 'driver' => 'sync', ], - 'database' => [ + 'database' => [ 'driver' => 'database', 'table' => 'jobs', 'queue' => 'default', @@ -69,7 +69,7 @@ return [ 'block_for' => 0, ], - 'sqs' => [ + 'sqs' => [ 'driver' => 'sqs', 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), @@ -79,7 +79,7 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], - 'redis' => [ + 'redis' => [ 'driver' => 'redis', 'connection' => 'default', 'queue' => env('REDIS_QUEUE', 'default'), @@ -99,7 +99,7 @@ return [ | */ - 'failed' => [ + 'failed' => [ 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', diff --git a/config/sanctum.php b/config/sanctum.php index 03ee208a26..67921d9dd2 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -37,7 +37,7 @@ return [ | */ - 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')), + 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')), /* |-------------------------------------------------------------------------- @@ -51,7 +51,7 @@ return [ | */ - 'guard' => [env('AUTHENTICATION_GUARD', 'web')], + 'guard' => [env('AUTHENTICATION_GUARD', 'web')], /* |-------------------------------------------------------------------------- diff --git a/config/services.php b/config/services.php index 2f4d7bfc25..24825d4f2c 100644 --- a/config/services.php +++ b/config/services.php @@ -34,13 +34,13 @@ return [ | */ - 'mailgun' => [ + 'mailgun' => [ 'domain' => env('MAILGUN_DOMAIN'), 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), 'secret' => env('MAILGUN_SECRET'), ], - 'ses' => [ + 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', @@ -50,12 +50,12 @@ return [ 'secret' => env('SPARKPOST_SECRET'), ], - 'stripe' => [ + 'stripe' => [ 'model' => FireflyIII\User::class, 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], - 'mandrill' => [ + 'mandrill' => [ 'secret' => env('MANDRILL_SECRET'), ], ]; diff --git a/config/twigbridge.php b/config/twigbridge.php index 5f3dec4e86..da8d491d82 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -54,7 +54,7 @@ use TwigBridge\Extension\Loader\Globals; // Configuration options for Twig. return [ - 'twig' => [ + 'twig' => [ 'extension' => 'twig', 'environment' => [ 'debug' => env('APP_DEBUG', false), diff --git a/config/view.php b/config/view.php index d240484f07..cb8bb9e057 100644 --- a/config/view.php +++ b/config/view.php @@ -40,7 +40,7 @@ return [ | */ - 'paths' => $paths, + 'paths' => $paths, /* |--------------------------------------------------------------------------