diff --git a/bootstrap/app.php b/bootstrap/app.php index 1f310951ec..55559bf577 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -1,7 +1,7 @@ . */ - declare(strict_types=1); use FireflyIII\Providers\ImportServiceProvider; - return [ 'name' => envNonEmpty('APP_NAME', 'Firefly III'), 'env' => envNonEmpty('APP_ENV', 'local'), diff --git a/config/auth.php b/config/auth.php index 5c0516af44..077aac8e09 100644 --- a/config/auth.php +++ b/config/auth.php @@ -1,7 +1,7 @@ [ 'users' => [ - 'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),//'adldap', + 'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), //'adldap', 'model' => FireflyIII\User::class, ], ], diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index d873e66089..a82ac79402 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -2,7 +2,7 @@ /** * breadcrumbs.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -23,7 +23,6 @@ declare(strict_types=1); return [ - /* |-------------------------------------------------------------------------- | View Name diff --git a/config/broadcasting.php b/config/broadcasting.php index bb55e20481..fdaad57463 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -1,7 +1,7 @@ SnsDescription::class, 'PresidentsChoice' => PresidentsChoice::class, 'Belfius' => Belfius::class, - 'IngBelgium' => IngBelgium::class + 'IngBelgium' => IngBelgium::class, ], /* @@ -88,7 +87,6 @@ return [ 'converter' => 'Ignore', 'mapper' => null, - ], 'bill-id' => [ 'mappable' => true, diff --git a/config/database.php b/config/database.php index 75b364a2d5..3ec1f3e55b 100644 --- a/config/database.php +++ b/config/database.php @@ -1,7 +1,7 @@ envNonEmpty('DB_CONNECTION', 'pgsql'), 'connections' => [ 'sqlite' => [ diff --git a/config/debugbar.php b/config/debugbar.php index 249bbb080e..746b3f780c 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,9 +1,10 @@ env('DEBUGBAR_ENABLED', null), - 'except' => [ - 'telescope*' + 'except' => [ + 'telescope*', ], /* @@ -57,7 +57,7 @@ return [ 'driver' => 'file', // redis, file, pdo, custom 'path' => storage_path('debugbar'), // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - 'provider' => '' // Instance of StorageInterface for custom driver + 'provider' => '', // Instance of StorageInterface for custom driver ], /* @@ -87,7 +87,7 @@ return [ | Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools. */ - 'capture_ajax' => true, + 'capture_ajax' => true, 'add_ajax_timing' => false, /* @@ -163,26 +163,26 @@ return [ 'with_params' => true, // Render SQL with the parameters substituted 'backtrace' => true, // Use a backtrace to find the origin of the query in your files. 'timeline' => false, // Add the queries to the timeline - 'explain' => [ // Show EXPLAIN output on queries + 'explain' => [ // Show EXPLAIN output on queries 'enabled' => false, - 'types' => ['SELECT'], // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+ + 'types' => ['SELECT'], // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+ ], 'hints' => true, // Show hints for common mistakes ], 'mail' => [ - 'full_log' => false + 'full_log' => false, ], 'views' => [ 'data' => true, //Note: Can slow down the application, because the data can be quite large.. ], 'route' => [ - 'label' => true // show complete route on bar + 'label' => true, // show complete route on bar ], 'logs' => [ - 'file' => null + 'file' => null, ], 'cache' => [ - 'values' => true // collect cache values + 'values' => true, // collect cache values ], ], diff --git a/config/filesystems.php b/config/filesystems.php index d033ae2ebf..4db063d31a 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -1,7 +1,7 @@ [ 'local', diff --git a/config/firefly.php b/config/firefly.php index e4db448601..7c23ddde8e 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -1,9 +1,8 @@ false, ], 'feature_flags' => [ - 'export' => true, + 'export' => true, 'telemetry' => false, ], @@ -182,7 +181,6 @@ return [ /* PDF */ 'application/pdf', - /* MS word */ 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', @@ -246,66 +244,61 @@ return [ '1Y' => 'yearly', 'custom' => 'custom', ], - 'subTitlesByIdentifier' => - [ - 'asset' => 'Asset accounts', - 'expense' => 'Expense accounts', - 'revenue' => 'Revenue accounts', - 'cash' => 'Cash accounts', - 'liabilities' => 'Liabilities', - 'liability' => 'Liabilities', - ], - 'subIconsByIdentifier' => - [ - 'asset' => 'fa-money', - 'Asset account' => 'fa-money', - 'Default account' => 'fa-money', - 'Cash account' => 'fa-money', - 'expense' => 'fa-shopping-cart', - 'Expense account' => 'fa-shopping-cart', - 'Beneficiary account' => 'fa-shopping-cart', - 'revenue' => 'fa-download', - 'Revenue account' => 'fa-download', - 'import' => 'fa-download', - 'Import account' => 'fa-download', - 'liabilities' => 'fa-ticket', - ], - 'accountTypesByIdentifier' => - [ - 'asset' => ['Default account', 'Asset account'], - 'expense' => ['Expense account', 'Beneficiary account'], - 'revenue' => ['Revenue account'], - 'import' => ['Import account'], - 'liabilities' => ['Loan', 'Debt', 'Credit card', 'Mortgage'], - ], - 'accountTypeByIdentifier' => - [ - 'asset' => ['Asset account'], - 'expense' => ['Expense account'], - 'revenue' => ['Revenue account'], - 'opening' => ['Initial balance account'], - 'initial' => ['Initial balance account'], - 'import' => ['Import account'], - 'reconcile' => ['Reconciliation account'], - 'liabilities' => ['Loan', 'Debt', 'Mortgage', 'Credit card'], - 'liability' => ['Loan', 'Debt', 'Mortgage', 'Credit card'], - ], - 'shortNamesByFullName' => - [ - 'Default account' => 'asset', - 'Asset account' => 'asset', - 'Import account' => 'import', - 'Expense account' => 'expense', - 'Beneficiary account' => 'expense', - 'Revenue account' => 'revenue', - 'Cash account' => 'cash', - 'Initial balance account' => 'initial-balance', - 'Reconciliation account' => 'reconciliation', - 'Credit card' => 'liabilities', - 'Loan' => 'liabilities', - 'Debt' => 'liabilities', - 'Mortgage' => 'liabilities', - ], + 'subTitlesByIdentifier' => [ + 'asset' => 'Asset accounts', + 'expense' => 'Expense accounts', + 'revenue' => 'Revenue accounts', + 'cash' => 'Cash accounts', + 'liabilities' => 'Liabilities', + 'liability' => 'Liabilities', + ], + 'subIconsByIdentifier' => [ + 'asset' => 'fa-money', + 'Asset account' => 'fa-money', + 'Default account' => 'fa-money', + 'Cash account' => 'fa-money', + 'expense' => 'fa-shopping-cart', + 'Expense account' => 'fa-shopping-cart', + 'Beneficiary account' => 'fa-shopping-cart', + 'revenue' => 'fa-download', + 'Revenue account' => 'fa-download', + 'import' => 'fa-download', + 'Import account' => 'fa-download', + 'liabilities' => 'fa-ticket', + ], + 'accountTypesByIdentifier' => [ + 'asset' => ['Default account', 'Asset account'], + 'expense' => ['Expense account', 'Beneficiary account'], + 'revenue' => ['Revenue account'], + 'import' => ['Import account'], + 'liabilities' => ['Loan', 'Debt', 'Credit card', 'Mortgage'], + ], + 'accountTypeByIdentifier' => [ + 'asset' => ['Asset account'], + 'expense' => ['Expense account'], + 'revenue' => ['Revenue account'], + 'opening' => ['Initial balance account'], + 'initial' => ['Initial balance account'], + 'import' => ['Import account'], + 'reconcile' => ['Reconciliation account'], + 'liabilities' => ['Loan', 'Debt', 'Mortgage', 'Credit card'], + 'liability' => ['Loan', 'Debt', 'Mortgage', 'Credit card'], + ], + 'shortNamesByFullName' => [ + 'Default account' => 'asset', + 'Asset account' => 'asset', + 'Import account' => 'import', + 'Expense account' => 'expense', + 'Beneficiary account' => 'expense', + 'Revenue account' => 'revenue', + 'Cash account' => 'cash', + 'Initial balance account' => 'initial-balance', + 'Reconciliation account' => 'reconciliation', + 'Credit card' => 'liabilities', + 'Loan' => 'liabilities', + 'Debt' => 'liabilities', + 'Mortgage' => 'liabilities', + ], 'shortLiabilityNameByFullName' => [ 'Credit card' => 'creditcard', 'Loan' => 'loan', @@ -313,7 +306,7 @@ return [ 'Mortgage' => 'mortgage', ], /** - * Languages configuration + * Languages configuration. */ 'languages' => [ // currently enabled languages @@ -337,7 +330,6 @@ return [ 'fi_FI' => ['name_locale' => 'Suomi', 'name_english' => 'Finnish'], 'vi_VN' => ['name_locale' => 'Tiếng Việt', 'name_english' => 'Vietnamese'], - // currently disabled languages: // 'bg_BG' => ['name_locale' => 'Български', 'name_english' => 'Bulgarian'], // 'ca_ES' => ['name_locale' => 'Catalan', 'name_english' => 'Catalan'], @@ -434,7 +426,6 @@ return [ 'tagOrId' => TagOrId::class, 'configName' => ConfigurationName::class, - ], 'rule-triggers' => [ 'user_action' => UserAction::class, @@ -547,7 +538,6 @@ return [ 'notes_are', ], - 'test-triggers' => [ 'limit' => 10, 'range' => 200, @@ -555,8 +545,8 @@ return [ 'default_currency' => 'EUR', 'default_language' => envNonEmpty('DEFAULT_LANGUAGE', 'en_US'), 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', - 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after', 'from', 'to', 'tag', 'created_on', - 'updated_on'], + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after', 'from', 'to', 'tag', 'created_on', + 'updated_on', ], // TODO notes has_attachments 'cer_providers' => [ @@ -569,10 +559,10 @@ return [ 'source' => [ TransactionTypeModel::WITHDRAWAL => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], TransactionTypeModel::DEPOSIT => [AccountType::REVENUE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, - AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION], + AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION, ], TransactionTypeModel::TRANSFER => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], TransactionTypeModel::OPENING_BALANCE => [AccountType::INITIAL_BALANCE, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], TransactionTypeModel::RECONCILIATION => [AccountType::RECONCILIATION, AccountType::ASSET], // in case no transaction type is known yet, it could be anything. 'none' => [ @@ -586,43 +576,43 @@ return [ ], 'destination' => [ TransactionTypeModel::WITHDRAWAL => [AccountType::EXPENSE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], TransactionTypeModel::DEPOSIT => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], TransactionTypeModel::TRANSFER => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], TransactionTypeModel::OPENING_BALANCE => [AccountType::INITIAL_BALANCE, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], TransactionTypeModel::RECONCILIATION => [AccountType::RECONCILIATION, AccountType::ASSET], ], ], 'allowed_opposing_types' => [ 'source' => [ AccountType::ASSET => [AccountType::ASSET, AccountType::CASH, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE, - AccountType::LOAN, AccountType::RECONCILIATION], + AccountType::LOAN, AccountType::RECONCILIATION, ], AccountType::CASH => [AccountType::ASSET], AccountType::DEBT => [AccountType::ASSET, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE, AccountType::LOAN, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], AccountType::EXPENSE => [], // is not allowed as a source. AccountType::INITIAL_BALANCE => [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], AccountType::LOAN => [AccountType::ASSET, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE, AccountType::LOAN, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], AccountType::MORTGAGE => [AccountType::ASSET, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE, AccountType::LOAN, - AccountType::MORTGAGE], + AccountType::MORTGAGE, ], AccountType::RECONCILIATION => [AccountType::ASSET], AccountType::REVENUE => [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], ], 'destination' => [ AccountType::ASSET => [AccountType::ASSET, AccountType::CASH, AccountType::DEBT, AccountType::INITIAL_BALANCE, AccountType::LOAN, - AccountType::MORTGAGE, AccountType::RECONCILIATION, AccountType::REVENUE], + AccountType::MORTGAGE, AccountType::RECONCILIATION, AccountType::REVENUE, ], AccountType::CASH => [AccountType::ASSET], AccountType::DEBT => [AccountType::ASSET, AccountType::DEBT, AccountType::INITIAL_BALANCE, AccountType::LOAN, AccountType::MORTGAGE, - AccountType::REVENUE], + AccountType::REVENUE, ], AccountType::EXPENSE => [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], AccountType::INITIAL_BALANCE => [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], AccountType::LOAN => [AccountType::ASSET, AccountType::DEBT, AccountType::INITIAL_BALANCE, AccountType::LOAN, AccountType::MORTGAGE, - AccountType::REVENUE], + AccountType::REVENUE, ], AccountType::MORTGAGE => [AccountType::ASSET, AccountType::DEBT, AccountType::INITIAL_BALANCE, AccountType::LOAN, AccountType::MORTGAGE, - AccountType::REVENUE], + AccountType::REVENUE, ], AccountType::RECONCILIATION => [AccountType::ASSET], AccountType::REVENUE => [], // is not allowed as a destination ], @@ -631,29 +621,29 @@ return [ 'allowed_transaction_types' => [ 'source' => [ AccountType::ASSET => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::TRANSFER, TransactionTypeModel::OPENING_BALANCE, - TransactionTypeModel::RECONCILIATION], + TransactionTypeModel::RECONCILIATION, ], AccountType::EXPENSE => [], // is not allowed as a source. AccountType::REVENUE => [TransactionTypeModel::DEPOSIT], AccountType::LOAN => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::DEBT => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::MORTGAGE => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::INITIAL_BALANCE => [], // todo fill me in. AccountType::RECONCILIATION => [], // todo fill me in. ], 'destination' => [ AccountType::ASSET => [TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, TransactionTypeModel::OPENING_BALANCE, - TransactionTypeModel::RECONCILIATION], + TransactionTypeModel::RECONCILIATION, ], AccountType::EXPENSE => [TransactionTypeModel::WITHDRAWAL], AccountType::REVENUE => [], // is not allowed as destination. AccountType::LOAN => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::DEBT => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::MORTGAGE => [TransactionTypeModel::WITHDRAWAL, TransactionTypeModel::DEPOSIT, TransactionTypeModel::TRANSFER, - TransactionTypeModel::OPENING_BALANCE], + TransactionTypeModel::OPENING_BALANCE, ], AccountType::INITIAL_BALANCE => [], // todo fill me in. AccountType::RECONCILIATION => [], // todo fill me in. ], diff --git a/config/google2fa.php b/config/google2fa.php index 5f65f69f59..91a2557661 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -1,7 +1,7 @@ true, - 'store_in_cookie' => true, ]; diff --git a/config/hashing.php b/config/hashing.php index 597161680b..c3615a8a3a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -2,7 +2,7 @@ /** * hashing.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -23,7 +23,6 @@ declare(strict_types=1); return [ - /* |-------------------------------------------------------------------------- | Default Hash Driver diff --git a/config/ide-helper.php b/config/ide-helper.php index a09660a922..61a07e1f00 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -1,7 +1,7 @@ '_ide_helper', 'format' => 'php', - + 'meta_filename' => '.phpstorm.meta.php', /* @@ -86,9 +85,9 @@ return array( 'include_helpers' => false, - 'helper_files' => array( - base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php', - ), + 'helper_files' => [ + base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php', + ], /* |-------------------------------------------------------------------------- @@ -100,10 +99,9 @@ return array( | */ - 'model_locations' => array( + 'model_locations' => [ 'app', - ), - + ], /* |-------------------------------------------------------------------------- @@ -114,13 +112,13 @@ return array( | */ - 'extra' => array( - 'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'), - 'Session' => array('Illuminate\Session\Store'), - ), + 'extra' => [ + 'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'], + 'Session' => ['Illuminate\Session\Store'], + ], - 'magic' => array( - 'Log' => array( + 'magic' => [ + 'Log' => [ 'debug' => 'Monolog\Logger::addDebug', 'info' => 'Monolog\Logger::addInfo', 'notice' => 'Monolog\Logger::addNotice', @@ -129,8 +127,8 @@ return array( 'critical' => 'Monolog\Logger::addCritical', 'alert' => 'Monolog\Logger::addAlert', 'emergency' => 'Monolog\Logger::addEmergency', - ) - ), + ], + ], /* |-------------------------------------------------------------------------- @@ -142,9 +140,9 @@ return array( | */ - 'interfaces' => array( + 'interfaces' => [ - ), + ], /* |-------------------------------------------------------------------------- @@ -172,9 +170,9 @@ return array( | ), | */ - 'custom_db_types' => array( + 'custom_db_types' => [ - ), + ], /* |-------------------------------------------------------------------------- @@ -210,10 +208,10 @@ return array( | Cast the given "real type" to the given "type". | */ - 'type_overrides' => array( + 'type_overrides' => [ 'integer' => 'int', 'boolean' => 'bool', - ), + ], /* |-------------------------------------------------------------------------- @@ -226,4 +224,4 @@ return array( */ 'include_class_docblocks' => false, -); +]; diff --git a/config/import.php b/config/import.php index da6f6581f4..46bf8eb5f3 100644 --- a/config/import.php +++ b/config/import.php @@ -2,7 +2,7 @@ /** * import.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * diff --git a/config/intro.php b/config/intro.php index 743bbade24..18b5962217 100644 --- a/config/intro.php +++ b/config/intro.php @@ -1,7 +1,7 @@ ['element' => '#box_out_holder'], 'help' => ['element' => '#help', 'position' => 'bottom'], 'sidebar-toggle' => ['element' => '#sidebar-toggle', 'position' => 'bottom'], - 'cash_account' => ['element' => '#all_transactions','position' => 'left'], + 'cash_account' => ['element' => '#all_transactions', 'position' => 'left'], 'outro' => [], ], // accounts: create @@ -42,24 +42,24 @@ return [ ], // transactions: create 'transactions_create_withdrawal' => [ - 'source' => ['element' => 'input[name="source[]"]'], + 'source' => ['element' => 'input[name="source[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'], - 'more_meta' => ['element' => 'input[name="category[]"]'], - 'split_add' => ['element' => '.split_add_btn'], + 'more_meta' => ['element' => 'input[name="category[]"]'], + 'split_add' => ['element' => '.split_add_btn'], ], 'transactions_create_deposit' => [ - 'source' => ['element' => 'input[name="source[]"]'], + 'source' => ['element' => 'input[name="source[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'], - 'more_meta' => ['element' => 'input[name="category[]"]'], - 'split_add' => ['element' => '.split_add_btn'], + 'more_meta' => ['element' => 'input[name="category[]"]'], + 'split_add' => ['element' => '.split_add_btn'], ], 'transactions_create_transfer' => [ - 'source' => ['element' => 'input[name="source[]"]'], + 'source' => ['element' => 'input[name="source[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'], - 'more_meta' => ['element' => 'input[name="category[]"]'], - 'split_add' => ['element' => '.split_add_btn'], + 'more_meta' => ['element' => 'input[name="category[]"]'], + 'split_add' => ['element' => '.split_add_btn'], ], // extra text for asset account creation. @@ -72,7 +72,7 @@ return [ // budgets: index 'budgets_index' => [ 'intro' => [], - 'set_budget' => ['element' => '#availableBar',], + 'set_budget' => ['element' => '#availableBar'], 'see_expenses_bar' => ['element' => '#spentBar'], 'navigate_periods' => ['element' => '#periodNavigator'], 'new_budget' => ['element' => '#createBudgetBox'], @@ -115,7 +115,7 @@ return [ // piggies: index, create, show 'piggy-banks_index' => [ 'saved' => ['element' => '.piggySaved'], - 'button' => ['element' => '.piggyBar',], + 'button' => ['element' => '.piggyBar'], 'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'], ], 'piggy-banks_create' => [ @@ -173,9 +173,9 @@ return [ 'currencies_index' => [ 'intro' => [], 'default' => ['element' => '#default-currency'], - 'buttons' => ['element' => '.buttons',] + 'buttons' => ['element' => '.buttons'], ], 'currencies_create' => [ - 'code' => ['element' => '#ffInput_code',], + 'code' => ['element' => '#ffInput_code'], ], ]; diff --git a/config/ldap.php b/config/ldap.php index b4265b9dc2..5ac78296da 100644 --- a/config/ldap.php +++ b/config/ldap.php @@ -2,7 +2,7 @@ /** * ldap.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -37,8 +37,8 @@ if ('FreeIPA' === envNonEmpty('ADLDAP_CONNECTION_SCHEME', 'OpenLDAP')) { if ('ActiveDirectory' === envNonEmpty('ADLDAP_CONNECTION_SCHEME', 'OpenLDAP')) { $schema = ActiveDirectory::class; } -return [ +return [ /* |-------------------------------------------------------------------------- | Connections diff --git a/config/ldap_auth.php b/config/ldap_auth.php index 16ee89cbbd..04ba98b752 100644 --- a/config/ldap_auth.php +++ b/config/ldap_auth.php @@ -2,7 +2,7 @@ /** * ldap_auth.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -25,7 +25,6 @@ declare(strict_types=1); use Adldap\Laravel\Scopes\UidScope; use Adldap\Laravel\Scopes\UpnScope; - // default OpenLDAP scopes. $scopes = [ UidScope::class, @@ -39,9 +38,7 @@ if ('ActiveDirectory' === env('ADLDAP_CONNECTION_SCHEME')) { ]; } - return [ - /* |-------------------------------------------------------------------------- | Connection @@ -78,7 +75,6 @@ return [ 'provider' => Adldap\Laravel\Auth\DatabaseUserProvider::class, //'provider' => Adldap\Laravel\Auth\NoDatabaseUserProvider::class, - /* |-------------------------------------------------------------------------- | Model @@ -174,7 +170,7 @@ return [ 'ldap' => [ 'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'), - 'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'), + 'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'), ], diff --git a/config/logging.php b/config/logging.php index 9240961a9b..dc1b9c4122 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,7 +1,7 @@ . */ - declare(strict_types=1); use FireflyIII\Support\Logging\AuditLogger; return [ - /* |-------------------------------------------------------------------------- | Default Log Channel @@ -38,7 +36,7 @@ return [ */ 'default' => envNonEmpty('LOG_CHANNEL', 'stack'), - 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), + 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), /* |-------------------------------------------------------------------------- | Log Channels diff --git a/config/mail.php b/config/mail.php index b4c40e74e7..1a3183e064 100644 --- a/config/mail.php +++ b/config/mail.php @@ -1,7 +1,7 @@ ['address' => envNonEmpty('MAIL_FROM', 'changeme@example.com'), 'name' => 'Firefly III Mailer'], - /* |-------------------------------------------------------------------------- | E-Mail Encryption Protocol diff --git a/config/queue.php b/config/queue.php index 092f100aa6..d0b341a312 100644 --- a/config/queue.php +++ b/config/queue.php @@ -1,7 +1,7 @@ [ - 'domain' => env('MAILGUN_DOMAIN'), - 'endpoint' => env('MAILGUN_ENDPOINT','api.mailgun.net'), - 'secret' => env('MAILGUN_SECRET'), + 'domain' => env('MAILGUN_DOMAIN'), + 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), + 'secret' => env('MAILGUN_SECRET'), ], 'ses' => [ diff --git a/config/session.php b/config/session.php index f15260bbd8..7458e597fa 100644 --- a/config/session.php +++ b/config/session.php @@ -1,7 +1,7 @@ env('SESSION_DRIVER', 'file'), 'lifetime' => 120, diff --git a/config/twigbridge.php b/config/twigbridge.php index 56dee25508..4f4d170c0e 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -1,5 +1,7 @@ [ /* |-------------------------------------------------------------------------- @@ -181,13 +182,12 @@ return [ 'Steam', 'Config', 'Request', - 'Form' => ['is_safe' => ['input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file',],], + 'Form' => ['is_safe' => ['input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file']], 'ExpandedForm' => [ 'is_safe' => [ 'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', 'file', 'staticText', 'password', 'nonSelectableAmount', 'number', 'amountNoCurrency', 'percentage', - ], ], 'AccountForm' => [ @@ -201,12 +201,11 @@ return [ 'currencyList', 'currencyListEmpty', 'balanceAll', ], ], - 'PiggyBankForm' => - [ - 'is_safe' => [ - 'piggyBankList', - ], + 'PiggyBankForm' => [ + 'is_safe' => [ + 'piggyBankList', ], + ], 'RuleForm' => [ 'is_safe' => [ 'ruleGroupList', 'ruleGroupListWithEmpty', @@ -214,7 +213,6 @@ return [ ], ], - /* |-------------------------------------------------------------------------- | Functions diff --git a/config/upgrade.php b/config/upgrade.php index 2afd5a541e..fe3d1e0fd2 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -1,7 +1,7 @@ [ - 'upgrade' => - [ - '4.3' => 'Make sure you run the migrations and clear your cache. If you need more help, please check Github or the Firefly III website.', - '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', - '4.6.4' => 'This version of Firefly III requires PHP7.1.', - '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', - '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', - '4.7.6' => 'This will be the last version to require PHP7.1. Future versions will require PHP7.2 minimum.', - '4.7.7' => 'This version of Firefly III requires PHP7.2.', - '4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption', - '4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.', - '4.8.1' => 'This version of Firefly III requires PHP7.3.', - ], - 'install' => - [ - '4.3' => 'Welcome to Firefly! Make sure you follow the installation guide. If you need more help, please check Github or the Firefly III website. The installation guide has a FAQ which you should check out as well.', - '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', - '4.6.4' => 'This version of Firefly III requires PHP7.1.', - '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', - '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', - '4.7.6' => 'This will be the last version to require PHP7.1. Future versions will require PHP7.2 minimum.', - '4.7.7' => 'This version of Firefly III requires PHP7.2.', - '4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption', - '4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.', - '4.8.1' => 'This version of Firefly III requires PHP7.3.', - ], + 'upgrade' => [ + '4.3' => 'Make sure you run the migrations and clear your cache. If you need more help, please check Github or the Firefly III website.', + '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', + '4.6.4' => 'This version of Firefly III requires PHP7.1.', + '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', + '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', + '4.7.6' => 'This will be the last version to require PHP7.1. Future versions will require PHP7.2 minimum.', + '4.7.7' => 'This version of Firefly III requires PHP7.2.', + '4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption', + '4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.', + '4.8.1' => 'This version of Firefly III requires PHP7.3.', + ], + 'install' => [ + '4.3' => 'Welcome to Firefly! Make sure you follow the installation guide. If you need more help, please check Github or the Firefly III website. The installation guide has a FAQ which you should check out as well.', + '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', + '4.6.4' => 'This version of Firefly III requires PHP7.1.', + '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', + '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', + '4.7.6' => 'This will be the last version to require PHP7.1. Future versions will require PHP7.2 minimum.', + '4.7.7' => 'This version of Firefly III requires PHP7.2.', + '4.7.10' => 'Firefly III no longer encrypts database values. To protect your data, make sure you use TDE or FDE. Read more: https://bit.ly/FF3-encryption', + '4.8.0' => 'This is a huge upgrade for Firefly III. Please expect bugs and errors, and bear with me as I fix them. I tested a lot of things but pretty sure I missed some. Thanks for understanding.', + '4.8.1' => 'This version of Firefly III requires PHP7.3.', + ], ], ]; diff --git a/config/view.php b/config/view.php index 4752755452..42b243edca 100644 --- a/config/view.php +++ b/config/view.php @@ -1,7 +1,7 @@ define( FireflyIII\Models\Account::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->unique()->numberBetween(1000, 10000), 'user_id' => 1, diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 8a3bc836a6..27e66f2dcb 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -1,7 +1,7 @@ define( FireflyIII\Models\Attachment::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'user_id' => 1, 'attachable_id' => 1, @@ -43,7 +42,7 @@ $factory->define( $factory->define( FireflyIII\Models\CurrencyExchangeRate::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'user_id' => 1, 'from_currency_id' => 1, @@ -57,7 +56,7 @@ $factory->define( $factory->define( FireflyIII\Models\TransactionCurrency::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'name' => $faker->words(1, true), 'code' => 'ABC', @@ -68,7 +67,7 @@ $factory->define( $factory->define( FireflyIII\Models\ImportJob::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->numberBetween(1, 100), 'user_id' => 1, @@ -89,7 +88,7 @@ $factory->define( $factory->define( FireflyIII\Models\TransactionJournal::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->unique()->numberBetween(1000, 10000), 'user_id' => 1, @@ -111,7 +110,7 @@ $factory->define( $factory->define( FireflyIII\Models\Bill::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'created_at' => new Carbon, 'updated_at' => new Carbon, @@ -131,7 +130,7 @@ $factory->define( $factory->define( FireflyIII\Models\PiggyBankRepetition::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->unique()->numberBetween(100, 10000), 'piggy_bank_id' => $faker->numberBetween(1, 10), @@ -144,7 +143,7 @@ $factory->define( $factory->define( FireflyIII\Models\PiggyBank::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->unique()->numberBetween(100, 10000), 'created_at' => new Carbon, @@ -162,7 +161,7 @@ $factory->define( $factory->define( FireflyIII\Models\Tag::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->unique()->numberBetween(200, 10000), 'user_id' => 1, @@ -174,7 +173,7 @@ $factory->define( $factory->define( FireflyIII\Models\Category::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->numberBetween(1, 10), 'name' => $faker->words(3, true), @@ -184,7 +183,7 @@ $factory->define( $factory->define( FireflyIII\Models\Budget::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->numberBetween(1, 10), 'name' => $faker->words(3, true), @@ -194,7 +193,7 @@ $factory->define( $factory->define( FireflyIII\Models\PiggyBankEvent::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->numberBetween(1, 10), 'piggy_bank_id' => $faker->numberBetween(1, 10), @@ -207,7 +206,7 @@ $factory->define( $factory->define( FireflyIII\Models\BudgetLimit::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'id' => $faker->numberBetween(1, 10), 'start_date' => '2017-01-01', @@ -220,7 +219,7 @@ $factory->define( $factory->define( FireflyIII\Models\Transaction::class, - function (Faker\Generator $faker) { + static function (Faker\Generator $faker) { return [ 'transaction_amount' => (string)$faker->randomFloat(2, -100, 100), 'destination_amount' => (string)$faker->randomFloat(2, -100, 100), diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 00cdde4797..f449ed01b0 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,7 +2,7 @@ /** * UserFactory.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -36,11 +36,11 @@ use Faker\Generator as Faker; */ $factory->define( - FireflyIII\User::class, function (Faker $faker) { - return [ - 'email' => $faker->unique()->safeEmail, - 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret - 'remember_token' => str_random(10), - ]; -} + FireflyIII\User::class, static function (Faker $faker) { + return [ + 'email' => $faker->unique()->safeEmail, + 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret + 'remember_token' => str_random(10), + ]; + } ); diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php index c96ff7a169..eb20d428ad 100644 --- a/database/migrations/2016_06_16_000000_create_support_tables.php +++ b/database/migrations/2016_06_16_000000_create_support_tables.php @@ -1,7 +1,7 @@ createConfigurationTable(); } - /** - * - */ private function createAccountTypeTable(): void { if (!Schema::hasTable('account_types')) { Schema::create( 'account_types', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->string('type', 50); @@ -89,7 +86,7 @@ class CreateSupportTables extends Migration if (!Schema::hasTable('configuration')) { Schema::create( 'configuration', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -101,15 +98,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createCurrencyTable(): void { if (!Schema::hasTable('transaction_currencies')) { Schema::create( 'transaction_currencies', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -124,15 +118,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createJobsTable(): void { if (!Schema::hasTable('jobs')) { Schema::create( 'jobs', - function (Blueprint $table) { + static function (Blueprint $table) { // straight from Laravel $table->bigIncrements('id'); $table->string('queue'); @@ -148,15 +139,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createPasswordTable(): void { if (!Schema::hasTable('password_resets')) { Schema::create( 'password_resets', - function (Blueprint $table) { + static function (Blueprint $table) { // straight from laravel $table->string('email')->index(); $table->string('token')->index(); @@ -166,15 +154,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createPermissionRoleTable(): void { if (!Schema::hasTable('permission_role')) { Schema::create( 'permission_role', - function (Blueprint $table) { + static function (Blueprint $table) { $table->integer('permission_id')->unsigned(); $table->integer('role_id')->unsigned(); @@ -187,15 +172,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createPermissionsTable(): void { if (!Schema::hasTable('permissions')) { Schema::create( 'permissions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->string('name')->unique(); @@ -206,15 +188,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createRolesTable(): void { if (!Schema::hasTable('roles')) { Schema::create( 'roles', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->string('name')->unique(); @@ -225,15 +204,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createSessionsTable(): void { if (!Schema::hasTable('sessions')) { Schema::create( 'sessions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->string('id')->unique(); $table->integer('user_id')->nullable(); $table->string('ip_address', 45)->nullable(); @@ -245,15 +221,12 @@ class CreateSupportTables extends Migration } } - /** - * - */ private function createTransactionTypeTable(): void { if (!Schema::hasTable('transaction_types')) { Schema::create( 'transaction_types', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); diff --git a/database/migrations/2016_06_16_000001_create_users_table.php b/database/migrations/2016_06_16_000001_create_users_table.php index f076825544..0056b9f158 100644 --- a/database/migrations/2016_06_16_000001_create_users_table.php +++ b/database/migrations/2016_06_16_000001_create_users_table.php @@ -1,7 +1,7 @@ increments('id'); $table->timestamps(); $table->string('email', 255); diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php index 58403dbf3f..d4532a4871 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -1,7 +1,7 @@ createTransactionTables(); } - /** - * - */ private function createAccountTables(): void { if (!Schema::hasTable('accounts')) { Schema::create( 'accounts', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -112,7 +109,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('account_meta')) { Schema::create( 'account_meta', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('account_id', false, true); @@ -124,15 +121,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createAttachmentsTable(): void { if (!Schema::hasTable('attachments')) { Schema::create( 'attachments', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -155,15 +149,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createBillsTable(): void { if (!Schema::hasTable('bills')) { Schema::create( 'bills', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -195,7 +186,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('budgets')) { Schema::create( 'budgets', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -210,7 +201,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('budget_limits')) { Schema::create( 'budget_limits', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('budget_id', false, true); @@ -225,7 +216,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('limit_repetitions')) { Schema::create( 'limit_repetitions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('budget_limit_id', false, true); @@ -238,15 +229,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createCategoriesTable(): void { if (!Schema::hasTable('categories')) { Schema::create( 'categories', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -261,15 +249,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createExportJobsTable(): void { if (!Schema::hasTable('export_jobs')) { Schema::create( 'export_jobs', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('user_id', false, true); @@ -283,7 +268,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('import_jobs')) { Schema::create( 'import_jobs', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('user_id')->unsigned(); @@ -297,15 +282,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createPiggyBanksTable(): void { if (!Schema::hasTable('piggy_banks')) { Schema::create( 'piggy_banks', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -325,7 +307,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('piggy_bank_repetitions')) { Schema::create( 'piggy_bank_repetitions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('piggy_bank_id', false, true); @@ -338,15 +320,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createPreferencesTable(): void { if (!Schema::hasTable('preferences')) { Schema::create( 'preferences', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('user_id', false, true); @@ -359,15 +338,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createRoleTable(): void { if (!Schema::hasTable('role_user')) { Schema::create( 'role_user', - function (Blueprint $table) { + static function (Blueprint $table) { $table->integer('user_id', false, true); $table->integer('role_id', false, true); @@ -389,7 +365,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('rule_groups')) { Schema::create( 'rule_groups', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -407,7 +383,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('rules')) { Schema::create( 'rules', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -430,7 +406,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('rule_actions')) { Schema::create( 'rule_actions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('rule_id', false, true); @@ -450,7 +426,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('rule_triggers')) { Schema::create( 'rule_triggers', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('rule_id', false, true); @@ -469,15 +445,12 @@ class CreateMainTables extends Migration } } - /** - * - */ private function createTagsTable(): void { if (!Schema::hasTable('tags')) { Schema::create( 'tags', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -508,7 +481,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('transaction_journals')) { Schema::create( 'transaction_journals', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -536,7 +509,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('journal_meta')) { Schema::create( 'journal_meta', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('transaction_journal_id', false, true); @@ -551,7 +524,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('tag_transaction_journal')) { Schema::create( 'tag_transaction_journal', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('tag_id', false, true); $table->integer('transaction_journal_id', false, true); @@ -567,7 +540,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('budget_transaction_journal')) { Schema::create( 'budget_transaction_journal', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('budget_id', false, true); $table->integer('transaction_journal_id', false, true); @@ -580,7 +553,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('category_transaction_journal')) { Schema::create( 'category_transaction_journal', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('category_id', false, true); $table->integer('transaction_journal_id', false, true); @@ -593,7 +566,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('piggy_bank_events')) { Schema::create( 'piggy_bank_events', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('piggy_bank_id', false, true); @@ -610,7 +583,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('transactions')) { Schema::create( 'transactions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->softDeletes(); @@ -628,7 +601,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('budget_transaction')) { Schema::create( 'budget_transaction', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('budget_id', false, true); $table->integer('transaction_id', false, true); @@ -642,7 +615,7 @@ class CreateMainTables extends Migration if (!Schema::hasTable('category_transaction')) { Schema::create( 'category_transaction', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('category_id', false, true); $table->integer('transaction_id', false, true); diff --git a/database/migrations/2016_08_25_091522_changes_for_3101.php b/database/migrations/2016_08_25_091522_changes_for_3101.php index 1c2d9546ed..e5fc0c339e 100644 --- a/database/migrations/2016_08_25_091522_changes_for_3101.php +++ b/database/migrations/2016_08_25_091522_changes_for_3101.php @@ -1,7 +1,7 @@ text('description')->nullable()->change(); } ); Schema::table( 'rules', - function (Blueprint $table) { + static function (Blueprint $table) { $table->text('description')->nullable()->change(); } ); diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php index 571fa68c68..ac13fbd43b 100644 --- a/database/migrations/2016_10_09_150037_expand_transactions_table.php +++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php @@ -1,7 +1,7 @@ dropColumn('identifier'); } ); @@ -50,7 +50,7 @@ class ExpandTransactionsTable extends Migration { Schema::table( 'transactions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->smallInteger('identifier', false, true)->default(0); } ); diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php index 496ec5b051..8e86c75b0e 100644 --- a/database/migrations/2016_10_22_075804_changes_for_v410.php +++ b/database/migrations/2016_10_22_075804_changes_for_v410.php @@ -1,7 +1,7 @@ increments('id'); $table->timestamps(); $table->softDeletes(); diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php index 845fea95a2..e9bd35b292 100644 --- a/database/migrations/2016_11_24_210552_changes_for_v420.php +++ b/database/migrations/2016_11_24_210552_changes_for_v420.php @@ -1,7 +1,7 @@ dropSoftDeletes(); } ); @@ -50,7 +50,7 @@ class ChangesForV420 extends Migration { Schema::table( 'journal_meta', - function (Blueprint $table) { + static function (Blueprint $table) { $table->softDeletes(); } ); diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php index 24ec99978f..715b8810ca 100644 --- a/database/migrations/2016_12_22_150431_changes_for_v430.php +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -1,7 +1,7 @@ increments('id'); $table->timestamps(); $table->softDeletes(); diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php index d5e3b8265e..cc68fbd30d 100644 --- a/database/migrations/2016_12_28_203205_changes_for_v431.php +++ b/database/migrations/2016_12_28_203205_changes_for_v431.php @@ -1,7 +1,7 @@ string('repeat_freq', 30)->nullable(); } ); Schema::table( 'budget_limits', - function (Blueprint $table) { + static function (Blueprint $table) { $table->boolean('repeats')->default(0); } ); @@ -50,7 +50,7 @@ class ChangesForV431 extends Migration // change field "start_date" to "startdate" Schema::table( 'budget_limits', - function (Blueprint $table) { + static function (Blueprint $table) { $table->renameColumn('start_date', 'startdate'); } ); @@ -58,14 +58,14 @@ class ChangesForV431 extends Migration // remove date field "end_date" Schema::table( 'budget_limits', - function (Blueprint $table) { + static function (Blueprint $table) { $table->dropColumn('end_date'); } ); // remove decimal places Schema::table( 'transaction_currencies', - function (Blueprint $table) { + static function (Blueprint $table) { $table->dropColumn('decimal_places'); } ); diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php index d3201c7257..1cf2074fcf 100644 --- a/database/migrations/2017_04_13_163623_changes_for_v440.php +++ b/database/migrations/2017_04_13_163623_changes_for_v440.php @@ -1,7 +1,7 @@ integer('transaction_currency_id', false, true)->after('description')->nullable(); - $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); + $table->integer('transaction_currency_id', false, true)->after('description')->nullable(); + $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); } } ); diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php index c4b5bcc9e3..da15e5106e 100644 --- a/database/migrations/2017_06_02_105232_changes_for_v450.php +++ b/database/migrations/2017_06_02_105232_changes_for_v450.php @@ -1,7 +1,7 @@ dropColumn('foreign_amount'); - } ); @@ -70,7 +69,7 @@ class ChangesForV450 extends Migration // add "foreign_amount" to transactions Schema::table( 'transactions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->decimal('foreign_amount', 22, 12)->nullable()->after('amount'); } ); @@ -78,7 +77,7 @@ class ChangesForV450 extends Migration // add foreign transaction currency id to transactions (is nullable): Schema::table( 'transactions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->integer('foreign_currency_id', false, true)->default(null)->after('foreign_amount')->nullable(); $table->foreign('foreign_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); } diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php index e9ca3f987b..c64a5df13e 100644 --- a/database/migrations/2017_08_20_062014_changes_for_v470.php +++ b/database/migrations/2017_08_20_062014_changes_for_v470.php @@ -1,7 +1,7 @@ increments('id'); $table->timestamps(); $table->softDeletes(); @@ -65,7 +65,7 @@ class ChangesForV470 extends Migration if (!Schema::hasTable('journal_links')) { Schema::create( 'journal_links', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->timestamps(); $table->integer('link_type_id', false, true); diff --git a/database/migrations/2017_11_04_170844_changes_for_v470a.php b/database/migrations/2017_11_04_170844_changes_for_v470a.php index d9d39e4298..10df289ee7 100644 --- a/database/migrations/2017_11_04_170844_changes_for_v470a.php +++ b/database/migrations/2017_11_04_170844_changes_for_v470a.php @@ -1,7 +1,7 @@ dropColumn('reconciled'); } ); @@ -51,7 +51,7 @@ class ChangesForV470a extends Migration { Schema::table( 'transactions', - function (Blueprint $table) { + static function (Blueprint $table) { $table->boolean('reconciled')->after('deleted_at')->default(0); } ); diff --git a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php index 92f1656fe7..eaffd9ffee 100644 --- a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php +++ b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php @@ -2,7 +2,7 @@ /** * 2018_01_01_000001_create_oauth_auth_codes_table.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class CreateOauthAuthCodesTable + * Class CreateOauthAuthCodesTable. */ class CreateOauthAuthCodesTable extends Migration { @@ -46,14 +46,14 @@ class CreateOauthAuthCodesTable extends Migration public function up(): void { Schema::create( - 'oauth_auth_codes', function (Blueprint $table) { - $table->string('id', 100)->primary(); - $table->integer('user_id'); - $table->integer('client_id'); - $table->text('scopes')->nullable(); - $table->boolean('revoked'); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_auth_codes', static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->integer('user_id'); + $table->integer('client_id'); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php index d5833f8a7f..526df9cb2e 100644 --- a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php +++ b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php @@ -2,7 +2,7 @@ /** * 2018_01_01_000002_create_oauth_access_tokens_table.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class CreateOauthAccessTokensTable + * Class CreateOauthAccessTokensTable. */ class CreateOauthAccessTokensTable extends Migration { @@ -46,16 +46,16 @@ class CreateOauthAccessTokensTable extends Migration public function up(): void { Schema::create( - 'oauth_access_tokens', function (Blueprint $table) { - $table->string('id', 100)->primary(); - $table->integer('user_id')->index()->nullable(); - $table->integer('client_id'); - $table->string('name')->nullable(); - $table->text('scopes')->nullable(); - $table->boolean('revoked'); - $table->timestamps(); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_access_tokens', static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->integer('user_id')->index()->nullable(); + $table->integer('client_id'); + $table->string('name')->nullable(); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->timestamps(); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php index 3f1dcad5fc..bbc7f569fa 100644 --- a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php +++ b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php @@ -2,7 +2,7 @@ /** * 2018_01_01_000003_create_oauth_refresh_tokens_table.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class CreateOauthRefreshTokensTable + * Class CreateOauthRefreshTokensTable. */ class CreateOauthRefreshTokensTable extends Migration { @@ -46,12 +46,12 @@ class CreateOauthRefreshTokensTable extends Migration public function up(): void { Schema::create( - 'oauth_refresh_tokens', function (Blueprint $table) { - $table->string('id', 100)->primary(); - $table->string('access_token_id', 100)->index(); - $table->boolean('revoked'); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_refresh_tokens', static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->string('access_token_id', 100)->index(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php index b950da01b3..3588b59241 100644 --- a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php +++ b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php @@ -2,7 +2,7 @@ /** * 2018_01_01_000004_create_oauth_clients_table.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class CreateOauthClientsTable + * Class CreateOauthClientsTable. */ class CreateOauthClientsTable extends Migration { @@ -46,17 +46,17 @@ class CreateOauthClientsTable extends Migration public function up(): void { Schema::create( - 'oauth_clients', function (Blueprint $table) { - $table->increments('id'); - $table->integer('user_id')->index()->nullable(); - $table->string('name'); - $table->string('secret', 100); - $table->text('redirect'); - $table->boolean('personal_access_client'); - $table->boolean('password_client'); - $table->boolean('revoked'); - $table->timestamps(); - } + 'oauth_clients', static function (Blueprint $table) { + $table->increments('id'); + $table->integer('user_id')->index()->nullable(); + $table->string('name'); + $table->string('secret', 100); + $table->text('redirect'); + $table->boolean('personal_access_client'); + $table->boolean('password_client'); + $table->boolean('revoked'); + $table->timestamps(); + } ); } } diff --git a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php index b5ba1398a4..69bfe1e1ad 100644 --- a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php +++ b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php @@ -2,7 +2,7 @@ /** * 2018_01_01_000005_create_oauth_personal_access_clients_table.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class CreateOauthPersonalAccessClientsTable + * Class CreateOauthPersonalAccessClientsTable. */ class CreateOauthPersonalAccessClientsTable extends Migration { @@ -37,7 +37,6 @@ class CreateOauthPersonalAccessClientsTable extends Migration public function down(): void { Schema::drop('oauth_personal_access_clients'); - } /** @@ -47,11 +46,11 @@ class CreateOauthPersonalAccessClientsTable extends Migration public function up(): void { Schema::create( - 'oauth_personal_access_clients', function (Blueprint $table) { - $table->increments('id'); - $table->integer('client_id')->index(); - $table->timestamps(); - } + 'oauth_personal_access_clients', static function (Blueprint $table) { + $table->increments('id'); + $table->integer('client_id')->index(); + $table->timestamps(); + } ); } } diff --git a/database/migrations/2018_03_19_141348_changes_for_v472.php b/database/migrations/2018_03_19_141348_changes_for_v472.php index aa65327bc1..e5504ddde5 100644 --- a/database/migrations/2018_03_19_141348_changes_for_v472.php +++ b/database/migrations/2018_03_19_141348_changes_for_v472.php @@ -2,7 +2,7 @@ /** * 2018_03_19_141348_changes_for_v472.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -26,7 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * Class ChangesForV472 + * Class ChangesForV472. */ class ChangesForV472 extends Migration { @@ -39,13 +39,13 @@ class ChangesForV472 extends Migration { Schema::table( 'attachments', - function (Blueprint $table) { + static function (Blueprint $table) { $table->text('notes')->nullable(); } ); Schema::table( 'budgets', - function (Blueprint $table) { + static function (Blueprint $table) { $table->dropColumn('order'); } ); @@ -61,14 +61,14 @@ class ChangesForV472 extends Migration { Schema::table( 'attachments', - function (Blueprint $table) { + static function (Blueprint $table) { $table->dropColumn('notes'); } ); Schema::table( 'budgets', - function (Blueprint $table) { + static function (Blueprint $table) { $table->mediumInteger('order', false, true)->default(0); } ); diff --git a/database/migrations/2018_04_07_210913_changes_for_v473.php b/database/migrations/2018_04_07_210913_changes_for_v473.php index e043108e9d..9f2acb181a 100644 --- a/database/migrations/2018_04_07_210913_changes_for_v473.php +++ b/database/migrations/2018_04_07_210913_changes_for_v473.php @@ -2,7 +2,7 @@ /** * 2018_04_07_210913_changes_for_v473.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class ChangesForV473 + * Class ChangesForV473. */ class ChangesForV473 extends Migration { @@ -40,7 +40,7 @@ class ChangesForV473 extends Migration { Schema::table( 'bills', - function (Blueprint $table) { + static function (Blueprint $table) { // cannot drop foreign keys in SQLite: if ('sqlite' !== config('database.default')) { @@ -50,10 +50,9 @@ class ChangesForV473 extends Migration } ); - Schema::table( 'rules', - function (Blueprint $table) { + static function (Blueprint $table) { $table->dropColumn('strict'); } ); @@ -69,14 +68,14 @@ class ChangesForV473 extends Migration { Schema::table( 'bills', - function (Blueprint $table) { + static function (Blueprint $table) { $table->integer('transaction_currency_id', false, true)->nullable()->after('user_id'); $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); } ); Schema::table( 'rules', - function (Blueprint $table) { + static function (Blueprint $table) { $table->boolean('strict')->default(true); } ); diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php index 3b018da57c..5d76fede07 100644 --- a/database/migrations/2018_04_29_174524_changes_for_v474.php +++ b/database/migrations/2018_04_29_174524_changes_for_v474.php @@ -2,7 +2,7 @@ /** * 2018_04_29_174524_changes_for_v474.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -26,7 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * Class ChangesForV474 + * Class ChangesForV474. */ class ChangesForV474 extends Migration { @@ -54,7 +54,6 @@ class ChangesForV474 extends Migration 'import_jobs', static function (Blueprint $table) { $table->dropColumn('provider'); - } ); @@ -62,7 +61,6 @@ class ChangesForV474 extends Migration 'import_jobs', static function (Blueprint $table) { $table->dropColumn('stage'); - } ); @@ -70,7 +68,6 @@ class ChangesForV474 extends Migration 'import_jobs', static function (Blueprint $table) { $table->dropColumn('transactions'); - } ); @@ -78,7 +75,6 @@ class ChangesForV474 extends Migration 'import_jobs', static function (Blueprint $table) { $table->dropColumn('errors'); - } ); @@ -86,7 +82,6 @@ class ChangesForV474 extends Migration 'import_jobs', static function (Blueprint $table) { $table->dropColumn('tag_id'); - } ); } diff --git a/database/migrations/2018_06_08_200526_changes_for_v475.php b/database/migrations/2018_06_08_200526_changes_for_v475.php index 07311b1040..a16e6266bb 100644 --- a/database/migrations/2018_06_08_200526_changes_for_v475.php +++ b/database/migrations/2018_06_08_200526_changes_for_v475.php @@ -2,7 +2,7 @@ /** * 2018_06_08_200526_changes_for_v475.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -26,8 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * - * Class ChangesForV475 + * Class ChangesForV475. */ class ChangesForV475 extends Migration { @@ -55,97 +54,93 @@ class ChangesForV475 extends Migration public function up(): void { Schema::create( - 'recurrences', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('user_id', false, true); - $table->integer('transaction_type_id', false, true); + 'recurrences', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->integer('transaction_type_id', false, true); - $table->string('title', 1024); - $table->text('description'); + $table->string('title', 1024); + $table->text('description'); - $table->date('first_date'); - $table->date('repeat_until')->nullable(); - $table->date('latest_date')->nullable(); - $table->smallInteger('repetitions', false, true); + $table->date('first_date'); + $table->date('repeat_until')->nullable(); + $table->date('latest_date')->nullable(); + $table->smallInteger('repetitions', false, true); - $table->boolean('apply_rules')->default(true); - $table->boolean('active')->default(true); + $table->boolean('apply_rules')->default(true); + $table->boolean('active')->default(true); - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade'); - } + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade'); + } ); Schema::create( - 'recurrences_transactions', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); - $table->integer('transaction_currency_id', false, true); - $table->integer('foreign_currency_id', false, true)->nullable(); - $table->integer('source_id', false, true); - $table->integer('destination_id', false, true); + 'recurrences_transactions', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); + $table->integer('transaction_currency_id', false, true); + $table->integer('foreign_currency_id', false, true)->nullable(); + $table->integer('source_id', false, true); + $table->integer('destination_id', false, true); - $table->decimal('amount', 22, 12); - $table->decimal('foreign_amount', 22, 12)->nullable(); - $table->string('description', 1024); + $table->decimal('amount', 22, 12); + $table->decimal('foreign_amount', 22, 12)->nullable(); + $table->string('description', 1024); - - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); - $table->foreign('foreign_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); - $table->foreign('source_id')->references('id')->on('accounts')->onDelete('cascade'); - $table->foreign('destination_id')->references('id')->on('accounts')->onDelete('cascade'); - } - ); - - - Schema::create( - 'recurrences_repetitions', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); - $table->string('repetition_type', 50); - $table->string('repetition_moment', 50); - $table->smallInteger('repetition_skip', false, true); - $table->smallInteger('weekend', false, true); - - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); + $table->foreign('foreign_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); + $table->foreign('source_id')->references('id')->on('accounts')->onDelete('cascade'); + $table->foreign('destination_id')->references('id')->on('accounts')->onDelete('cascade'); + } ); Schema::create( - 'recurrences_meta', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); + 'recurrences_repetitions', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); + $table->string('repetition_type', 50); + $table->string('repetition_moment', 50); + $table->smallInteger('repetition_skip', false, true); + $table->smallInteger('weekend', false, true); - $table->string('name', 50); - $table->text('value'); - - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + } ); Schema::create( - 'rt_meta', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('rt_id', false, true); + 'recurrences_meta', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); - $table->string('name', 50); - $table->text('value'); + $table->string('name', 50); + $table->text('value'); - $table->foreign('rt_id')->references('id')->on('recurrences_transactions')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + } ); + Schema::create( + 'rt_meta', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('rt_id', false, true); + $table->string('name', 50); + $table->text('value'); + + $table->foreign('rt_id')->references('id')->on('recurrences_transactions')->onDelete('cascade'); + } + ); } } diff --git a/database/migrations/2018_09_05_195147_changes_for_v477.php b/database/migrations/2018_09_05_195147_changes_for_v477.php index 71721ea716..df7d51352f 100644 --- a/database/migrations/2018_09_05_195147_changes_for_v477.php +++ b/database/migrations/2018_09_05_195147_changes_for_v477.php @@ -2,7 +2,7 @@ /** * 2018_09_05_195147_changes_for_v477.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -26,8 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * - * Class ChangesForV477 + * Class ChangesForV477. */ class ChangesForV477 extends Migration { @@ -39,15 +38,15 @@ class ChangesForV477 extends Migration public function down(): void { Schema::table( - 'budget_limits', function (Blueprint $table) { + 'budget_limits', static function (Blueprint $table) { // cannot drop foreign keys in SQLite: - if ('sqlite' !== config('database.default')) { - $table->dropForeign('budget_limits_transaction_currency_id_foreign'); - } + if ('sqlite' !== config('database.default')) { + $table->dropForeign('budget_limits_transaction_currency_id_foreign'); + } - $table->dropColumn(['transaction_currency_id']); - } + $table->dropColumn(['transaction_currency_id']); + } ); } @@ -61,7 +60,7 @@ class ChangesForV477 extends Migration { Schema::table( 'budget_limits', - function (Blueprint $table) { + static function (Blueprint $table) { $table->integer('transaction_currency_id', false, true)->nullable()->after('budget_id'); $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); } diff --git a/database/migrations/2018_11_06_172532_changes_for_v479.php b/database/migrations/2018_11_06_172532_changes_for_v479.php index 592a6efc04..2046f6c366 100644 --- a/database/migrations/2018_11_06_172532_changes_for_v479.php +++ b/database/migrations/2018_11_06_172532_changes_for_v479.php @@ -2,7 +2,7 @@ /** * 2018_11_06_172532_changes_for_v479.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -26,7 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * Class ChangesForV479 + * Class ChangesForV479. */ class ChangesForV479 extends Migration { @@ -38,9 +38,9 @@ class ChangesForV479 extends Migration public function down() { Schema::table( - 'transaction_currencies', function (Blueprint $table) { - $table->dropColumn(['enabled']); - } + 'transaction_currencies', static function (Blueprint $table) { + $table->dropColumn(['enabled']); + } ); } @@ -54,7 +54,7 @@ class ChangesForV479 extends Migration { Schema::table( 'transaction_currencies', - function (Blueprint $table) { + static function (Blueprint $table) { $table->boolean('enabled')->default(0)->after('deleted_at'); } ); diff --git a/database/migrations/2019_01_28_193833_changes_for_v4710.php b/database/migrations/2019_01_28_193833_changes_for_v4710.php index 1bd5baad6d..fd960fd021 100644 --- a/database/migrations/2019_01_28_193833_changes_for_v4710.php +++ b/database/migrations/2019_01_28_193833_changes_for_v4710.php @@ -2,7 +2,7 @@ /** * 2019_01_28_193833_changes_for_v4710.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -49,23 +49,22 @@ class ChangesForV4710 extends Migration { if (!Schema::hasTable('transaction_groups')) { Schema::create( - 'transaction_groups', function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('user_id', false, true); - $table->string('title', 1024)->nullable(); + 'transaction_groups', static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->string('title', 1024)->nullable(); - - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - } + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + } ); } if (!Schema::hasTable('group_journals')) { Schema::create( 'group_journals', - function (Blueprint $table) { + static function (Blueprint $table) { $table->increments('id'); $table->integer('transaction_group_id', false, true); $table->integer('transaction_journal_id', false, true); @@ -78,6 +77,5 @@ class ChangesForV4710 extends Migration } ); } - } } diff --git a/database/migrations/2019_02_05_055516_changes_for_v4711.php b/database/migrations/2019_02_05_055516_changes_for_v4711.php index f50a4d9a4d..7a2aef0d81 100644 --- a/database/migrations/2019_02_05_055516_changes_for_v4711.php +++ b/database/migrations/2019_02_05_055516_changes_for_v4711.php @@ -2,7 +2,7 @@ /** * 2019_02_05_055516_changes_for_v4711.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -55,15 +55,15 @@ class ChangesForV4711 extends Migration * nice. */ Schema::table( - 'transaction_journals', function (Blueprint $table) { - $table->dateTime('date')->change(); - } + 'transaction_journals', static function (Blueprint $table) { + $table->dateTime('date')->change(); + } ); Schema::table( - 'preferences', function (Blueprint $table) { - $table->text('data')->nullable()->change(); - } + 'preferences', static function (Blueprint $table) { + $table->text('data')->nullable()->change(); + } ); } } diff --git a/database/migrations/2019_02_11_170529_changes_for_v4712.php b/database/migrations/2019_02_11_170529_changes_for_v4712.php index 9e47f51f08..3080fe9244 100644 --- a/database/migrations/2019_02_11_170529_changes_for_v4712.php +++ b/database/migrations/2019_02_11_170529_changes_for_v4712.php @@ -1,7 +1,7 @@ dateTime('date')->change(); - } + 'transaction_journals', static function (Blueprint $table) { + $table->dateTime('date')->change(); + } ); } } diff --git a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php index 1fd82f69e5..9c39bc5039 100644 --- a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php +++ b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php @@ -1,7 +1,7 @@ dropColumn(['objectguid']); - } + 'users', static function (Blueprint $table) { + $table->dropColumn(['objectguid']); + } ); } @@ -58,9 +57,9 @@ class FixLdapConfiguration extends Migration * now. To support this, we add the column. */ Schema::table( - 'users', function (Blueprint $table) { - $table->uuid('objectguid')->nullable()->after('id'); - } + 'users', static function (Blueprint $table) { + $table->uuid('objectguid')->nullable()->after('id'); + } ); } } diff --git a/database/migrations/2019_03_22_183214_changes_for_v480.php b/database/migrations/2019_03_22_183214_changes_for_v480.php index 476631b69f..0dce8bde88 100644 --- a/database/migrations/2019_03_22_183214_changes_for_v480.php +++ b/database/migrations/2019_03_22_183214_changes_for_v480.php @@ -1,7 +1,7 @@ dropColumn('stop_processing'); - } + $table->dropColumn('stop_processing'); + } ); Schema::table( 'users', static function (Blueprint $table) { - $table->dropColumn('mfa_secret'); - } + $table->dropColumn('mfa_secret'); + } ); } @@ -69,11 +68,9 @@ class ChangesForV480 extends Migration */ public function up(): void { - Schema::table( 'transaction_journals', static function (Blueprint $table) { - $table->integer('transaction_currency_id', false, true)->nullable()->change(); // add column "group_id" after "transaction_type_id" @@ -86,13 +83,13 @@ class ChangesForV480 extends Migration ); Schema::table( 'rule_groups', static function (Blueprint $table) { - $table->boolean('stop_processing')->default(false); - } + $table->boolean('stop_processing')->default(false); + } ); Schema::table( 'users', static function (Blueprint $table) { - $table->string('mfa_secret', 50)->nullable(); - } + $table->string('mfa_secret', 50)->nullable(); + } ); } } diff --git a/database/migrations/2019_12_28_191351_make_locations_table.php b/database/migrations/2019_12_28_191351_make_locations_table.php index 3feec1f173..4b8cc8359b 100644 --- a/database/migrations/2019_12_28_191351_make_locations_table.php +++ b/database/migrations/2019_12_28_191351_make_locations_table.php @@ -2,7 +2,7 @@ /** * 2019_12_28_191351_make_locations_table.php - * Copyright (c) 2020 james@firefly-iii.org + * Copyright (c) 2020 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -27,7 +27,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; /** - * Class MakeLocationsTable + * Class MakeLocationsTable. */ class MakeLocationsTable extends Migration { @@ -50,17 +50,17 @@ class MakeLocationsTable extends Migration { Schema::create( 'locations', static function (Blueprint $table) { - $table->bigIncrements('id'); - $table->timestamps(); - $table->softDeletes(); + $table->bigIncrements('id'); + $table->timestamps(); + $table->softDeletes(); - $table->integer('locatable_id', false, true); - $table->string('locatable_type', 255); + $table->integer('locatable_id', false, true); + $table->string('locatable_type', 255); - $table->decimal('latitude', 24, 12)->nullable(); - $table->decimal('longitude', 24, 12)->nullable(); - $table->smallInteger('zoom_level', false, true)->nullable(); - } + $table->decimal('latitude', 24, 12)->nullable(); + $table->decimal('longitude', 24, 12)->nullable(); + $table->smallInteger('zoom_level', false, true)->nullable(); + } ); } } diff --git a/database/migrations/2020_03_13_201950_changes_for_v520.php b/database/migrations/2020_03_13_201950_changes_for_v520.php index 4d7899454f..7fedd4f230 100644 --- a/database/migrations/2020_03_13_201950_changes_for_v520.php +++ b/database/migrations/2020_03_13_201950_changes_for_v520.php @@ -1,10 +1,12 @@ decimal('amount', 22, 12); $table->string('period', 50); - //$table->string('password', 60); //$table->string('remember_token', 100)->nullable(); //$table->string('reset', 32)->nullable(); diff --git a/database/seeds/AccountTypeSeeder.php b/database/seeds/AccountTypeSeeder.php index 865f6ff0c6..aa3ca8f5f8 100644 --- a/database/seeds/AccountTypeSeeder.php +++ b/database/seeds/AccountTypeSeeder.php @@ -1,7 +1,7 @@ 'FireflyIII\Api\V1\Controllers', 'prefix' => 'about', - 'as' => 'api.v1.about.'], + 'as' => 'api.v1.about.', ], static function () { // Accounts API routes: @@ -35,10 +34,9 @@ Route::group( } ); - Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts', - 'as' => 'api.v1.accounts.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts', + 'as' => 'api.v1.accounts.', ], static function () { // Accounts API routes: @@ -50,13 +48,12 @@ Route::group( Route::get('{account}/piggy_banks', ['uses' => 'AccountController@piggyBanks', 'as' => 'piggy_banks']); Route::get('{account}/transactions', ['uses' => 'AccountController@transactions', 'as' => 'transactions']); - } ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments', - 'as' => 'api.v1.attachments.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments', + 'as' => 'api.v1.attachments.', ], static function () { // Attachment API routes: @@ -71,8 +68,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets', - 'as' => 'api.v1.available_budgets.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets', + 'as' => 'api.v1.available_budgets.', ], static function () { // Available Budget API routes: @@ -85,26 +82,25 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills', - 'as' => 'api.v1.bills.'], static function () { + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills', + 'as' => 'api.v1.bills.', ], static function () { // Bills API routes: - Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); - Route::post('', ['uses' => 'BillController@store', 'as' => 'store']); - Route::get('{bill}', ['uses' => 'BillController@show', 'as' => 'show']); - Route::put('{bill}', ['uses' => 'BillController@update', 'as' => 'update']); - Route::delete('{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']); + Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); + Route::post('', ['uses' => 'BillController@store', 'as' => 'store']); + Route::get('{bill}', ['uses' => 'BillController@show', 'as' => 'show']); + Route::put('{bill}', ['uses' => 'BillController@update', 'as' => 'update']); + Route::delete('{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']); - Route::get('{bill}/attachments', ['uses' => 'BillController@attachments', 'as' => 'attachments']); - Route::get('{bill}/rules', ['uses' => 'BillController@rules', 'as' => 'rules']); - Route::get('{bill}/transactions', ['uses' => 'BillController@transactions', 'as' => 'transactions']); -} + Route::get('{bill}/attachments', ['uses' => 'BillController@attachments', 'as' => 'attachments']); + Route::get('{bill}/rules', ['uses' => 'BillController@rules', 'as' => 'rules']); + Route::get('{bill}/transactions', ['uses' => 'BillController@transactions', 'as' => 'transactions']); + } ); - Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits', - 'as' => 'api.v1.budget_limits.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits', + 'as' => 'api.v1.budget_limits.', ], static function () { // Budget Limit API routes: @@ -118,8 +114,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets', - 'as' => 'api.v1.budgets.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets', + 'as' => 'api.v1.budgets.', ], static function () { // Budget API routes: @@ -135,8 +131,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories', - 'as' => 'api.v1.categories.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories', + 'as' => 'api.v1.categories.', ], static function () { // Category API routes: @@ -150,25 +146,24 @@ Route::group( ); /** - * CHART ROUTES + * CHART ROUTES. */ // Accounts Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account', - 'as' => 'api.v1.chart.account.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account', + 'as' => 'api.v1.chart.account.', ], static function () { Route::get('overview', ['uses' => 'AccountController@overview', 'as' => 'overview']); Route::get('expense', ['uses' => 'AccountController@expenseOverview', 'as' => 'expense']); Route::get('revenue', ['uses' => 'AccountController@revenueOverview', 'as' => 'revenue']); - } ); // Available budgets Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab', - 'as' => 'api.v1.chart.ab.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab', + 'as' => 'api.v1.chart.ab.', ], static function () { // Overview API routes: @@ -178,8 +173,8 @@ Route::group( // Categories Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category', - 'as' => 'api.v1.chart.category.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category', + 'as' => 'api.v1.chart.category.', ], static function () { // Overview API routes: @@ -187,13 +182,9 @@ Route::group( } ); - - - - Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration', - 'as' => 'api.v1.configuration.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration', + 'as' => 'api.v1.configuration.', ], static function () { // Configuration API routes: @@ -203,8 +194,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer', - 'as' => 'api.v1.cer.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer', + 'as' => 'api.v1.cer.', ], static function () { // Currency Exchange Rate API routes: @@ -213,8 +204,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import', - 'as' => 'api.v1.import.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import', + 'as' => 'api.v1.import.', ], static function () { // Transaction Links API routes: @@ -224,8 +215,8 @@ Route::group( } ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types', - 'as' => 'api.v1.link_types.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types', + 'as' => 'api.v1.link_types.', ], static function () { // Link Type API routes: @@ -239,8 +230,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links', - 'as' => 'api.v1.transaction_links.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links', + 'as' => 'api.v1.transaction_links.', ], static function () { // Transaction Links API routes: @@ -249,13 +240,12 @@ Route::group( Route::get('{journalLink}', ['uses' => 'TransactionLinkController@show', 'as' => 'show']); Route::put('{journalLink}', ['uses' => 'TransactionLinkController@update', 'as' => 'update']); Route::delete('{journalLink}', ['uses' => 'TransactionLinkController@delete', 'as' => 'delete']); - } ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks', - 'as' => 'api.v1.piggy_banks.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks', + 'as' => 'api.v1.piggy_banks.', ], static function () { // Piggy Bank API routes: @@ -269,8 +259,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences', - 'as' => 'api.v1.preferences.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences', + 'as' => 'api.v1.preferences.', ], static function () { // Preference API routes: @@ -281,8 +271,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences', - 'as' => 'api.v1.recurrences.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences', + 'as' => 'api.v1.recurrences.', ], static function () { // Recurrence API routes: @@ -297,8 +287,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules', - 'as' => 'api.v1.rules.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules', + 'as' => 'api.v1.rules.', ], static function () { // Rules API routes: @@ -315,8 +305,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups', - 'as' => 'api.v1.rule_groups.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups', + 'as' => 'api.v1.rule_groups.', ], static function () { // Rules API routes: @@ -335,8 +325,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search', - 'as' => 'api.v1.search.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search', + 'as' => 'api.v1.search.', ], static function () { // Attachment API routes: @@ -347,19 +337,18 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary', - 'as' => 'api.v1.summary.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary', + 'as' => 'api.v1.summary.', ], static function () { // Overview API routes: Route::get('basic', ['uses' => 'SummaryController@basic', 'as' => 'basic']); - } ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies', - 'as' => 'api.v1.currencies.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies', + 'as' => 'api.v1.currencies.', ], static function () { // Transaction currency API routes: @@ -385,8 +374,8 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags', - 'as' => 'api.v1.tags.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags', + 'as' => 'api.v1.tags.', ], static function () { // Tag API routes: Route::get('', ['uses' => 'TagController@index', 'as' => 'index']); @@ -399,18 +388,17 @@ Route::group( ); Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud', - 'as' => 'api.v1.tag-cloud.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud', + 'as' => 'api.v1.tag-cloud.', ], static function () { // Tag cloud API routes (to prevent collisions) Route::get('', ['uses' => 'TagController@cloud', 'as' => 'cloud']); } ); - Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions', - 'as' => 'api.v1.transactions.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions', + 'as' => 'api.v1.transactions.', ], static function () { // Transaction API routes: @@ -427,8 +415,8 @@ Route::group( // special group for transaction journals Route::group( - ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction-journals', - 'as' => 'api.v1.journals.'], + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction-journals', + 'as' => 'api.v1.journals.', ], static function () { // Transaction API routes: @@ -436,10 +424,9 @@ Route::group( } ); - Route::group( - ['middleware' => ['auth:api', 'bindings', \FireflyIII\Http\Middleware\IsAdmin::class], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'users', - 'as' => 'api.v1.users.'], + ['middleware' => ['auth:api', 'bindings', \FireflyIII\Http\Middleware\IsAdmin::class], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'users', + 'as' => 'api.v1.users.', ], static function () { // Users API routes: diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 31ed799293..e02e9602e9 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -1,7 +1,7 @@ push(trans('breadcrumbs.home'), route('index')); } ); Breadcrumbs::register( 'index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); } ); @@ -83,7 +83,7 @@ try { // ACCOUNTS Breadcrumbs::register( 'accounts.index', - function (BreadcrumbsGenerator $breadcrumbs, string $what) { + static function (BreadcrumbsGenerator $breadcrumbs, string $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); } @@ -98,7 +98,7 @@ try { Breadcrumbs::register( 'accounts.create', - function (BreadcrumbsGenerator $breadcrumbs, string $what) { + static function (BreadcrumbsGenerator $breadcrumbs, string $what) { $breadcrumbs->parent('accounts.index', $what); $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); } @@ -106,7 +106,7 @@ try { Breadcrumbs::register( 'accounts.show', - function (BreadcrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->parent('accounts.index', $what); @@ -114,8 +114,8 @@ try { if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start ? $start->formatLocalized((string)trans('config.month_and_day')) : '', - 'end' => $end ? $end->formatLocalized((string)trans('config.month_and_day')) : '',] + ['start' => $start ? $start->formatLocalized((string)trans('config.month_and_day')) : '', + 'end' => $end ? $end->formatLocalized((string)trans('config.month_and_day')) : '', ] ); $breadcrumbs->push($title, route('accounts.show', $account)); } @@ -124,7 +124,7 @@ try { Breadcrumbs::register( 'accounts.show.all', - function (BreadcrumbsGenerator $breadcrumbs, Account $account) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account) { $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->parent('accounts.index', $what); @@ -134,7 +134,7 @@ try { Breadcrumbs::register( 'accounts.reconcile', - function (BreadcrumbsGenerator $breadcrumbs, Account $account) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $breadcrumbs->push(trans('firefly.reconcile_account', ['account' => $account->name]), route('accounts.reconcile', [$account->id])); } @@ -142,7 +142,7 @@ try { Breadcrumbs::register( 'accounts.reconcile.show', - function (BreadcrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) { $breadcrumbs->parent('accounts.show', $account); $title = trans('firefly.reconciliation') . ' "' . $journal->description . '"'; $breadcrumbs->push($title, route('accounts.reconcile.show', [$journal->id])); @@ -151,7 +151,7 @@ try { Breadcrumbs::register( 'accounts.delete', - function (BreadcrumbsGenerator $breadcrumbs, Account $account) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $breadcrumbs->push(trans('firefly.delete_account', ['name' => limitStringLength($account->name)]), route('accounts.delete', [$account->id])); } @@ -159,7 +159,7 @@ try { Breadcrumbs::register( 'accounts.edit', - function (BreadcrumbsGenerator $breadcrumbs, Account $account) { + static function (BreadcrumbsGenerator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); @@ -172,7 +172,7 @@ try { // ADMIN Breadcrumbs::register( 'admin.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.administration'), route('admin.index')); } @@ -180,7 +180,7 @@ try { Breadcrumbs::register( 'admin.users', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.index'); $breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users')); } @@ -188,21 +188,21 @@ try { Breadcrumbs::register( 'admin.users.show', - function (BreadcrumbsGenerator $breadcrumbs, User $user) { + static function (BreadcrumbsGenerator $breadcrumbs, User $user) { $breadcrumbs->parent('admin.users'); $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id])); } ); Breadcrumbs::register( 'admin.users.edit', - function (BreadcrumbsGenerator $breadcrumbs, User $user) { + static function (BreadcrumbsGenerator $breadcrumbs, User $user) { $breadcrumbs->parent('admin.users'); $breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id])); } ); Breadcrumbs::register( 'admin.users.delete', - function (BreadcrumbsGenerator $breadcrumbs, User $user) { + static function (BreadcrumbsGenerator $breadcrumbs, User $user) { $breadcrumbs->parent('admin.users'); $breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id])); } @@ -210,7 +210,7 @@ try { Breadcrumbs::register( 'admin.users.domains', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.index'); $breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains')); } @@ -218,14 +218,14 @@ try { Breadcrumbs::register( 'admin.configuration.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.index'); $breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index')); } ); Breadcrumbs::register( 'admin.update-check', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.index'); $breadcrumbs->push(trans('firefly.update_check_title'), route('admin.update-check')); } @@ -233,7 +233,7 @@ try { Breadcrumbs::register( 'admin.links.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.index'); $breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index')); } @@ -241,7 +241,7 @@ try { Breadcrumbs::register( 'admin.links.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('admin.links.index'); $breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create')); } @@ -249,7 +249,7 @@ try { Breadcrumbs::register( 'admin.links.show', - function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { + static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { $breadcrumbs->parent('admin.links.index'); $breadcrumbs->push(trans('firefly.overview_for_link', ['name' => limitStringLength($linkType->name)]), route('admin.links.show', [$linkType->id])); } @@ -257,7 +257,7 @@ try { Breadcrumbs::register( 'admin.links.edit', - function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { + static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { $breadcrumbs->parent('admin.links.index'); $breadcrumbs->push(trans('firefly.edit_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.edit', [$linkType->id])); } @@ -265,7 +265,7 @@ try { Breadcrumbs::register( 'admin.links.delete', - function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { + static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) { $breadcrumbs->parent('admin.links.index'); $breadcrumbs->push(trans('firefly.delete_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.delete', [$linkType->id])); } @@ -289,7 +289,7 @@ try { Breadcrumbs::register( 'transactions.link.delete', - function (BreadcrumbsGenerator $breadcrumbs, TransactionJournalLink $link) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournalLink $link) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id)); } @@ -298,7 +298,7 @@ try { // ATTACHMENTS Breadcrumbs::register( 'attachments.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.attachments'), route('attachments.index')); } @@ -306,7 +306,7 @@ try { Breadcrumbs::register( 'attachments.edit', - function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) { + static function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) { $object = $attachment->attachable; if ($object instanceof TransactionJournal) { $group = $object->transactionGroup; @@ -323,7 +323,7 @@ try { ); Breadcrumbs::register( 'attachments.delete', - function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) { + static function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) { $object = $attachment->attachable; if ($object instanceof TransactionJournal) { $breadcrumbs->parent('transactions.show', $object->transactionGroup); @@ -340,14 +340,14 @@ try { // BILLS Breadcrumbs::register( 'bills.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index')); } ); Breadcrumbs::register( 'bills.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create')); } @@ -355,14 +355,14 @@ try { Breadcrumbs::register( 'bills.edit', - function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { + static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => limitStringLength($bill->name)]), route('bills.edit', [$bill->id])); } ); Breadcrumbs::register( 'bills.delete', - function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { + static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => limitStringLength($bill->name)]), route('bills.delete', [$bill->id])); } @@ -370,7 +370,7 @@ try { Breadcrumbs::register( 'bills.show', - function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { + static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(limitStringLength($bill->name), route('bills.show', [$bill->id])); } @@ -379,14 +379,14 @@ try { // BUDGETS Breadcrumbs::register( 'budgets.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index')); } ); Breadcrumbs::register( 'budgets.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create')); } @@ -394,14 +394,14 @@ try { Breadcrumbs::register( 'budgets.edit', - function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { + static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('firefly.edit_budget', ['name' => limitStringLength($budget->name)]), route('budgets.edit', [$budget->id])); } ); Breadcrumbs::register( 'budgets.delete', - function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { + static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('firefly.delete_budget', ['name' => limitStringLength($budget->name)]), route('budgets.delete', [$budget->id])); } @@ -409,14 +409,14 @@ try { Breadcrumbs::register( 'budgets.no-budget', - function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push($title, route('budgets.no-budget')); } @@ -425,7 +425,7 @@ try { Breadcrumbs::register( 'budgets.no-budget-all', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget-all')); @@ -434,7 +434,7 @@ try { Breadcrumbs::register( 'budgets.show', - function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { + static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(limitStringLength($budget->name), route('budgets.show', [$budget->id])); $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id])); @@ -443,14 +443,14 @@ try { Breadcrumbs::register( 'budgets.show.limit', - function (BreadcrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) { + static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(limitStringLength($budget->name), route('budgets.show', [$budget->id])); $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $budgetLimit->start_date->formatLocalized((string)trans('config.month_and_day')), - 'end' => $budgetLimit->end_date->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $budgetLimit->start_date->formatLocalized((string)trans('config.month_and_day')), + 'end' => $budgetLimit->end_date->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push( @@ -463,14 +463,14 @@ try { // CATEGORIES Breadcrumbs::register( 'categories.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.categories'), route('categories.index')); } ); Breadcrumbs::register( 'categories.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('firefly.new_category'), route('categories.create')); } @@ -478,14 +478,14 @@ try { Breadcrumbs::register( 'categories.edit', - function (BreadcrumbsGenerator $breadcrumbs, Category $category) { + static function (BreadcrumbsGenerator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show.all', $category); $breadcrumbs->push(trans('firefly.edit_category', ['name' => limitStringLength($category->name)]), route('categories.edit', [$category->id])); } ); Breadcrumbs::register( 'categories.delete', - function (BreadcrumbsGenerator $breadcrumbs, Category $category) { + static function (BreadcrumbsGenerator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); $breadcrumbs->push(trans('firefly.delete_category', ['name' => limitStringLength($category->name)]), route('categories.delete', [$category->id])); } @@ -493,14 +493,14 @@ try { Breadcrumbs::register( 'categories.show', - function (BreadcrumbsGenerator $breadcrumbs, Category $category, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, Category $category, Carbon $start = null, Carbon $end = null) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(limitStringLength($category->name), route('categories.show', [$category->id])); if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push($title, route('categories.show', [$category->id])); } @@ -509,7 +509,7 @@ try { Breadcrumbs::register( 'categories.show.all', - function (BreadcrumbsGenerator $breadcrumbs, Category $category) { + static function (BreadcrumbsGenerator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(limitStringLength($category->name), route('categories.show', [$category->id])); $breadcrumbs->push(trans('firefly.everything'), route('categories.show.all', [$category->id])); @@ -518,24 +518,23 @@ try { Breadcrumbs::register( 'categories.no-category', - function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push($title, route('categories.no-category')); } } ); - Breadcrumbs::register( 'categories.no-category.all', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category.all')); @@ -545,7 +544,7 @@ try { // CURRENCIES Breadcrumbs::register( 'currencies.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.currencies'), route('currencies.index')); } @@ -553,7 +552,7 @@ try { Breadcrumbs::register( 'currencies.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('currencies.index'); $breadcrumbs->push(trans('firefly.create_currency'), route('currencies.create')); } @@ -561,14 +560,14 @@ try { Breadcrumbs::register( 'currencies.edit', - function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currencies.index'); $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => $currency->name]), route('currencies.edit', [$currency->id])); } ); Breadcrumbs::register( 'currencies.delete', - function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currencies.index'); $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => $currency->name]), route('currencies.delete', [$currency->id])); } @@ -577,7 +576,7 @@ try { // EXPORT Breadcrumbs::register( 'export.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.export_data_bc'), route('export.index')); } @@ -586,14 +585,14 @@ try { // PIGGY BANKS Breadcrumbs::register( 'piggy-banks.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index')); } ); Breadcrumbs::register( 'piggy-banks.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create')); } @@ -601,14 +600,14 @@ try { Breadcrumbs::register( 'piggy-banks.edit', - function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => $piggyBank->name]), route('piggy-banks.edit', [$piggyBank->id])); } ); Breadcrumbs::register( 'piggy-banks.delete', - function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]), route('piggy-banks.delete', [$piggyBank->id])); } @@ -616,7 +615,7 @@ try { Breadcrumbs::register( 'piggy-banks.show', - function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push($piggyBank->name, route('piggy-banks.show', [$piggyBank->id])); } @@ -624,7 +623,7 @@ try { Breadcrumbs::register( 'piggy-banks.add-money-mobile', - function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id])); } @@ -632,7 +631,7 @@ try { Breadcrumbs::register( 'piggy-banks.remove-money-mobile', - function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push( trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]), @@ -644,7 +643,7 @@ try { // IMPORT Breadcrumbs::register( 'import.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.import_index_title'), route('import.index')); } @@ -652,7 +651,7 @@ try { Breadcrumbs::register( 'import.prerequisites.index', - function (BreadcrumbsGenerator $breadcrumbs, string $importProvider) { + static function (BreadcrumbsGenerator $breadcrumbs, string $importProvider) { $breadcrumbs->parent('import.index'); $breadcrumbs->push(trans('import.prerequisites_breadcrumb_' . $importProvider), route('import.prerequisites.index', [$importProvider])); } @@ -660,7 +659,7 @@ try { Breadcrumbs::register( 'import.job.configuration.index', - function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) { + static function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) { $breadcrumbs->parent('import.index'); $breadcrumbs->push(trans('import.job_configuration_breadcrumb', ['key' => $job->key]), route('import.job.configuration.index', [$job->key])); } @@ -668,17 +667,16 @@ try { Breadcrumbs::register( 'import.job.status.index', - function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) { + static function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) { $breadcrumbs->parent('import.index'); $breadcrumbs->push(trans('import.job_status_breadcrumb', ['key' => $job->key]), route('import.job.status.index', [$job->key])); } ); - // PREFERENCES Breadcrumbs::register( 'preferences.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index')); } @@ -686,7 +684,7 @@ try { Breadcrumbs::register( 'profile.code', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); } @@ -694,7 +692,7 @@ try { Breadcrumbs::register( 'profile.new-backup-codes', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); } @@ -703,14 +701,14 @@ try { // PROFILE Breadcrumbs::register( 'profile.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); } ); Breadcrumbs::register( 'profile.change-password', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('profile.index'); $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('profile.change-password')); } @@ -718,7 +716,7 @@ try { Breadcrumbs::register( 'profile.change-email', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('profile.index'); $breadcrumbs->push(trans('breadcrumbs.change_email'), route('profile.change-email')); } @@ -726,7 +724,7 @@ try { Breadcrumbs::register( 'profile.delete-account', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('profile.index'); $breadcrumbs->push(trans('firefly.delete_account'), route('profile.delete-account')); } @@ -735,7 +733,7 @@ try { // REPORTS Breadcrumbs::register( 'reports.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index')); } @@ -743,7 +741,7 @@ try { Breadcrumbs::register( 'reports.report.audit', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -756,7 +754,7 @@ try { ); Breadcrumbs::register( 'reports.report.budget', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -770,7 +768,7 @@ try { Breadcrumbs::register( 'reports.report.tag', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -784,7 +782,7 @@ try { Breadcrumbs::register( 'reports.report.category', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -798,7 +796,7 @@ try { Breadcrumbs::register( 'reports.report.double', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $doubleIds, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $doubleIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -812,7 +810,7 @@ try { Breadcrumbs::register( 'reports.report.default', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { + static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); @@ -827,7 +825,7 @@ try { // New user Controller Breadcrumbs::register( 'new-user.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index')); } @@ -836,14 +834,14 @@ try { // Recurring transactions controller: Breadcrumbs::register( 'recurring.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.recurrences'), route('recurring.index')); } ); Breadcrumbs::register( 'recurring.show', - function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { + static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { $breadcrumbs->parent('recurring.index'); $breadcrumbs->push($recurrence->title, route('recurring.show', [$recurrence->id])); } @@ -851,7 +849,7 @@ try { Breadcrumbs::register( 'recurring.delete', - function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { + static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { $breadcrumbs->parent('recurring.index'); $breadcrumbs->push(trans('firefly.delete_recurring', ['title' => $recurrence->title]), route('recurring.delete', [$recurrence->id])); } @@ -859,7 +857,7 @@ try { Breadcrumbs::register( 'recurring.edit', - function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { + static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) { $breadcrumbs->parent('recurring.index'); $breadcrumbs->push(trans('firefly.edit_recurrence', ['title' => $recurrence->title]), route('recurring.edit', [$recurrence->id])); } @@ -867,7 +865,7 @@ try { Breadcrumbs::register( 'recurring.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('recurring.index'); $breadcrumbs->push(trans('firefly.create_new_recurrence'), route('recurring.create')); } @@ -876,7 +874,7 @@ try { // Rules Breadcrumbs::register( 'rules.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('firefly.rules'), route('rules.index')); } @@ -884,7 +882,7 @@ try { Breadcrumbs::register( 'rules.create', - function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup = null) { + static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup = null) { $breadcrumbs->parent('rules.index'); if (null === $ruleGroup) { $breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create')); @@ -892,13 +890,12 @@ try { if (null !== $ruleGroup) { $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup])); } - } ); Breadcrumbs::register( 'rules.create-from-bill', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create')); } @@ -906,7 +903,7 @@ try { Breadcrumbs::register( 'rules.create-from-journal', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create')); } @@ -914,35 +911,35 @@ try { Breadcrumbs::register( 'rules.edit', - function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { + static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule])); } ); Breadcrumbs::register( 'rules.delete', - function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { + static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule])); } ); Breadcrumbs::register( 'rule-groups.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create')); } ); Breadcrumbs::register( 'rule-groups.edit', - function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup])); } ); Breadcrumbs::register( 'rule-groups.delete', - function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup])); } @@ -950,7 +947,7 @@ try { Breadcrumbs::register( 'rules.select-transactions', - function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { + static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push( trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule]) @@ -960,7 +957,7 @@ try { Breadcrumbs::register( 'rule-groups.select-transactions', - function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push( trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup]) @@ -971,7 +968,7 @@ try { // SEARCH Breadcrumbs::register( 'search.index', - function (BreadcrumbsGenerator $breadcrumbs, $query) { + static function (BreadcrumbsGenerator $breadcrumbs, $query) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => $query]), route('search.index')); } @@ -980,7 +977,7 @@ try { // TAGS Breadcrumbs::register( 'tags.index', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index')); } @@ -988,7 +985,7 @@ try { Breadcrumbs::register( 'tags.create', - function (BreadcrumbsGenerator $breadcrumbs) { + static function (BreadcrumbsGenerator $breadcrumbs) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create')); } @@ -996,7 +993,7 @@ try { Breadcrumbs::register( 'tags.edit', - function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { + static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => $tag->tag]), route('tags.edit', [$tag->id])); } @@ -1004,7 +1001,7 @@ try { Breadcrumbs::register( 'tags.delete', - function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { + static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]), route('tags.delete', [$tag->id])); } @@ -1012,25 +1009,24 @@ try { Breadcrumbs::register( 'tags.show', - function (BreadcrumbsGenerator $breadcrumbs, Tag $tag, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag, Carbon $start = null, Carbon $end = null) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push($tag->tag, route('tags.show', [$tag->id, $start, $end])); - if (null !== $start && $end !== null) { + if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push($title, route('tags.show', [$tag->id, $start, $end])); } } ); - Breadcrumbs::register( 'tags.show.all', - function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { + static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push($tag->tag, route('tags.show', [$tag->id])); $title = (string)trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); @@ -1042,7 +1038,7 @@ try { Breadcrumbs::register( 'transactions.index', - function (BreadcrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { + static function (BreadcrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); @@ -1050,8 +1046,8 @@ try { // add date range: $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')), ] ); $breadcrumbs->push($title, route('transactions.index', [$what, $start, $end])); } @@ -1060,7 +1056,7 @@ try { Breadcrumbs::register( 'transactions.index.all', - function (BreadcrumbsGenerator $breadcrumbs, string $what) { + static function (BreadcrumbsGenerator $breadcrumbs, string $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); } @@ -1068,7 +1064,7 @@ try { Breadcrumbs::register( 'transactions.create', - function (BreadcrumbsGenerator $breadcrumbs, string $objectType) { + static function (BreadcrumbsGenerator $breadcrumbs, string $objectType) { $breadcrumbs->parent('transactions.index', $objectType); $breadcrumbs->push(trans('breadcrumbs.create_new_transaction'), route('transactions.create', [$objectType])); } @@ -1076,7 +1072,7 @@ try { Breadcrumbs::register( 'transactions.edit', - function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) { $breadcrumbs->parent('transactions.show', $group); /** @var TransactionJournal $first */ @@ -1091,7 +1087,7 @@ try { // also edit reconciliations: Breadcrumbs::register( 'accounts.reconcile.edit', - function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push( trans('breadcrumbs.edit_reconciliation', ['description' => limitStringLength($journal->description)]), @@ -1123,14 +1119,16 @@ try { if ($group->transactionJournals()->count() > 1) { $title = limitStringLength($group->title); } - if('opening balance' === $type) { + if ('opening balance' === $type) { // TODO link to account. $breadcrumbs->push($title, route('transactions.show', [$group->id])); + return; } - if('reconciliation' === $type) { + if ('reconciliation' === $type) { // TODO link to account. $breadcrumbs->push($title, route('transactions.show', [$group->id])); + return; } @@ -1141,7 +1139,7 @@ try { Breadcrumbs::register( 'transactions.convert.index', - function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group, string $groupTitle) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group, string $groupTitle) { $breadcrumbs->parent('transactions.show', $group); $breadcrumbs->push( trans('firefly.breadcrumb_convert_group', ['description' => limitStringLength($groupTitle)]), @@ -1194,7 +1192,7 @@ try { // SPLIT Breadcrumbs::register( 'transactions.split.edit', - function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id])); } diff --git a/routes/channels.php b/routes/channels.php index 99f71025cd..82d15ce1bc 100644 --- a/routes/channels.php +++ b/routes/channels.php @@ -2,7 +2,7 @@ /** * channels.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -22,7 +22,6 @@ declare(strict_types=1); - /* |-------------------------------------------------------------------------- | Broadcast Channels @@ -35,7 +34,7 @@ declare(strict_types=1); */ Broadcast::channel( - 'App.User.{id}', function ($user, $id) { - return (int)$user->id === (int)$id; -} + 'App.User.{id}', static function ($user, $id) { + return (int)$user->id === (int)$id; + } ); diff --git a/routes/console.php b/routes/console.php index a41e05185a..8c064c20b5 100644 --- a/routes/console.php +++ b/routes/console.php @@ -2,7 +2,7 @@ /** * console.php - * Copyright (c) 2019 james@firefly-iii.org + * Copyright (c) 2019 james@firefly-iii.org. * * This file is part of Firefly III (https://github.com/firefly-iii). * @@ -21,4 +21,3 @@ */ declare(strict_types=1); - diff --git a/routes/web.php b/routes/web.php index b8d6f0dcf0..89e1c7abc4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,7 @@ 'FireflyIII\Http\Controllers\System', - 'as' => 'installer.', 'prefix' => 'install'], static function () { - Route::get('', ['uses' => 'InstallController@index', 'as' => 'index']); - Route::post('runCommand', ['uses' => 'InstallController@runCommand', 'as' => 'runCommand']); -} + ['namespace' => 'FireflyIII\Http\Controllers\System', + 'as' => 'installer.', 'prefix' => 'install', ], static function () { + Route::get('', ['uses' => 'InstallController@index', 'as' => 'index']); + Route::post('runCommand', ['uses' => 'InstallController@runCommand', 'as' => 'runCommand']); + } ); Route::group( ['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System', 'as' => 'cron.', 'prefix' => 'cron'], static function () { - Route::get('run/{cliToken}', ['uses' => 'CronController@cron', 'as' => 'cron']); -} + Route::get('run/{cliToken}', ['uses' => 'CronController@cron', 'as' => 'cron']); + } ); /** @@ -42,25 +42,23 @@ Route::group( ['middleware' => 'user-not-logged-in', 'namespace' => 'FireflyIII\Http\Controllers'], static function () { // Authentication Routes... - Route::get('login',['uses' =>'Auth\LoginController@showLoginForm', 'as' => 'login']); - Route::post('login',['uses' => 'Auth\LoginController@login','as' => 'login.post']); + Route::get('login', ['uses' =>'Auth\LoginController@showLoginForm', 'as' => 'login']); + Route::post('login', ['uses' => 'Auth\LoginController@login', 'as' => 'login.post']); + // Registration Routes... + Route::get('register', ['uses' => 'Auth\RegisterController@showRegistrationForm', 'as' => 'register']); + Route::post('register', 'Auth\RegisterController@register'); - // Registration Routes... - Route::get('register', ['uses' => 'Auth\RegisterController@showRegistrationForm', 'as' => 'register']); - Route::post('register', 'Auth\RegisterController@register'); + // Password Reset Routes... + Route::get('password/reset/{token}', ['uses' => 'Auth\ResetPasswordController@showResetForm', 'as' => 'password.reset']); + Route::post('password/email', ['uses' => 'Auth\ForgotPasswordController@sendResetLinkEmail', 'as' => 'password.email']); + Route::post('password/reset', ['uses' => 'Auth\ResetPasswordController@reset']); + Route::get('password/reset', ['uses' => 'Auth\ForgotPasswordController@showLinkRequestForm', 'as' => 'password.reset.request']); - // Password Reset Routes... - Route::get('password/reset/{token}', ['uses' => 'Auth\ResetPasswordController@showResetForm', 'as' => 'password.reset']); - Route::post('password/email', ['uses' => 'Auth\ForgotPasswordController@sendResetLinkEmail', 'as' => 'password.email']); - Route::post('password/reset', ['uses' => 'Auth\ResetPasswordController@reset']); - Route::get('password/reset', ['uses' => 'Auth\ForgotPasswordController@showLinkRequestForm', 'as' => 'password.reset.request']); - - // Change email routes: - Route::get('profile/confirm-email-change/{token}', ['uses' => 'ProfileController@confirmEmailChange', 'as' => 'profile.confirm-email-change']); - Route::get('profile/undo-email-change/{token}/{oldAddressHash}', ['uses' => 'ProfileController@undoEmailChange', 'as' => 'profile.undo-email-change']); - -} + // Change email routes: + Route::get('profile/confirm-email-change/{token}', ['uses' => 'ProfileController@confirmEmailChange', 'as' => 'profile.confirm-email-change']); + Route::get('profile/undo-email-change/{token}/{oldAddressHash}', ['uses' => 'ProfileController@undoEmailChange', 'as' => 'profile.undo-email-change']); + } ); /** @@ -68,15 +66,14 @@ Route::group( */ Route::group( ['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'], static function () { - Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']); - Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); - Route::get('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']); - Route::get('routes', ['uses' => 'DebugController@routes', 'as' => 'routes']); - Route::get('debug', 'DebugController@index')->name('debug'); -} + Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']); + Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); + Route::get('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']); + Route::get('routes', ['uses' => 'DebugController@routes', 'as' => 'routes']); + Route::get('debug', 'DebugController@index')->name('debug'); + } ); - ///** // * For the two factor routes, the user must be logged in, but NOT 2FA. Account confirmation does not matter here. // * @@ -96,147 +93,140 @@ Route::group( */ /** - * Home Controller + * Home Controller. */ Route::group( ['middleware' => ['user-full-auth'], 'namespace' => 'FireflyIII\Http\Controllers'], static function () { - Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']); - Route::get('/flash', ['uses' => 'DebugController@testFlash', 'as' => 'test-flash']); - Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); - Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); -} + Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']); + Route::get('/flash', ['uses' => 'DebugController@testFlash', 'as' => 'test-flash']); + Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); + Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); + } ); - //// show inactive // /** - * Account Controller + * Account Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'inactive-accounts', 'as' => 'accounts.'], static function () { - Route::get('{objectType}', ['uses' => 'Account\IndexController@inactive', 'as' => 'inactive.index'])->where( + Route::get('{objectType}', ['uses' => 'Account\IndexController@inactive', 'as' => 'inactive.index'])->where( 'objectType', 'revenue|asset|expense|liabilities' ); -} + } ); Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], static function () { // show: - Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities'); + Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities'); - // create - Route::get('create/{objectType}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where( + // create + Route::get('create/{objectType}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where( 'objectType', 'revenue|asset|expense|liabilities' ); - Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']); + Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']); + // edit + Route::get('edit/{account}', ['uses' => 'Account\EditController@edit', 'as' => 'edit']); + Route::post('update/{account}', ['uses' => 'Account\EditController@update', 'as' => 'update']); - // edit - Route::get('edit/{account}', ['uses' => 'Account\EditController@edit', 'as' => 'edit']); - Route::post('update/{account}', ['uses' => 'Account\EditController@update', 'as' => 'update']); + // delete + Route::get('delete/{account}', ['uses' => 'Account\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{account}', ['uses' => 'Account\DeleteController@destroy', 'as' => 'destroy']); - // delete - Route::get('delete/{account}', ['uses' => 'Account\DeleteController@delete', 'as' => 'delete']); - Route::post('destroy/{account}', ['uses' => 'Account\DeleteController@destroy', 'as' => 'destroy']); + // show + Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']); + Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show']); - // show - Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']); - Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show']); + // reconcile routes: + Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile']); + Route::post('reconcile/{account}/submit/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@submit', 'as' => 'reconcile.submit']); - // reconcile routes: - Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile']); - Route::post('reconcile/{account}/submit/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@submit', 'as' => 'reconcile.submit']); - - // reconcile JSON routes - Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview']); - Route::get( + // reconcile JSON routes + Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview']); + Route::get( 'reconcile/{account}/transactions/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions'] ); - // show reconciliation + // show reconciliation // TODO improve me //Route::get('reconcile/show/{transactionGroup}', ['uses' => 'Account\ReconcileController@show', 'as' => 'reconcile.show']); //Route::get('reconcile/edit/{transactionGroup}', ['uses' => 'Account\ReconcileController@edit', 'as' => 'reconcile.edit']); //Route::post('reconcile/update/{transactionGroup}', ['uses' => 'Account\ReconcileController@update', 'as' => 'reconcile.update']); - - -} + } ); /** - * Attachment Controller + * Attachment Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'attachments', 'as' => 'attachments.'], static function () { - Route::get('', ['uses' => 'AttachmentController@index', 'as' => 'index']); - Route::get('edit/{attachment}', ['uses' => 'AttachmentController@edit', 'as' => 'edit']); - Route::get('delete/{attachment}', ['uses' => 'AttachmentController@delete', 'as' => 'delete']); - Route::get('download/{attachment}', ['uses' => 'AttachmentController@download', 'as' => 'download']); - Route::get('view/{attachment}', ['uses' => 'AttachmentController@view', 'as' => 'view']); + Route::get('', ['uses' => 'AttachmentController@index', 'as' => 'index']); + Route::get('edit/{attachment}', ['uses' => 'AttachmentController@edit', 'as' => 'edit']); + Route::get('delete/{attachment}', ['uses' => 'AttachmentController@delete', 'as' => 'delete']); + Route::get('download/{attachment}', ['uses' => 'AttachmentController@download', 'as' => 'download']); + Route::get('view/{attachment}', ['uses' => 'AttachmentController@view', 'as' => 'view']); - Route::post('update/{attachment}', ['uses' => 'AttachmentController@update', 'as' => 'update']); - Route::post('destroy/{attachment}', ['uses' => 'AttachmentController@destroy', 'as' => 'destroy']); - -} + Route::post('update/{attachment}', ['uses' => 'AttachmentController@update', 'as' => 'update']); + Route::post('destroy/{attachment}', ['uses' => 'AttachmentController@destroy', 'as' => 'destroy']); + } ); /** - * Bills Controller + * Bills Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'bills', 'as' => 'bills.'], static function () { - Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); - Route::get('rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'rescan']); - Route::get('create', ['uses' => 'BillController@create', 'as' => 'create']); - Route::get('edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'edit']); - Route::get('delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']); - Route::get('show/{bill}', ['uses' => 'BillController@show', 'as' => 'show']); + Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); + Route::get('rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'rescan']); + Route::get('create', ['uses' => 'BillController@create', 'as' => 'create']); + Route::get('edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'edit']); + Route::get('delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']); + Route::get('show/{bill}', ['uses' => 'BillController@show', 'as' => 'show']); - Route::post('store', ['uses' => 'BillController@store', 'as' => 'store']); - Route::post('update/{bill}', ['uses' => 'BillController@update', 'as' => 'update']); - Route::post('destroy/{bill}', ['uses' => 'BillController@destroy', 'as' => 'destroy']); -} + Route::post('store', ['uses' => 'BillController@store', 'as' => 'store']); + Route::post('update/{bill}', ['uses' => 'BillController@update', 'as' => 'update']); + Route::post('destroy/{bill}', ['uses' => 'BillController@destroy', 'as' => 'destroy']); + } ); - /** - * Budget Controller + * Budget Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budgets', 'as' => 'budgets.'], static function () { // delete - Route::get('delete/{budget}', ['uses' => 'Budget\DeleteController@delete', 'as' => 'delete']); - Route::post('destroy/{budget}', ['uses' => 'Budget\DeleteController@destroy', 'as' => 'destroy']); + Route::get('delete/{budget}', ['uses' => 'Budget\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{budget}', ['uses' => 'Budget\DeleteController@destroy', 'as' => 'destroy']); - // create - Route::get('create', ['uses' => 'Budget\CreateController@create', 'as' => 'create']); - Route::post('store', ['uses' => 'Budget\CreateController@store', 'as' => 'store']); + // create + Route::get('create', ['uses' => 'Budget\CreateController@create', 'as' => 'create']); + Route::post('store', ['uses' => 'Budget\CreateController@store', 'as' => 'store']); - // edit - Route::get('edit/{budget}', ['uses' => 'Budget\EditController@edit', 'as' => 'edit']); - Route::post('update/{budget}', ['uses' => 'Budget\EditController@update', 'as' => 'update']); + // edit + Route::get('edit/{budget}', ['uses' => 'Budget\EditController@edit', 'as' => 'edit']); + Route::post('update/{budget}', ['uses' => 'Budget\EditController@update', 'as' => 'update']); - // show - Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']); - Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']); - Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']); - Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']); + // show + Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']); + Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']); + Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']); + Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']); - // reorder budgets - Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']); + // reorder budgets + Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']); - // index - Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']); - -} + // index + Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']); + } ); /** - * Available Budget Controller + * Available Budget Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'available-budgets', 'as' => 'available-budgets.'], @@ -257,14 +247,12 @@ Route::group( } ); - /** - * Budget Limit Controller + * Budget Limit Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budget-limits', 'as' => 'budget-limits.'], static function () { - Route::get('create/{budget}/{start_date}/{end_date}', ['uses' => 'Budget\BudgetLimitController@create', 'as' => 'create']); Route::post('store', ['uses' => 'Budget\BudgetLimitController@store', 'as' => 'store']); @@ -275,60 +263,57 @@ Route::group( ); /** - * Category Controller + * Category Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'categories', 'as' => 'categories.'], static function () { // index: - Route::get('', ['uses' => 'Category\IndexController@index', 'as' => 'index']); + Route::get('', ['uses' => 'Category\IndexController@index', 'as' => 'index']); - // create - Route::get('create', ['uses' => 'Category\CreateController@create', 'as' => 'create']); - Route::post('store', ['uses' => 'Category\CreateController@store', 'as' => 'store']); + // create + Route::get('create', ['uses' => 'Category\CreateController@create', 'as' => 'create']); + Route::post('store', ['uses' => 'Category\CreateController@store', 'as' => 'store']); - // edit - Route::get('edit/{category}', ['uses' => 'Category\EditController@edit', 'as' => 'edit']); - Route::post('update/{category}', ['uses' => 'Category\EditController@update', 'as' => 'update']); + // edit + Route::get('edit/{category}', ['uses' => 'Category\EditController@edit', 'as' => 'edit']); + Route::post('update/{category}', ['uses' => 'Category\EditController@update', 'as' => 'update']); - // delete - Route::get('delete/{category}', ['uses' => 'Category\DeleteController@delete', 'as' => 'delete']); - Route::post('destroy/{category}', ['uses' => 'Category\DeleteController@destroy', 'as' => 'destroy']); + // delete + Route::get('delete/{category}', ['uses' => 'Category\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{category}', ['uses' => 'Category\DeleteController@destroy', 'as' => 'destroy']); - // show category: - Route::get('show/{category}/all', ['uses' => 'Category\ShowController@showAll', 'as' => 'show.all']); - Route::get('show/{category}/{start_date?}/{end_date?}', ['uses' => 'Category\ShowController@show', 'as' => 'show']); + // show category: + Route::get('show/{category}/all', ['uses' => 'Category\ShowController@showAll', 'as' => 'show.all']); + Route::get('show/{category}/{start_date?}/{end_date?}', ['uses' => 'Category\ShowController@show', 'as' => 'show']); - // no category controller: - Route::get('list/no-category/all', ['uses' => 'Category\NoCategoryController@showAll', 'as' => 'no-category.all']); - Route::get('list/no-category/{start_date?}/{end_date?}', ['uses' => 'Category\NoCategoryController@show', 'as' => 'no-category']); - -} + // no category controller: + Route::get('list/no-category/all', ['uses' => 'Category\NoCategoryController@showAll', 'as' => 'no-category.all']); + Route::get('list/no-category/{start_date?}/{end_date?}', ['uses' => 'Category\NoCategoryController@show', 'as' => 'no-category']); + } ); - /** - * Currency Controller + * Currency Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'currencies', 'as' => 'currencies.'], static function () { - Route::get('', ['uses' => 'CurrencyController@index', 'as' => 'index']); - Route::get('create', ['uses' => 'CurrencyController@create', 'as' => 'create']); - Route::get('edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'edit']); - Route::get('delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'delete']); - Route::get('default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'default']); - Route::get('enable/{currency}', ['uses' => 'CurrencyController@enableCurrency', 'as' => 'enable']); - Route::get('disable/{currency}', ['uses' => 'CurrencyController@disableCurrency', 'as' => 'disable']); + Route::get('', ['uses' => 'CurrencyController@index', 'as' => 'index']); + Route::get('create', ['uses' => 'CurrencyController@create', 'as' => 'create']); + Route::get('edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'edit']); + Route::get('delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'delete']); + Route::get('default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'default']); + Route::get('enable/{currency}', ['uses' => 'CurrencyController@enableCurrency', 'as' => 'enable']); + Route::get('disable/{currency}', ['uses' => 'CurrencyController@disableCurrency', 'as' => 'disable']); - Route::post('store', ['uses' => 'CurrencyController@store', 'as' => 'store']); - Route::post('update/{currency}', ['uses' => 'CurrencyController@update', 'as' => 'update']); - Route::post('destroy/{currency}', ['uses' => 'CurrencyController@destroy', 'as' => 'destroy']); - -} + Route::post('store', ['uses' => 'CurrencyController@store', 'as' => 'store']); + Route::post('update/{currency}', ['uses' => 'CurrencyController@update', 'as' => 'update']); + Route::post('destroy/{currency}', ['uses' => 'CurrencyController@destroy', 'as' => 'destroy']); + } ); /** - * Chart\Account Controller (default report) + * Chart\Account Controller (default report). */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/account', 'as' => 'chart.account.'], @@ -349,26 +334,23 @@ Route::group( } ); - /** - * Chart\Bill Controller + * Chart\Bill Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/bill', 'as' => 'chart.bill.'], static function () { Route::get('frontpage', ['uses' => 'BillController@frontpage', 'as' => 'frontpage']); Route::get('single/{bill}', ['uses' => 'BillController@single', 'as' => 'single']); - } ); /** - * Chart\Budget Controller + * Chart\Budget Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/budget', 'as' => 'chart.budget.'], static function () { - Route::get('frontpage', ['uses' => 'BudgetController@frontpage', 'as' => 'frontpage']); Route::get('period/0/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@periodNoBudget', 'as' => 'period.no-budget']); Route::get('period/{budget}/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period']); @@ -401,12 +383,11 @@ Route::group( ); /** - * Chart\Category Controller + * Chart\Category Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/category', 'as' => 'chart.category.'], static function () { - Route::get('frontpage', ['uses' => 'CategoryController@frontPage', 'as' => 'frontpage']); Route::get('period/{category}', ['uses' => 'CategoryController@currentPeriod', 'as' => 'current']); Route::get('period/{category}/{date}', ['uses' => 'CategoryController@specificPeriod', 'as' => 'specific']); @@ -414,7 +395,6 @@ Route::group( Route::get('report-period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']); Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period']); - Route::get('category/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@categoryExpense', 'as' => 'category-expense']); Route::get('category/income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@categoryIncome', 'as' => 'category-income']); Route::get('budget/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@budgetExpense', 'as' => 'budget-expense']); @@ -423,29 +403,26 @@ Route::group( Route::get('dest/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@destinationExpense', 'as' => 'dest-expense']); Route::get('dest/income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@destinationIncome', 'as' => 'dest-income']); Route::get('operations/{accountList}/{category}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']); - } ); /** - * Chart\Tag Controller + * Chart\Tag Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/tag', 'as' => 'chart.tag.'], static function () { + Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense']); + Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income']); + Route::get('category/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']); + Route::get('category/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']); + Route::get('budget/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']); + Route::get('source/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']); + Route::get('source/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceIncome', 'as' => 'source-income']); + Route::get('dest/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'tagReportController@destinationExpense', 'as' => 'dest-expense']); + Route::get('dest/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@destinationIncome', 'as' => 'dest-income']); - Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense']); - Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income']); - Route::get('category/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']); - Route::get('category/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']); - Route::get('budget/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']); - Route::get('source/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']); - Route::get('source/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceIncome', 'as' => 'source-income']); - Route::get('dest/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'tagReportController@destinationExpense', 'as' => 'dest-expense']); - Route::get('dest/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@destinationIncome', 'as' => 'dest-income']); - - Route::get('operations/{accountList}/{tag}/{start_date}/{end_date}', ['uses' => 'TagReportController@mainChart', 'as' => 'main']); - -} + Route::get('operations/{accountList}/{tag}/{start_date}/{end_date}', ['uses' => 'TagReportController@mainChart', 'as' => 'main']); + } ); /** @@ -454,7 +431,6 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/double', 'as' => 'chart.double.'], static function () { - Route::get('main/{accountList}/{account}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@mainChart', 'as' => 'main']); Route::get('category/expense/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@categoryExpense', 'as' => 'category-expense']); @@ -466,9 +442,8 @@ Route::group( } ); - /** - * Chart\PiggyBank Controller + * Chart\PiggyBank Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/piggy-bank', 'as' => 'chart.piggy-bank.'], @@ -478,19 +453,18 @@ Route::group( ); /** - * Chart\Report Controller + * Chart\Report Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/report', 'as' => 'chart.report.'], static function () { Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@operations', 'as' => 'operations']); Route::get('net-worth/{accountList}/{start_date}/{end_date}/', ['uses' => 'ReportController@netWorth', 'as' => 'net-worth']); - } ); /** - * Chart\Transactions Controller + * Chart\Transactions Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/transactions', 'as' => 'chart.transactions.'], @@ -500,252 +474,236 @@ Route::group( Route::get('destinationAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@destinationAccounts', 'as' => 'destinationAccounts']); Route::get('sourceAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@sourceAccounts', 'as' => 'sourceAccounts']); // - } ); /** - * Export controller + * Export controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'export', 'as' => 'export.'], static function () { // index - Route::get('', ['uses' => 'Export\IndexController@index', 'as' => 'index']); - Route::get('export', ['uses' => 'Export\IndexController@export', 'as' => 'export']); - -}); + Route::get('', ['uses' => 'Export\IndexController@index', 'as' => 'index']); + Route::get('export', ['uses' => 'Export\IndexController@export', 'as' => 'export']); + }); /** - * Import Controller + * Import Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'import', 'as' => 'import.'], static function () { // index - Route::get('', ['uses' => 'Import\IndexController@index', 'as' => 'index']); + Route::get('', ['uses' => 'Import\IndexController@index', 'as' => 'index']); - // create new job - Route::get('create/{import_provider}', ['uses' => 'Import\IndexController@create', 'as' => 'create']); + // create new job + Route::get('create/{import_provider}', ['uses' => 'Import\IndexController@create', 'as' => 'create']); - // set global prerequisites for an import source, possible with a job already attached. - Route::get('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@index', 'as' => 'prerequisites.index']); - Route::post('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@post', 'as' => 'prerequisites.post']); + // set global prerequisites for an import source, possible with a job already attached. + Route::get('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@index', 'as' => 'prerequisites.index']); + Route::post('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@post', 'as' => 'prerequisites.post']); - // configure a job: - Route::get('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@index', 'as' => 'job.configuration.index']); - Route::post('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@post', 'as' => 'job.configuration.post']); + // configure a job: + Route::get('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@index', 'as' => 'job.configuration.index']); + Route::post('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@post', 'as' => 'job.configuration.post']); - // get status of a job. This is also the landing page of a job after job config is complete. - Route::get('job/status/{importJob}', ['uses' => 'Import\JobStatusController@index', 'as' => 'job.status.index']); - Route::get('job/json/{importJob}', ['uses' => 'Import\JobStatusController@json', 'as' => 'job.status.json']); + // get status of a job. This is also the landing page of a job after job config is complete. + Route::get('job/status/{importJob}', ['uses' => 'Import\JobStatusController@index', 'as' => 'job.status.index']); + Route::get('job/json/{importJob}', ['uses' => 'Import\JobStatusController@json', 'as' => 'job.status.json']); - // start the job! - Route::any('job/start/{importJob}', ['uses' => 'Import\JobStatusController@start', 'as' => 'job.start']); - Route::any('job/store/{importJob}', ['uses' => 'Import\JobStatusController@store', 'as' => 'job.store']); + // start the job! + Route::any('job/start/{importJob}', ['uses' => 'Import\JobStatusController@start', 'as' => 'job.start']); + Route::any('job/store/{importJob}', ['uses' => 'Import\JobStatusController@store', 'as' => 'job.store']); - // download config: - Route::get('download/{importJob}', ['uses' => 'Import\IndexController@download', 'as' => 'job.download']); + // download config: + Route::get('download/{importJob}', ['uses' => 'Import\IndexController@download', 'as' => 'job.download']); - // callback URI for YNAB OAuth. Sadly, needs a custom solution. - Route::get('ynab-callback', ['uses' => 'Import\CallbackController@ynab', 'as' => 'callback.ynab']); -} + // callback URI for YNAB OAuth. Sadly, needs a custom solution. + Route::get('ynab-callback', ['uses' => 'Import\CallbackController@ynab', 'as' => 'callback.ynab']); + } ); /** - * Help Controller + * Help Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'help', 'as' => 'help.'], static function () { - Route::get('{route}', ['uses' => 'HelpController@show', 'as' => 'show']); - -} + Route::get('{route}', ['uses' => 'HelpController@show', 'as' => 'show']); + } ); /** - * Budget Controller + * Budget Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'v1/jscript', 'as' => 'javascript.'], static function () { - Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']); - Route::get('accounts', ['uses' => 'JavascriptController@accounts', 'as' => 'accounts']); - Route::get('currencies', ['uses' => 'JavascriptController@currencies', 'as' => 'currencies']); -} + Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']); + Route::get('accounts', ['uses' => 'JavascriptController@accounts', 'as' => 'accounts']); + Route::get('currencies', ['uses' => 'JavascriptController@currencies', 'as' => 'currencies']); + } ); /** - * JSON Controller(s) + * JSON Controller(s). */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'], static function () { // for auto complete - Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']); - Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'autocomplete.revenue-accounts']); - Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'autocomplete.expense-accounts']); - Route::get('asset-accounts', ['uses' => 'Json\AutoCompleteController@assetAccounts', 'as' => 'autocomplete.asset-accounts']); - Route::get('budgets', ['uses' => 'Json\AutoCompleteController@budgets', 'as' => 'autocomplete.budgets']); - Route::get('bills', ['uses' => 'Json\AutoCompleteController@bills', 'as' => 'autocomplete.bills']); - Route::get('categories', ['uses' => 'Json\AutoCompleteController@categories', 'as' => 'autocomplete.categories']); - Route::get('currencies', ['uses' => 'Json\AutoCompleteController@currencies', 'as' => 'autocomplete.currencies']); - Route::get('piggy-banks', ['uses' => 'Json\AutoCompleteController@piggyBanks', 'as' => 'autocomplete.piggy-banks']); - Route::get('tags', ['uses' => 'Json\AutoCompleteController@tags', 'as' => 'autocomplete.tags']); - Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allJournals', 'as' => 'autocomplete.all-journals']); - Route::get('transaction-journals/with-id', ['uses' => 'Json\AutoCompleteController@allJournalsWithID', 'as' => 'autocomplete.all-journals-with-id']); - Route::get('currency-names', ['uses' => 'Json\AutoCompleteController@currencyNames', 'as' => 'autocomplete.currency-names']); + Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']); + Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'autocomplete.revenue-accounts']); + Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'autocomplete.expense-accounts']); + Route::get('asset-accounts', ['uses' => 'Json\AutoCompleteController@assetAccounts', 'as' => 'autocomplete.asset-accounts']); + Route::get('budgets', ['uses' => 'Json\AutoCompleteController@budgets', 'as' => 'autocomplete.budgets']); + Route::get('bills', ['uses' => 'Json\AutoCompleteController@bills', 'as' => 'autocomplete.bills']); + Route::get('categories', ['uses' => 'Json\AutoCompleteController@categories', 'as' => 'autocomplete.categories']); + Route::get('currencies', ['uses' => 'Json\AutoCompleteController@currencies', 'as' => 'autocomplete.currencies']); + Route::get('piggy-banks', ['uses' => 'Json\AutoCompleteController@piggyBanks', 'as' => 'autocomplete.piggy-banks']); + Route::get('tags', ['uses' => 'Json\AutoCompleteController@tags', 'as' => 'autocomplete.tags']); + Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allJournals', 'as' => 'autocomplete.all-journals']); + Route::get('transaction-journals/with-id', ['uses' => 'Json\AutoCompleteController@allJournalsWithID', 'as' => 'autocomplete.all-journals-with-id']); + Route::get('currency-names', ['uses' => 'Json\AutoCompleteController@currencyNames', 'as' => 'autocomplete.currency-names']); + Route::get('transaction-types', ['uses' => 'Json\AutoCompleteController@transactionTypes', 'as' => 'transaction-types']); - Route::get('transaction-types', ['uses' => 'Json\AutoCompleteController@transactionTypes', 'as' => 'transaction-types']); + // boxes + Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']); + Route::get('box/bills', ['uses' => 'Json\BoxController@bills', 'as' => 'box.bills']); + Route::get('box/available', ['uses' => 'Json\BoxController@available', 'as' => 'box.available']); + Route::get('box/net-worth', ['uses' => 'Json\BoxController@netWorth', 'as' => 'box.net-worth']); - // boxes - Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']); - Route::get('box/bills', ['uses' => 'Json\BoxController@bills', 'as' => 'box.bills']); - Route::get('box/available', ['uses' => 'Json\BoxController@available', 'as' => 'box.available']); - Route::get('box/net-worth', ['uses' => 'Json\BoxController@netWorth', 'as' => 'box.net-worth']); + // rules + Route::get('trigger', ['uses' => 'Json\RuleController@trigger', 'as' => 'trigger']); + Route::get('action', ['uses' => 'Json\RuleController@action', 'as' => 'action']); - // rules - Route::get('trigger', ['uses' => 'Json\RuleController@trigger', 'as' => 'trigger']); - Route::get('action', ['uses' => 'Json\RuleController@action', 'as' => 'action']); + // front page + Route::get('frontpage/piggy-banks', ['uses' => 'Json\FrontpageController@piggyBanks', 'as' => 'fp.piggy-banks']); - // front page - Route::get('frontpage/piggy-banks', ['uses' => 'Json\FrontpageController@piggyBanks', 'as' => 'fp.piggy-banks']); + // currency conversion: + Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']); - // currency conversion: - Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']); - - // intro things: - Route::any('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']); - Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']); - Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']); - -} + // intro things: + Route::any('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']); + Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']); + Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']); + } ); - /** - * NewUser Controller + * NewUser Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'new-user', 'as' => 'new-user.'], static function () { - Route::get('', ['uses' => 'NewUserController@index', 'as' => 'index']); - Route::post('submit', ['uses' => 'NewUserController@submit', 'as' => 'submit']); -} + Route::get('', ['uses' => 'NewUserController@index', 'as' => 'index']); + Route::post('submit', ['uses' => 'NewUserController@submit', 'as' => 'submit']); + } ); /** - * Piggy Bank Controller + * Piggy Bank Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'piggy-banks', 'as' => 'piggy-banks.'], static function () { - Route::get('', ['uses' => 'PiggyBankController@index', 'as' => 'index']); - Route::get('add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'add-money']); - Route::get('remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'remove-money']); - Route::get('add-money/{piggyBank}', ['uses' => 'PiggyBankController@addMobile', 'as' => 'add-money-mobile']); - Route::get('remove-money/{piggyBank}', ['uses' => 'PiggyBankController@removeMobile', 'as' => 'remove-money-mobile']); - Route::get('create', ['uses' => 'PiggyBankController@create', 'as' => 'create']); - Route::get('edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'edit']); - Route::get('delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'delete']); - Route::get('show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'show']); - Route::post('store', ['uses' => 'PiggyBankController@store', 'as' => 'store']); - Route::post('update/{piggyBank}', ['uses' => 'PiggyBankController@update', 'as' => 'update']); - Route::post('destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'destroy']); - Route::post('add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'add']); - Route::post('remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'remove']); + Route::get('', ['uses' => 'PiggyBankController@index', 'as' => 'index']); + Route::get('add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'add-money']); + Route::get('remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'remove-money']); + Route::get('add-money/{piggyBank}', ['uses' => 'PiggyBankController@addMobile', 'as' => 'add-money-mobile']); + Route::get('remove-money/{piggyBank}', ['uses' => 'PiggyBankController@removeMobile', 'as' => 'remove-money-mobile']); + Route::get('create', ['uses' => 'PiggyBankController@create', 'as' => 'create']); + Route::get('edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'edit']); + Route::get('delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'delete']); + Route::get('show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'show']); + Route::post('store', ['uses' => 'PiggyBankController@store', 'as' => 'store']); + Route::post('update/{piggyBank}', ['uses' => 'PiggyBankController@update', 'as' => 'update']); + Route::post('destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'destroy']); + Route::post('add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'add']); + Route::post('remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'remove']); - Route::post('set-order/{piggyBank}', ['uses' => 'PiggyBankController@setOrder', 'as' => 'set-order']); - - -} + Route::post('set-order/{piggyBank}', ['uses' => 'PiggyBankController@setOrder', 'as' => 'set-order']); + } ); - /** - * Preferences Controller + * Preferences Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'preferences', 'as' => 'preferences.'], static function () { - Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']); - Route::post('', ['uses' => 'PreferencesController@postIndex', 'as' => 'update']); - - -} + Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']); + Route::post('', ['uses' => 'PreferencesController@postIndex', 'as' => 'update']); + } ); /** - * Profile Controller + * Profile Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'profile', 'as' => 'profile.'], static function () { + Route::get('', ['uses' => 'ProfileController@index', 'as' => 'index']); + Route::get('change-email', ['uses' => 'ProfileController@changeEmail', 'as' => 'change-email']); + Route::get('change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']); + Route::get('delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'delete-account']); - Route::get('', ['uses' => 'ProfileController@index', 'as' => 'index']); - Route::get('change-email', ['uses' => 'ProfileController@changeEmail', 'as' => 'change-email']); - Route::get('change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']); - Route::get('delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'delete-account']); + Route::post('delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account.post']); + Route::post('change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password.post']); + Route::post('change-email', ['uses' => 'ProfileController@postChangeEmail', 'as' => 'change-email.post']); + Route::post('regenerate', ['uses' => 'ProfileController@regenerate', 'as' => 'regenerate']); - Route::post('delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account.post']); - Route::post('change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password.post']); - Route::post('change-email', ['uses' => 'ProfileController@postChangeEmail', 'as' => 'change-email.post']); - Route::post('regenerate', ['uses' => 'ProfileController@regenerate', 'as' => 'regenerate']); + // new 2FA routes + Route::post('enable2FA', ['uses' => 'ProfileController@enable2FA', 'as' => 'enable2FA']); + Route::get('2fa/code', ['uses' => 'ProfileController@code', 'as' => 'code']); + Route::post('2fa/code', ['uses' => 'ProfileController@postCode', 'as' => 'code.store']); + Route::get('/delete-code', ['uses' => 'ProfileController@deleteCode', 'as' => 'delete-code']); + Route::get('2fa/new-codes', ['uses' => 'ProfileController@newBackupCodes', 'as' => 'new-backup-codes']); - // new 2FA routes - Route::post('enable2FA', ['uses' => 'ProfileController@enable2FA', 'as' => 'enable2FA']); - Route::get('2fa/code', ['uses' => 'ProfileController@code', 'as' => 'code']); - Route::post('2fa/code', ['uses' => 'ProfileController@postCode', 'as' => 'code.store']); - Route::get('/delete-code', ['uses' => 'ProfileController@deleteCode', 'as' => 'delete-code']); - Route::get('2fa/new-codes', ['uses' => 'ProfileController@newBackupCodes', 'as' => 'new-backup-codes']); - - // routes to delete stuff. - Route::get('delete-budgets', ['uses' => 'Profile\DataController@deleteBudgets', 'as' => 'delete-budgets']); - Route::get('delete-categories', ['uses' => 'Profile\DataController@deleteCategories', 'as' => 'delete-categories']); - Route::get('delete-tags', ['uses' => 'Profile\DataController@deleteTags', 'as' => 'delete-tags']); - - -} + // routes to delete stuff. + Route::get('delete-budgets', ['uses' => 'Profile\DataController@deleteBudgets', 'as' => 'delete-budgets']); + Route::get('delete-categories', ['uses' => 'Profile\DataController@deleteCategories', 'as' => 'delete-categories']); + Route::get('delete-tags', ['uses' => 'Profile\DataController@deleteTags', 'as' => 'delete-tags']); + } ); /** - * Recurring Transactions Controller + * Recurring Transactions Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'recurring', 'as' => 'recurring.'], static function () { + Route::get('', ['uses' => 'Recurring\IndexController@index', 'as' => 'index']); - Route::get('', ['uses' => 'Recurring\IndexController@index', 'as' => 'index']); + Route::get('show/{recurrence}', ['uses' => 'Recurring\ShowController@show', 'as' => 'show']); + Route::get('create', ['uses' => 'Recurring\CreateController@create', 'as' => 'create']); + Route::get('edit/{recurrence}', ['uses' => 'Recurring\EditController@edit', 'as' => 'edit']); + Route::get('delete/{recurrence}', ['uses' => 'Recurring\DeleteController@delete', 'as' => 'delete']); - Route::get('show/{recurrence}', ['uses' => 'Recurring\ShowController@show', 'as' => 'show']); - Route::get('create', ['uses' => 'Recurring\CreateController@create', 'as' => 'create']); - Route::get('edit/{recurrence}', ['uses' => 'Recurring\EditController@edit', 'as' => 'edit']); - Route::get('delete/{recurrence}', ['uses' => 'Recurring\DeleteController@delete', 'as' => 'delete']); + Route::post('store', ['uses' => 'Recurring\CreateController@store', 'as' => 'store']); + Route::post('update/{recurrence}', ['uses' => 'Recurring\EditController@update', 'as' => 'update']); + Route::post('destroy/{recurrence}', ['uses' => 'Recurring\DeleteController@destroy', 'as' => 'destroy']); - Route::post('store', ['uses' => 'Recurring\CreateController@store', 'as' => 'store']); - Route::post('update/{recurrence}', ['uses' => 'Recurring\EditController@update', 'as' => 'update']); - Route::post('destroy/{recurrence}', ['uses' => 'Recurring\DeleteController@destroy', 'as' => 'destroy']); - - // JSON routes: - Route::get('events', ['uses' => 'Json\RecurrenceController@events', 'as' => 'events']); - Route::get('suggest', ['uses' => 'Json\RecurrenceController@suggest', 'as' => 'suggest']); -} + // JSON routes: + Route::get('events', ['uses' => 'Json\RecurrenceController@events', 'as' => 'events']); + Route::get('suggest', ['uses' => 'Json\RecurrenceController@suggest', 'as' => 'suggest']); + } ); /** - * Report Controller + * Report Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'reports', 'as' => 'reports.'], static function () { + Route::get('', ['uses' => 'ReportController@index', 'as' => 'index']); + Route::get('options/{reportType}', ['uses' => 'ReportController@options', 'as' => 'options']); + Route::get('default/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@defaultReport', 'as' => 'report.default']); + Route::get('audit/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@auditReport', 'as' => 'report.audit']); + Route::get('category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'ReportController@categoryReport', 'as' => 'report.category']); + Route::get('budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'ReportController@budgetReport', 'as' => 'report.budget']); + Route::get('tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'ReportController@tagReport', 'as' => 'report.tag']); + Route::get('double/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'ReportController@doubleReport', 'as' => 'report.double']); - Route::get('', ['uses' => 'ReportController@index', 'as' => 'index']); - Route::get('options/{reportType}', ['uses' => 'ReportController@options', 'as' => 'options']); - Route::get('default/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@defaultReport', 'as' => 'report.default']); - Route::get('audit/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@auditReport', 'as' => 'report.audit']); - Route::get('category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'ReportController@categoryReport', 'as' => 'report.category']); - Route::get('budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'ReportController@budgetReport', 'as' => 'report.budget']); - Route::get('tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'ReportController@tagReport', 'as' => 'report.tag']); - Route::get('double/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'ReportController@doubleReport', 'as' => 'report.double']); - - Route::post('', ['uses' => 'ReportController@postIndex', 'as' => 'index.post']); -} + Route::post('', ['uses' => 'ReportController@postIndex', 'as' => 'index.post']); + } ); /** - * Report Data AccountController + * Report Data AccountController. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/account', 'as' => 'report-data.account.'], @@ -755,7 +713,7 @@ Route::group( ); /** - * Report Data Bill Controller + * Report Data Bill Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/bill', 'as' => 'report-data.bills.'], @@ -765,7 +723,7 @@ Route::group( ); /** - * Report Double Data Expense / Revenue Account Controller + * Report Double Data Expense / Revenue Account Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/double', 'as' => 'report-data.double.'], @@ -784,74 +742,71 @@ Route::group( ); /** - * Report Data Income/Expenses Controller (called financial operations) + * Report Data Income/Expenses Controller (called financial operations). */ Route::group( - ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/operations', - 'as' => 'report-data.operations.'], static function () { - Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations']); - Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income']); - Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses']); - -} + ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/operations', + 'as' => 'report-data.operations.', ], static function () { + Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations']); + Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income']); + Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses']); + } ); /** - * Report Data Category Controller + * Report Data Category Controller. */ Route::group( - ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/category', - 'as' => 'report-data.category.'], static function () { + ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/category', + 'as' => 'report-data.category.', ], static function () { // TODO three routes still in use? - Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations']); - Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income']); - Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses']); + Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations']); + Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income']); + Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses']); - Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts']); - Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories']); - Route::get('account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']); + Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts']); + Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories']); + Route::get('account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']); - Route::get('top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']); - Route::get('avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']); + Route::get('top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']); + Route::get('avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']); - Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income']); - Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income']); -} + Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income']); + Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income']); + } ); /** - * Report Data TAG Controller + * Report Data TAG Controller. */ Route::group( - ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/tag', - 'as' => 'report-data.tag.'], static function () { + ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/tag', + 'as' => 'report-data.tag.', ], static function () { + Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts']); + Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags']); + Route::get('account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']); - Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts']); - Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags']); - Route::get('account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']); + Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses']); + Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses']); - Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses']); - Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses']); - - Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income']); - Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income']); -} + Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income']); + Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income']); + } ); /** - * Report Data Balance Controller + * Report Data Balance Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/balance', 'as' => 'report-data.balance.'], static function () { - Route::get('general/{accountList}/{start_date}/{end_date}', ['uses' => 'BalanceController@general', 'as' => 'general']); } ); /** - * Report Data Budget Controller + * Report Data Budget Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/budget', 'as' => 'report-data.budget.'], @@ -866,143 +821,137 @@ Route::group( Route::get('account-per-budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accountPerBudget', 'as' => 'account-per-budget']); Route::get('top-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@topExpenses', 'as' => 'top-expenses']); Route::get('avg-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@avgExpenses', 'as' => 'avg-expenses']); - } ); /** - * Rules Controller + * Rules Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rules', 'as' => 'rules.'], static function () { // create controller - Route::get('create/{ruleGroup?}', ['uses' => 'Rule\CreateController@create', 'as' => 'create']); - Route::get('create-from-bill/{bill}', ['uses' => 'Rule\CreateController@createFromBill', 'as' => 'create-from-bill']); - Route::get('create-from-journal/{tj}', ['uses' => 'Rule\CreateController@createFromJournal', 'as' => 'create-from-journal']); - Route::post('store', ['uses' => 'Rule\CreateController@store', 'as' => 'store']); - Route::get('duplicate/{rule}', ['uses' => 'Rule\CreateController@duplicate', 'as' => 'duplicate']); + Route::get('create/{ruleGroup?}', ['uses' => 'Rule\CreateController@create', 'as' => 'create']); + Route::get('create-from-bill/{bill}', ['uses' => 'Rule\CreateController@createFromBill', 'as' => 'create-from-bill']); + Route::get('create-from-journal/{tj}', ['uses' => 'Rule\CreateController@createFromJournal', 'as' => 'create-from-journal']); + Route::post('store', ['uses' => 'Rule\CreateController@store', 'as' => 'store']); + Route::get('duplicate/{rule}', ['uses' => 'Rule\CreateController@duplicate', 'as' => 'duplicate']); - // delete controller - Route::get('delete/{rule}', ['uses' => 'Rule\DeleteController@delete', 'as' => 'delete']); - Route::post('destroy/{rule}', ['uses' => 'Rule\DeleteController@destroy', 'as' => 'destroy']); + // delete controller + Route::get('delete/{rule}', ['uses' => 'Rule\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{rule}', ['uses' => 'Rule\DeleteController@destroy', 'as' => 'destroy']); - // index controller - Route::get('', ['uses' => 'Rule\IndexController@index', 'as' => 'index']); - Route::get('up/{rule}', ['uses' => 'Rule\IndexController@up', 'as' => 'up']); - Route::get('down/{rule}', ['uses' => 'Rule\IndexController@down', 'as' => 'down']); - Route::post('trigger/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleTriggers', 'as' => 'reorder-triggers']); - Route::post('action/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleActions', 'as' => 'reorder-actions']); + // index controller + Route::get('', ['uses' => 'Rule\IndexController@index', 'as' => 'index']); + Route::get('up/{rule}', ['uses' => 'Rule\IndexController@up', 'as' => 'up']); + Route::get('down/{rule}', ['uses' => 'Rule\IndexController@down', 'as' => 'down']); + Route::post('trigger/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleTriggers', 'as' => 'reorder-triggers']); + Route::post('action/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleActions', 'as' => 'reorder-actions']); - // select controller - Route::get('test', ['uses' => 'Rule\SelectController@testTriggers', 'as' => 'test-triggers']); - Route::get('test-rule/{rule}', ['uses' => 'Rule\SelectController@testTriggersByRule', 'as' => 'test-triggers-rule']); - Route::get('select/{rule}', ['uses' => 'Rule\SelectController@selectTransactions', 'as' => 'select-transactions']); - Route::post('execute/{rule}', ['uses' => 'Rule\SelectController@execute', 'as' => 'execute']); + // select controller + Route::get('test', ['uses' => 'Rule\SelectController@testTriggers', 'as' => 'test-triggers']); + Route::get('test-rule/{rule}', ['uses' => 'Rule\SelectController@testTriggersByRule', 'as' => 'test-triggers-rule']); + Route::get('select/{rule}', ['uses' => 'Rule\SelectController@selectTransactions', 'as' => 'select-transactions']); + Route::post('execute/{rule}', ['uses' => 'Rule\SelectController@execute', 'as' => 'execute']); - // edit controller - Route::get('edit/{rule}', ['uses' => 'Rule\EditController@edit', 'as' => 'edit']); - Route::post('update/{rule}', ['uses' => 'Rule\EditController@update', 'as' => 'update']); - - -} + // edit controller + Route::get('edit/{rule}', ['uses' => 'Rule\EditController@edit', 'as' => 'edit']); + Route::post('update/{rule}', ['uses' => 'Rule\EditController@update', 'as' => 'update']); + } ); /** - * Rule Groups Controller + * Rule Groups Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rule-groups', 'as' => 'rule-groups.'], static function () { - Route::get('create', ['uses' => 'RuleGroup\CreateController@create', 'as' => 'create']); - Route::get('edit/{ruleGroup}', ['uses' => 'RuleGroup\EditController@edit', 'as' => 'edit']); - Route::get('delete/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@delete', 'as' => 'delete']); - Route::get('up/{ruleGroup}', ['uses' => 'RuleGroup\EditController@up', 'as' => 'up']); - Route::get('down/{ruleGroup}', ['uses' => 'RuleGroup\EditController@down', 'as' => 'down']); - Route::get('select/{ruleGroup}', ['uses' => 'RuleGroup\ExecutionController@selectTransactions', 'as' => 'select-transactions']); + Route::get('create', ['uses' => 'RuleGroup\CreateController@create', 'as' => 'create']); + Route::get('edit/{ruleGroup}', ['uses' => 'RuleGroup\EditController@edit', 'as' => 'edit']); + Route::get('delete/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@delete', 'as' => 'delete']); + Route::get('up/{ruleGroup}', ['uses' => 'RuleGroup\EditController@up', 'as' => 'up']); + Route::get('down/{ruleGroup}', ['uses' => 'RuleGroup\EditController@down', 'as' => 'down']); + Route::get('select/{ruleGroup}', ['uses' => 'RuleGroup\ExecutionController@selectTransactions', 'as' => 'select-transactions']); - Route::post('store', ['uses' => 'RuleGroup\CreateController@store', 'as' => 'store']); - Route::post('update/{ruleGroup}', ['uses' => 'RuleGroup\EditController@update', 'as' => 'update']); - Route::post('destroy/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@destroy', 'as' => 'destroy']); - Route::post('execute/{ruleGroup}', ['uses' => 'RuleGroup\ExecutionController@execute', 'as' => 'execute']); -} + Route::post('store', ['uses' => 'RuleGroup\CreateController@store', 'as' => 'store']); + Route::post('update/{ruleGroup}', ['uses' => 'RuleGroup\EditController@update', 'as' => 'update']); + Route::post('destroy/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@destroy', 'as' => 'destroy']); + Route::post('execute/{ruleGroup}', ['uses' => 'RuleGroup\ExecutionController@execute', 'as' => 'execute']); + } ); /** - * Search Controller + * Search Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'search', 'as' => 'search.'], static function () { - Route::get('', ['uses' => 'SearchController@index', 'as' => 'index']); - Route::any('search', ['uses' => 'SearchController@search', 'as' => 'search']); -} + Route::get('', ['uses' => 'SearchController@index', 'as' => 'index']); + Route::any('search', ['uses' => 'SearchController@search', 'as' => 'search']); + } ); - /** - * Tag Controller + * Tag Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'tags', 'as' => 'tags.'], static function () { + Route::get('', ['uses' => 'TagController@index', 'as' => 'index']); + Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']); - Route::get('', ['uses' => 'TagController@index', 'as' => 'index']); - Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']); + Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']); + Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']); - Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']); - Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']); + Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']); + Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']); - Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']); - Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']); - - Route::post('store', ['uses' => 'TagController@store', 'as' => 'store']); - Route::post('update/{tag}', ['uses' => 'TagController@update', 'as' => 'update']); - Route::post('destroy/{tag}', ['uses' => 'TagController@destroy', 'as' => 'destroy']); - Route::post('mass-destroy', ['uses' => 'TagController@massDestroy', 'as' => 'mass-destroy']); -} + Route::post('store', ['uses' => 'TagController@store', 'as' => 'store']); + Route::post('update/{tag}', ['uses' => 'TagController@update', 'as' => 'update']); + Route::post('destroy/{tag}', ['uses' => 'TagController@destroy', 'as' => 'destroy']); + Route::post('mass-destroy', ['uses' => 'TagController@massDestroy', 'as' => 'mass-destroy']); + } ); /** - * Transaction Controller + * Transaction Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'transactions', 'as' => 'transactions.'], static function () { // show groups: - // TODO improve these routes - Route::get('{what}/all', ['uses' => 'Transaction\IndexController@indexAll', 'as' => 'index.all'])->where( + // TODO improve these routes + Route::get('{what}/all', ['uses' => 'Transaction\IndexController@indexAll', 'as' => 'index.all'])->where( ['what' => 'withdrawal|deposit|transfers|transfer'] ); - Route::get('{what}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where( + Route::get('{what}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where( ['what' => 'withdrawal|deposit|transfers|transfer'] ); - // create group: - Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']); - Route::post('store', ['uses' => 'Transaction\CreateController@store', 'as' => 'store']); + // create group: + Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']); + Route::post('store', ['uses' => 'Transaction\CreateController@store', 'as' => 'store']); - // clone group - Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CreateController@cloneGroup', 'as' => 'clone']); + // clone group + Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CreateController@cloneGroup', 'as' => 'clone']); - // edit group - Route::get('edit/{transactionGroup}', ['uses' => 'Transaction\EditController@edit', 'as' => 'edit']); - Route::post('update', ['uses' => 'Transaction\EditController@update', 'as' => 'update']); + // edit group + Route::get('edit/{transactionGroup}', ['uses' => 'Transaction\EditController@edit', 'as' => 'edit']); + Route::post('update', ['uses' => 'Transaction\EditController@update', 'as' => 'update']); - // delete group - Route::get('delete/{transactionGroup}', ['uses' => 'Transaction\DeleteController@delete', 'as' => 'delete']); - Route::post('destroy/{transactionGroup}', ['uses' => 'Transaction\DeleteController@destroy', 'as' => 'destroy']); + // delete group + Route::get('delete/{transactionGroup}', ['uses' => 'Transaction\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{transactionGroup}', ['uses' => 'Transaction\DeleteController@destroy', 'as' => 'destroy']); - Route::get('show/{transactionGroup}', ['uses' => 'Transaction\ShowController@show', 'as' => 'show']); - Route::get('debug/{transactionGroup}', ['uses' => 'Transaction\ShowController@debugShow', 'as' => 'debug']); -} + Route::get('show/{transactionGroup}', ['uses' => 'Transaction\ShowController@show', 'as' => 'show']); + Route::get('debug/{transactionGroup}', ['uses' => 'Transaction\ShowController@debugShow', 'as' => 'debug']); + } ); - /** - * Transaction Mass Controller + * Transaction Mass Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], - function () { + static function () { Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']); Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']); Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']); @@ -1011,18 +960,18 @@ Route::group( ); /** - * Transaction Bulk Controller + * Transaction Bulk Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/bulk', 'as' => 'transactions.bulk.'], - function () { + static function () { Route::get('edit/{journalList}', ['uses' => 'BulkController@edit', 'as' => 'edit']); Route::post('update', ['uses' => 'BulkController@update', 'as' => 'update']); } ); /** - * Transaction Split Controller + * Transaction Split Controller. */ //Route::group( // ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/split', @@ -1036,23 +985,22 @@ Route::group( //); /** - * Transaction Convert Controller + * Transaction Convert Controller. */ Route::group( - ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/convert', - 'as' => 'transactions.convert.'], static function () { - Route::get('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@index', 'as' => 'index']); - Route::post('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@postIndex', 'as' => 'index.post']); -} + ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/convert', + 'as' => 'transactions.convert.', ], static function () { + Route::get('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@index', 'as' => 'index']); + Route::post('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@postIndex', 'as' => 'index.post']); + } ); /** - * Transaction Link Controller + * Transaction Link Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/link', 'as' => 'transactions.link.'], - function () { - + static function () { Route::get('modal/{tj}', ['uses' => 'LinkController@modal', 'as' => 'modal']); // TODO improve this route: @@ -1065,59 +1013,56 @@ Route::group( ); /** - * Report Popup Controller + * Report Popup Controller. */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Popup', 'prefix' => 'popup', 'as' => 'popup.'], static function () { - Route::get('general', ['uses' => 'ReportController@general', 'as' => 'general']); - -} + Route::get('general', ['uses' => 'ReportController@general', 'as' => 'general']); + } ); /** - * For the admin routes, the user must be logged in and have the role of 'owner' + * For the admin routes, the user must be logged in and have the role of 'owner'. */ Route::group( ['middleware' => 'admin', 'namespace' => 'FireflyIII\Http\Controllers\Admin', 'prefix' => 'admin', 'as' => 'admin.'], static function () { // admin home - Route::get('', ['uses' => 'HomeController@index', 'as' => 'index']); - Route::post('test-message', ['uses' => 'HomeController@testMessage', 'as' => 'test-message']); + Route::get('', ['uses' => 'HomeController@index', 'as' => 'index']); + Route::post('test-message', ['uses' => 'HomeController@testMessage', 'as' => 'test-message']); - // check for updates? - Route::get('update-check', ['uses' => 'UpdateController@index', 'as' => 'update-check']); - Route::any('update-check/manual', ['uses' => 'UpdateController@updateCheck', 'as' => 'update-check.manual']); - Route::post('update-check', ['uses' => 'UpdateController@post', 'as' => 'update-check.post']); + // check for updates? + Route::get('update-check', ['uses' => 'UpdateController@index', 'as' => 'update-check']); + Route::any('update-check/manual', ['uses' => 'UpdateController@updateCheck', 'as' => 'update-check.manual']); + Route::post('update-check', ['uses' => 'UpdateController@post', 'as' => 'update-check.post']); - // user manager - Route::get('users', ['uses' => 'UserController@index', 'as' => 'users']); - Route::get('users/edit/{user}', ['uses' => 'UserController@edit', 'as' => 'users.edit']); - Route::get('users/delete/{user}', ['uses' => 'UserController@delete', 'as' => 'users.delete']); - Route::get('users/show/{user}', ['uses' => 'UserController@show', 'as' => 'users.show']); + // user manager + Route::get('users', ['uses' => 'UserController@index', 'as' => 'users']); + Route::get('users/edit/{user}', ['uses' => 'UserController@edit', 'as' => 'users.edit']); + Route::get('users/delete/{user}', ['uses' => 'UserController@delete', 'as' => 'users.delete']); + Route::get('users/show/{user}', ['uses' => 'UserController@show', 'as' => 'users.show']); - Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']); - Route::post('users/destroy/{user}', ['uses' => 'UserController@destroy', 'as' => 'users.destroy']); + Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']); + Route::post('users/destroy/{user}', ['uses' => 'UserController@destroy', 'as' => 'users.destroy']); - // telemetry manager: - Route::get('telemetry', ['uses' => 'TelemetryController@index', 'as' => 'telemetry.index']); - Route::get('telemetry/view', ['uses' => 'TelemetryController@view', 'as' => 'telemetry.view']); - Route::get('telemetry/delete', ['uses' => 'TelemetryController@delete', 'as' => 'telemetry.delete']); + // telemetry manager: + Route::get('telemetry', ['uses' => 'TelemetryController@index', 'as' => 'telemetry.index']); + Route::get('telemetry/view', ['uses' => 'TelemetryController@view', 'as' => 'telemetry.view']); + Route::get('telemetry/delete', ['uses' => 'TelemetryController@delete', 'as' => 'telemetry.delete']); - // journal links manager - Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']); - Route::get('links/create', ['uses' => 'LinkController@create', 'as' => 'links.create']); - Route::get('links/show/{linkType}', ['uses' => 'LinkController@show', 'as' => 'links.show']); - Route::get('links/edit/{linkType}', ['uses' => 'LinkController@edit', 'as' => 'links.edit']); - Route::get('links/delete/{linkType}', ['uses' => 'LinkController@delete', 'as' => 'links.delete']); + // journal links manager + Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']); + Route::get('links/create', ['uses' => 'LinkController@create', 'as' => 'links.create']); + Route::get('links/show/{linkType}', ['uses' => 'LinkController@show', 'as' => 'links.show']); + Route::get('links/edit/{linkType}', ['uses' => 'LinkController@edit', 'as' => 'links.edit']); + Route::get('links/delete/{linkType}', ['uses' => 'LinkController@delete', 'as' => 'links.delete']); + Route::post('links/store', ['uses' => 'LinkController@store', 'as' => 'links.store']); + Route::post('links/update/{linkType}', ['uses' => 'LinkController@update', 'as' => 'links.update']); + Route::post('links/destroy/{linkType}', ['uses' => 'LinkController@destroy', 'as' => 'links.destroy']); - Route::post('links/store', ['uses' => 'LinkController@store', 'as' => 'links.store']); - Route::post('links/update/{linkType}', ['uses' => 'LinkController@update', 'as' => 'links.update']); - Route::post('links/destroy/{linkType}', ['uses' => 'LinkController@destroy', 'as' => 'links.destroy']); - - // FF configuration: - Route::get('configuration', ['uses' => 'ConfigurationController@index', 'as' => 'configuration.index']); - Route::post('configuration', ['uses' => 'ConfigurationController@postIndex', 'as' => 'configuration.index.post']); - -} + // FF configuration: + Route::get('configuration', ['uses' => 'ConfigurationController@index', 'as' => 'configuration.index']); + Route::post('configuration', ['uses' => 'ConfigurationController@postIndex', 'as' => 'configuration.index.post']); + } );