mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-26 13:36:15 +00:00
Apply fixes from StyleCI
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* app.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).
|
||||
*
|
||||
@@ -19,12 +19,10 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
use FireflyIII\Providers\ImportServiceProvider;
|
||||
|
||||
|
||||
return [
|
||||
'name' => envNonEmpty('APP_NAME', 'Firefly III'),
|
||||
'env' => envNonEmpty('APP_ENV', 'local'),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* 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).
|
||||
*
|
||||
@@ -21,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Authentication Defaults
|
||||
@@ -87,7 +85,7 @@ return [
|
||||
|
||||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),//'adldap',
|
||||
'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), //'adldap',
|
||||
'model' => FireflyIII\User::class,
|
||||
],
|
||||
],
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* broadcasting.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default Broadcaster
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* cache.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default Cache Store
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
/**
|
||||
* csv.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,14 +23,13 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
use FireflyIII\Import\Specifics\AbnAmroDescription;
|
||||
use FireflyIII\Import\Specifics\Belfius;
|
||||
use FireflyIII\Import\Specifics\IngBelgium;
|
||||
use FireflyIII\Import\Specifics\IngDescription;
|
||||
use FireflyIII\Import\Specifics\PresidentsChoice;
|
||||
use FireflyIII\Import\Specifics\SnsDescription;
|
||||
use FireflyIII\Import\Specifics\Belfius;
|
||||
use FireflyIII\Import\Specifics\IngBelgium;
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
* Configuration for the CSV specifics.
|
||||
*/
|
||||
@@ -40,7 +39,7 @@ return [
|
||||
'SnsDescription' => 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,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* database.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,8 +23,6 @@ declare(strict_types=1);
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
|
||||
|
||||
$databaseUrl = getenv('DATABASE_URL');
|
||||
$host = '';
|
||||
$username = '';
|
||||
@@ -33,7 +31,6 @@ $database = '';
|
||||
$port = '';
|
||||
|
||||
if (!(false === $databaseUrl)) {
|
||||
|
||||
$options = parse_url($databaseUrl);
|
||||
$host = $options['host'] ?? 'firefly_iii_db';
|
||||
$username = $options['user'] ?? 'firefly';
|
||||
@@ -43,7 +40,6 @@ if (!(false === $databaseUrl)) {
|
||||
}
|
||||
|
||||
return [
|
||||
|
||||
'default' => envNonEmpty('DB_CONNECTION', 'pgsql'),
|
||||
'connections' => [
|
||||
'sqlite' => [
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* debugbar.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).
|
||||
*
|
||||
@@ -22,7 +23,6 @@
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Debugbar Settings
|
||||
@@ -36,8 +36,8 @@ return [
|
||||
*/
|
||||
|
||||
'enabled' => 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
|
||||
],
|
||||
],
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* filesystems.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);
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default Filesystem Disk
|
||||
@@ -117,7 +116,7 @@ return [
|
||||
| registered when used.
|
||||
|
|
||||
*/
|
||||
/*
|
||||
/*
|
||||
// Disabled, pending "twistor/flysystem-stream-wrapper" dependency
|
||||
'autowrap' => [
|
||||
'local',
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
<?php
|
||||
|
||||
|
||||
/**
|
||||
* firefly.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).
|
||||
*
|
||||
@@ -133,7 +132,7 @@ return [
|
||||
'is_demo_site' => 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.
|
||||
],
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* google2fa.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);
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
* Auth container binding
|
||||
*/
|
||||
@@ -91,7 +90,6 @@ return [
|
||||
*/
|
||||
'throw_exceptions' => true,
|
||||
|
||||
|
||||
'store_in_cookie' => true,
|
||||
|
||||
];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* ide-helper.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,8 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
return array(
|
||||
|
||||
return [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Filename & Format
|
||||
@@ -34,7 +33,7 @@ return array(
|
||||
|
||||
'filename' => '_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,
|
||||
|
||||
);
|
||||
];
|
||||
|
||||
@@ -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).
|
||||
*
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* intro.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).
|
||||
*
|
||||
@@ -33,7 +33,7 @@ return [
|
||||
'box_out_holder' => ['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'],
|
||||
],
|
||||
];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'),
|
||||
|
||||
],
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* logging.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).
|
||||
*
|
||||
@@ -19,13 +19,11 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* mail.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Mail Driver
|
||||
@@ -78,7 +76,6 @@ return [
|
||||
*/
|
||||
'from' => ['address' => envNonEmpty('MAIL_FROM', 'changeme@example.com'), 'name' => 'Firefly III Mailer'],
|
||||
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| E-Mail Encryption Protocol
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* queue.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default Queue Driver
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* services.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Third Party Services
|
||||
@@ -37,9 +35,9 @@ return [
|
||||
*/
|
||||
|
||||
'mailgun' => [
|
||||
'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' => [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* session.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,7 +21,6 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
'driver' => env('SESSION_DRIVER', 'file'),
|
||||
'lifetime' => 120,
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* This file is part of the TwigBridge package.
|
||||
*
|
||||
@@ -28,7 +30,6 @@ use TwigBridge\Extension\Loader\Functions;
|
||||
* Configuration options for Twig.
|
||||
*/
|
||||
return [
|
||||
|
||||
'twig' => [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* upgrade.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,31 +23,29 @@ declare(strict_types=1);
|
||||
|
||||
return [
|
||||
'text' => [
|
||||
'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.',
|
||||
],
|
||||
],
|
||||
];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* view.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,9 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| View Storage Paths
|
||||
|
||||
Reference in New Issue
Block a user