diff --git a/.ci/php-cs-fixer/.php-cs-fixer.php b/.ci/php-cs-fixer/.php-cs-fixer.php index 006a56f3dd..9a400c4ef9 100644 --- a/.ci/php-cs-fixer/.php-cs-fixer.php +++ b/.ci/php-cs-fixer/.php-cs-fixer.php @@ -23,7 +23,7 @@ $current = __DIR__; $paths = [ $current . '/../../app', -// $current . '/../../config', + $current . '/../../config', // $current . '/../../database', // $current . '/../../routes', // $current . '/../../tests', diff --git a/app/Console/Commands/Correction/EnableCurrencies.php b/app/Console/Commands/Correction/EnableCurrencies.php index e70640f852..dc51124b5f 100644 --- a/app/Console/Commands/Correction/EnableCurrencies.php +++ b/app/Console/Commands/Correction/EnableCurrencies.php @@ -73,8 +73,8 @@ class EnableCurrencies extends Command // get all meta entries /** @var Collection $meta */ $meta = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') - ->where('accounts.user_group_id', $userGroup->id) - ->where('account_meta.name', 'currency_id')->groupBy('data')->get(['data']) + ->where('accounts.user_group_id', $userGroup->id) + ->where('account_meta.name', 'currency_id')->groupBy('data')->get(['data']) ; foreach ($meta as $entry) { $found[] = (int)$entry->data; @@ -82,7 +82,7 @@ class EnableCurrencies extends Command // get all from journals: $journals = TransactionJournal::where('user_group_id', $userGroup->id) - ->groupBy('transaction_currency_id')->get(['transaction_currency_id']) + ->groupBy('transaction_currency_id')->get(['transaction_currency_id']) ; foreach ($journals as $entry) { $found[] = (int)$entry->transaction_currency_id; @@ -90,9 +90,9 @@ class EnableCurrencies extends Command // get all from transactions $transactions = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->where('transaction_journals.user_group_id', $userGroup->id) - ->groupBy('transactions.transaction_currency_id', 'transactions.foreign_currency_id') - ->get(['transactions.transaction_currency_id', 'transactions.foreign_currency_id']) + ->where('transaction_journals.user_group_id', $userGroup->id) + ->groupBy('transactions.transaction_currency_id', 'transactions.foreign_currency_id') + ->get(['transactions.transaction_currency_id', 'transactions.foreign_currency_id']) ; foreach ($transactions as $entry) { $found[] = (int)$entry->transaction_currency_id; @@ -101,8 +101,8 @@ class EnableCurrencies extends Command // get all from budget limits $limits = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') - ->groupBy('transaction_currency_id') - ->get(['budget_limits.transaction_currency_id']) + ->groupBy('transaction_currency_id') + ->get(['budget_limits.transaction_currency_id']) ; foreach ($limits as $entry) { $found[] = $entry->transaction_currency_id; diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 91c7456768..f0b84e87de 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -1043,6 +1043,7 @@ class GroupCollector implements GroupCollectorInterface ->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.description', 'DESC') - ->orderBy('source.amount', 'DESC'); + ->orderBy('source.amount', 'DESC') + ; } } diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 989e2a50b7..f99c6c45d6 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -152,6 +152,7 @@ class JavascriptController extends Controller return response() ->view('v2.javascript.variables', $data) - ->header('Content-Type', 'text/javascript'); + ->header('Content-Type', 'text/javascript') + ; } } diff --git a/app/Support/Request/AppendsLocationData.php b/app/Support/Request/AppendsLocationData.php index a4a92dde5b..ed6ec863ff 100644 --- a/app/Support/Request/AppendsLocationData.php +++ b/app/Support/Request/AppendsLocationData.php @@ -31,6 +31,8 @@ trait AppendsLocationData /** * Abstract method. * + * @param mixed $key + * * @return bool */ abstract public function has($key); diff --git a/config/app.php b/config/app.php index a7c44efb4e..9cfcb5b34a 100644 --- a/config/app.php +++ b/config/app.php @@ -43,10 +43,7 @@ return [ 'key' => env('APP_KEY'), 'cipher' => 'AES-256-CBC', 'providers' => [ - - /* - * Laravel Framework Service Providers... - */ + // Laravel Framework Service Providers... Illuminate\Auth\AuthServiceProvider::class, Illuminate\Broadcasting\BroadcastServiceProvider::class, Illuminate\Bus\BusServiceProvider::class, @@ -70,13 +67,9 @@ return [ Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, - /* - * Package Service Providers... - */ + // Package Service Providers... - /* - * Application Service Providers... - */ + // Application Service Providers... FireflyIII\Providers\AppServiceProvider::class, FireflyIII\Providers\AuthServiceProvider::class, // FireflyIII\Providers\BroadcastServiceProvider::class, @@ -87,9 +80,7 @@ return [ PragmaRX\Google2FALaravel\ServiceProvider::class, TwigBridge\ServiceProvider::class, - /* - * More service providers. - */ + // More service providers. FireflyIII\Providers\AccountServiceProvider::class, FireflyIII\Providers\AttachmentServiceProvider::class, FireflyIII\Providers\BillServiceProvider::class, @@ -173,5 +164,4 @@ return [ */ 'faker_locale' => 'en_US', - ]; diff --git a/config/auth.php b/config/auth.php index c645307e39..87bb7ce6c5 100644 --- a/config/auth.php +++ b/config/auth.php @@ -22,7 +22,7 @@ declare(strict_types=1); if ('ldap' === strtolower((string)env('AUTHENTICATION_GUARD'))) { - die('LDAP is no longer supported by Firefly III v5.7+. Sorry about that. You will have to switch to "remote_user_guard", and use tools like Authelia or Keycloak to use LDAP together with Firefly III.'); + exit('LDAP is no longer supported by Firefly III v5.7+. Sorry about that. You will have to switch to "remote_user_guard", and use tools like Authelia or Keycloak to use LDAP together with Firefly III.'); } return [ @@ -139,5 +139,4 @@ return [ */ 'password_timeout' => 10800, - ]; diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index 0cfb2b1185..c1c3dbcb2b 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -23,7 +23,6 @@ declare(strict_types=1); return [ - /* |-------------------------------------------------------------------------- | View Name @@ -95,5 +94,4 @@ return [ // Generator 'generator-class' => Diglactic\Breadcrumbs\Generator::class, - ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index abc48f2e99..1996f5af12 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -49,7 +49,6 @@ return [ */ 'connections' => [ - 'pusher' => [ 'driver' => 'pusher', 'key' => env('PUSHER_APP_KEY'), @@ -57,11 +56,11 @@ return [ 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'cluster' => env('PUSHER_APP_CLUSTER'), - 'host' => null !== env('PUSHER_HOST') ? env('PUSHER_HOST') : 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com', + 'host' => null !== env('PUSHER_HOST') ? env('PUSHER_HOST') : 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com', 'port' => env('PUSHER_PORT', 443), 'scheme' => env('PUSHER_SCHEME', 'https'), 'encrypted' => true, - 'useTLS' => env('PUSHER_SCHEME', 'https') === 'https', + 'useTLS' => 'https' === env('PUSHER_SCHEME', 'https'), ], 'client_options' => [ // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html @@ -85,7 +84,5 @@ return [ 'null' => [ 'driver' => 'null', ], - ], - ]; diff --git a/config/cache.php b/config/cache.php index d28d9d6882..bac320509d 100644 --- a/config/cache.php +++ b/config/cache.php @@ -49,7 +49,6 @@ return [ */ 'stores' => [ - 'apc' => [ 'driver' => 'apc', ], diff --git a/config/cer.php b/config/cer.php index 7445ea37bd..30b0ebb70a 100644 --- a/config/cer.php +++ b/config/cer.php @@ -23,7 +23,6 @@ declare(strict_types=1); return [ - 'url' => 'https://ff3exchangerates.z6.web.core.windows.net', 'enabled' => true, 'download_enabled' => env('ENABLE_EXTERNAL_RATES', false), @@ -35,7 +34,6 @@ return [ // all rates are from EUR to $currency: 'rates' => [ - // europa 'EUR' => 1, 'HUF' => 387.9629, diff --git a/config/cors.php b/config/cors.php index 69da8e5802..cbfc4d044e 100644 --- a/config/cors.php +++ b/config/cors.php @@ -1,6 +1,5 @@ 0, 'supports_credentials' => false, - ]; diff --git a/config/database.php b/config/database.php index 3a36cb9e72..34755ed3a8 100644 --- a/config/database.php +++ b/config/database.php @@ -39,9 +39,7 @@ if (false !== $databaseUrl) { $database = substr($options['path'] ?? '/firefly', 1); } -/* - * Get SSL parameters from .env file. - */ +// Get SSL parameters from .env file. $mysql_ssl_ca_dir = envNonEmpty('MYSQL_SSL_CAPATH', null); $mysql_ssl_ca_file = envNonEmpty('MYSQL_SSL_CA', null); $mysql_ssl_cert = envNonEmpty('MYSQL_SSL_CERT', null); @@ -121,7 +119,6 @@ return [ 'charset' => 'utf8', 'prefix' => '', ], - ], 'migrations' => 'migrations', /* @@ -138,7 +135,7 @@ return [ 'client' => env('REDIS_CLIENT', 'predis'), 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'predis'), - //'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), + // 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), ], 'default' => [ 'scheme' => envNonEmpty('REDIS_SCHEME', 'tcp'), @@ -161,5 +158,4 @@ return [ 'database' => env('REDIS_CACHE_DB', '1'), ], ], - ]; diff --git a/config/debugbar.php b/config/debugbar.php index 7441f1af5d..e2cf2bf6b1 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -163,9 +163,9 @@ return [ '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 - 'enabled' => false, - 'types' => ['SELECT'], - // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+ + 'enabled' => false, + '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 ], @@ -173,7 +173,7 @@ return [ 'full_log' => false, ], 'views' => [ - 'data' => true, //Note: Can slow down the application, because the data can be quite large.. + 'data' => true, // Note: Can slow down the application, because the data can be quite large.. ], 'route' => [ 'label' => true, // show complete route on bar diff --git a/config/filesystems.php b/config/filesystems.php index 8deff7ba8f..a15413d68b 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -88,10 +88,9 @@ return [ 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), - 'url' => env('APP_URL') . '/storage', + 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], - ], /* diff --git a/config/firefly.php b/config/firefly.php index 8e72089804..0f26183cdd 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -191,7 +191,7 @@ return [ // 'si_LK' => ['name_locale' => 'සිංහල', 'name_english' => 'Sinhala (Sri Lanka)'], 'sk_SK' => ['name_locale' => 'Slovenčina', 'name_english' => 'Slovak'], 'sl_SI' => ['name_locale' => 'Slovenian', 'name_english' => 'Slovenian'], - //// 'sr_CS' => ['name_locale' => 'Serbian (Latin)', 'name_english' => 'Serbian (Latin)'], + // // 'sr_CS' => ['name_locale' => 'Serbian (Latin)', 'name_english' => 'Serbian (Latin)'], 'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'], // // 'tlh_AA' => ['name_locale' => 'tlhIngan Hol', 'name_english' => 'Klingon'], 'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], @@ -252,41 +252,41 @@ return [ ], 'available_dark_modes' => ['light', 'dark', 'browser'], 'bill_reminder_periods' => [90, 30, 14, 7, 0], - 'valid_view_ranges' => ['1D', '1W', '1M', '3M', '6M', '1Y',], + 'valid_view_ranges' => ['1D', '1W', '1M', '3M', '6M', '1Y'], 'valid_url_protocols' => envNonEmpty('VALID_URL_PROTOCOLS', 'http,https,ftp,ftps,mailto'), 'allowedMimes' => [ - /* plain files */ + // plain files 'text/plain', - /* images */ + // images 'image/jpeg', 'image/svg+xml', 'image/png', 'image/heic', 'image/heic-sequence', - /* PDF */ + // PDF 'application/pdf', - /* Generic upload */ + // Generic upload 'application/octet-stream', - /* MS word */ + // MS word 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - /* MS excel */ + // MS excel 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', - /* MS powerpoint */ + // MS powerpoint 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.openxmlformats-officedocument.presentationml.template', 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', - /* iWork */ + // iWork 'application/x-iwork-pages-sffpages', - /* open office */ + // open office 'application/vnd.sun.xml.writer', 'application/vnd.sun.xml.writer.template', 'application/vnd.sun.xml.writer.global', @@ -318,15 +318,15 @@ return [ 'application/vnd.oasis.opendocument.database', 'application/vnd.oasis.opendocument.image', - /* EML */ + // EML 'message/rfc822', - /* JSON */ + // JSON 'application/json', ], 'accountRoles' => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'], 'valid_liabilities' => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], - 'ccTypes' => ['monthlyFull' => 'Full payment every month',], + 'ccTypes' => ['monthlyFull' => 'Full payment every month'], 'credit_card_types' => ['monthlyFull'], // "period must be in this list" values @@ -487,8 +487,6 @@ return [ 'userGroupAccount' => UserGroupAccount::class, 'userGroupBill' => UserGroupBill::class, 'userGroup' => UserGroup::class, - - ], 'rule-actions' => [ 'set_category' => SetCategory::class, @@ -545,7 +543,6 @@ return [ 'range' => 200, ], - // expected source types for each transaction type, in order of preference. 'expected_source_types' => [ 'source' => [ @@ -637,7 +634,6 @@ return [ AccountType::RECONCILIATION => [AccountType::ASSET], AccountType::REVENUE => [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], AccountType::LIABILITY_CREDIT => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], - ], 'destination' => [ AccountType::ASSET => [ @@ -679,7 +675,7 @@ return [ ], AccountType::RECONCILIATION => [AccountType::ASSET], AccountType::REVENUE => [], // is not allowed as a destination - AccountType::LIABILITY_CREDIT => [],// is not allowed as a destination + AccountType::LIABILITY_CREDIT => [], // is not allowed as a destination ], ], // depending on the account type, return the allowed transaction types: @@ -749,7 +745,6 @@ return [ AccountType::RECONCILIATION => [TransactionTypeModel::RECONCILIATION], AccountType::LIABILITY_CREDIT => [], // is not allowed as a destination ], - ], // having the source + dest will tell you the transaction type. @@ -914,5 +909,5 @@ return [ 'allowed_sort_parameters' => ['order', 'name', 'iban'], // preselected account lists possibilities: - 'preselected_accounts' => ['all','assets','liabilities'], + 'preselected_accounts' => ['all', 'assets', 'liabilities'], ]; diff --git a/config/google2fa.php b/config/google2fa.php index 553c4a6014..bcf0b19822 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -24,9 +24,7 @@ declare(strict_types=1); use PragmaRX\Google2FALaravel\Support\Constants; return [ - /* - * Auth container binding - */ + // Auth container binding 'enabled' => true, @@ -37,63 +35,42 @@ return [ 'lifetime' => 0, // 0 = eternal - /* - * Renew lifetime at every new request. - */ + // Renew lifetime at every new request. 'keep_alive' => true, - /* - * Auth container binding - */ + // Auth container binding 'auth' => 'auth', - /* - * 2FA verified session var - */ + // 2FA verified session var 'session_var' => 'google2fa', - /* - * One Time Password request input name - */ + // One Time Password request input name 'otp_input' => 'one_time_password', - /* - * One Time Password Window - */ + // One Time Password Window 'window' => 1, - /* - * Forbid user to reuse One Time Passwords. - */ + // Forbid user to reuse One Time Passwords. 'forbid_old_passwords' => false, - /* - * User's table column for google2fa secret - */ + // User's table column for google2fa secret 'otp_secret_column' => 'mfa_secret', - /* - * One Time Password View - */ + // One Time Password View 'view' => 'auth.mfa', - /* - * One Time Password error message - */ + // One Time Password error message 'error_messages' => [ 'wrong_otp' => "The 'One Time Password' typed was wrong.", ], - /* - * Throw exceptions or just fire events? - */ + // Throw exceptions or just fire events? 'throw_exceptions' => true, 'store_in_cookie' => true, 'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG, - ]; diff --git a/config/hashing.php b/config/hashing.php index a82faad299..5a928e2e5e 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -1,6 +1,5 @@ 1, 'time' => 4, ], - ]; diff --git a/config/ide-helper.php b/config/ide-helper.php index 95598ccdcf..2ead082aff 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -86,7 +86,7 @@ return [ 'include_helpers' => false, 'helper_files' => [ - base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php', + base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php', ], /* @@ -141,7 +141,6 @@ return [ */ 'interfaces' => [ - ], /* @@ -171,7 +170,6 @@ return [ | */ 'custom_db_types' => [ - ], /* @@ -223,5 +221,4 @@ return [ | */ 'include_class_docblocks' => false, - ]; diff --git a/config/intro.php b/config/intro.php index b364b9f7b5..fcfbd0aa01 100644 --- a/config/intro.php +++ b/config/intro.php @@ -21,9 +21,7 @@ declare(strict_types=1); -/* - * Always make sure intro is the first element (if any) and outro is the last one. - */ +// Always make sure intro is the first element (if any) and outro is the last one. return [ // index @@ -73,7 +71,6 @@ return [ 'new_budget' => ['element' => '#createBudgetBox'], 'list_of_budgets' => ['element' => '#budgetList'], 'outro' => [], - ], // reports: index, default report, audit, budget, cat, tag 'reports_index' => [ @@ -94,7 +91,6 @@ return [ 'intro' => [], 'pieCharts' => ['element' => '#pieCharts'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], - ], 'reports_report_tag' => [ 'intro' => [], @@ -116,7 +112,6 @@ return [ 'piggy-banks_create' => [ 'name' => ['element' => '#ffInput_name'], 'date' => ['element' => '#ffInput_targetdate'], - ], 'piggy-banks_show' => [ 'piggyChart' => ['element' => '#piggyChart'], @@ -133,7 +128,7 @@ return [ 'bills_create' => [ 'intro' => [], 'name' => ['element' => '#name_holder'], - //'match' => ['element' => '#match_holder'], + // 'match' => ['element' => '#match_holder'], 'amount_min_holder' => ['element' => '#amount_min_holder'], 'repeat_freq_holder' => ['element' => '#repeat_freq_holder'], 'skip_holder' => ['element' => '#skip_holder'], @@ -142,7 +137,6 @@ return [ 'billInfo' => ['element' => '#billInfo'], 'billButtons' => ['element' => '#billButtons'], 'billChart' => ['element' => '#billChart', 'position' => 'top'], - ], // rules: index, create-rule, edit-rule 'rules_index' => [ diff --git a/config/logging.php b/config/logging.php index 57d2601851..667ec95e05 100644 --- a/config/logging.php +++ b/config/logging.php @@ -28,7 +28,6 @@ use Monolog\Handler\SyslogUdpHandler; $defaultChannels = ['daily', 'stdout']; $auditChannels = ['audit_daily', 'audit_stdout']; - // validChannels is missing 'stack' because we already check for that one. $validChannels = ['single', 'papertrail', 'stdout', 'daily', 'syslog', 'errorlog']; $validAuditChannels = ['audit_papertrail', 'audit_stdout', 'audit_stdout', 'audit_daily', 'audit_syslog', 'audit_errorlog']; @@ -89,9 +88,7 @@ return [ 'driver' => 'stack', 'channels' => $auditChannels, ], - /* - * There are 6 valid destinations for the normal logs, listed below: - */ + // There are 6 valid destinations for the normal logs, listed below: 'single' => [ 'driver' => 'single', 'path' => storage_path('logs/laravel.log'), @@ -113,7 +110,7 @@ return [ ], 'daily' => [ 'driver' => 'daily', - 'path' => storage_path('logs/ff3-' . PHP_SAPI . '.log'), + 'path' => storage_path('logs/ff3-'.PHP_SAPI.'.log'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'days' => 7, ], @@ -163,8 +160,5 @@ return [ 'tap' => [AuditLogger::class], 'level' => envNonEmpty('AUDIT_LOG_LEVEL', 'info'), ], - - ], - ]; diff --git a/config/mail.php b/config/mail.php index baea55bdc0..59ea401c04 100644 --- a/config/mail.php +++ b/config/mail.php @@ -22,7 +22,6 @@ declare(strict_types=1); return [ - /* |-------------------------------------------------------------------------- | Default Mailer @@ -91,5 +90,4 @@ return [ resource_path('views/vendor/mail'), ], ], - ]; diff --git a/config/passport.php b/config/passport.php index 6ea53eb703..76579537d9 100644 --- a/config/passport.php +++ b/config/passport.php @@ -1,6 +1,5 @@ env('PASSPORT_PERSONAL_ACCESS_CLIENT_ID'), 'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'), ], - ]; diff --git a/config/queue.php b/config/queue.php index 0950149af1..559e245a95 100644 --- a/config/queue.php +++ b/config/queue.php @@ -23,7 +23,6 @@ declare(strict_types=1); return [ - /* |-------------------------------------------------------------------------- | Default Queue Connection Name @@ -51,7 +50,6 @@ return [ */ 'connections' => [ - 'sync' => [ 'driver' => 'sync', ], @@ -88,7 +86,6 @@ return [ 'retry_after' => 90, 'block_for' => null, ], - ], /* @@ -107,5 +104,4 @@ return [ 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], - ]; diff --git a/config/sanctum.php b/config/sanctum.php index d0b57a048f..03ee208a26 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -26,7 +26,6 @@ use FireflyIII\Http\Middleware\EncryptCookies; use FireflyIII\Http\Middleware\VerifyCsrfToken; return [ - /* |-------------------------------------------------------------------------- | Stateful Domains @@ -82,5 +81,4 @@ return [ 'verify_csrf_token' => VerifyCsrfToken::class, 'encrypt_cookies' => EncryptCookies::class, ], - ]; diff --git a/config/search.php b/config/search.php index ec80652cff..c8dcb7cc6f 100644 --- a/config/search.php +++ b/config/search.php @@ -24,200 +24,200 @@ declare(strict_types=1); return [ 'operators' => [ - 'user_action' => ['alias' => false, 'needs_context' => true,], - 'account_id' => ['alias' => false, 'needs_context' => true,], - 'reconciled' => ['alias' => false, 'needs_context' => false,], - 'source_account_id' => ['alias' => false, 'needs_context' => true,], - 'destination_account_id' => ['alias' => false, 'needs_context' => true,], - 'transaction_type' => ['alias' => false, 'needs_context' => true,], - 'type' => ['alias' => true, 'alias_for' => 'transaction_type', 'needs_context' => true,], - 'tag_is' => ['alias' => false, 'needs_context' => true,], - 'tag_is_not' => ['alias' => false, 'needs_context' => true,], - 'tag' => ['alias' => true, 'alias_for' => 'tag_is', 'needs_context' => true,], - 'tag_contains' => ['alias' => false, 'needs_context' => true,], - 'tag_ends' => ['alias' => false, 'needs_context' => true,], - 'tag_starts' => ['alias' => false, 'needs_context' => true,], - 'description_is' => ['alias' => false, 'needs_context' => true,], - 'description' => ['alias' => true, 'alias_for' => 'description_is', 'needs_context' => true,], - 'description_contains' => ['alias' => false, 'needs_context' => true,], - 'description_ends' => ['alias' => false, 'needs_context' => true,], - 'description_starts' => ['alias' => false, 'needs_context' => true,], - 'notes_is' => ['alias' => false, 'needs_context' => true,], - 'notes_are' => ['alias' => true, 'alias_for' => 'notes_is', 'needs_context' => true,], - 'notes_contains' => ['alias' => false, 'needs_context' => true,], - 'notes_contain' => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true,], - 'notes' => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true,], - 'notes_ends' => ['alias' => false, 'needs_context' => true,], - 'notes_end' => ['alias' => true, 'alias_for' => 'notes_ends', 'needs_context' => true,], - 'notes_starts' => ['alias' => false, 'needs_context' => true,], - 'notes_start' => ['alias' => true, 'alias_for' => 'notes_starts', 'needs_context' => true,], - 'source_account_is' => ['alias' => false, 'needs_context' => true,], - 'from_account_is' => ['alias' => true, 'alias_for' => 'source_account_is', 'needs_context' => true,], - 'source_account_contains' => ['alias' => false, 'needs_context' => true,], - 'source' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true,], - 'from' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true,], - 'from_account_contains' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true,], - 'source_account_ends' => ['alias' => false, 'needs_context' => true,], - 'from_account_ends' => ['alias' => true, 'alias_for' => 'source_account_ends', 'needs_context' => true,], - 'source_account_starts' => ['alias' => false, 'needs_context' => true,], - 'from_account_starts' => ['alias' => true, 'alias_for' => 'source_account_starts', 'needs_context' => true,], - 'source_account_nr_is' => ['alias' => false, 'needs_context' => true,], - 'from_account_nr_is' => ['alias' => true, 'alias_for' => 'source_account_nr_is', 'needs_context' => true,], - 'source_account_nr_contains' => ['alias' => false, 'needs_context' => true,], - 'from_account_nr_contains' => ['alias' => true, 'alias_for' => 'source_account_nr_contains', 'needs_context' => true,], - 'source_account_nr_ends' => ['alias' => false, 'needs_context' => true,], - 'from_account_nr_ends' => ['alias' => true, 'alias_for' => 'source_account_nr_ends', 'needs_context' => true,], - 'source_account_nr_starts' => ['alias' => false, 'needs_context' => true,], - 'from_account_nr_starts' => ['alias' => true, 'alias_for' => 'source_account_nr_starts', 'needs_context' => true,], - 'destination_account_is' => ['alias' => false, 'needs_context' => true,], - 'to_account_is' => ['alias' => true, 'alias_for' => 'destination_account_is', 'needs_context' => true,], - 'destination_account_contains' => ['alias' => false, 'needs_context' => true,], - 'destination' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true,], - 'to' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true,], - 'to_account_contains' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true,], - 'destination_account_ends' => ['alias' => false, 'needs_context' => true,], - 'to_account_ends' => ['alias' => true, 'alias_for' => 'destination_account_ends', 'needs_context' => true,], - 'destination_account_starts' => ['alias' => false, 'needs_context' => true,], - 'to_account_starts' => ['alias' => true, 'alias_for' => 'destination_account_starts', 'needs_context' => true,], - 'destination_account_nr_is' => ['alias' => false, 'needs_context' => true,], - 'to_account_nr_is' => ['alias' => true, 'alias_for' => 'destination_account_nr_is', 'needs_context' => true,], - 'destination_account_nr_contains' => ['alias' => false, 'needs_context' => true,], - 'to_account_nr_contains' => ['alias' => true, 'alias_for' => 'destination_account_nr_contains', 'needs_context' => true,], - 'destination_account_nr_ends' => ['alias' => false, 'needs_context' => true,], - 'to_account_nr_ends' => ['alias' => true, 'alias_for' => 'destination_account_nr_ends', 'needs_context' => true,], - 'destination_account_nr_starts' => ['alias' => false, 'needs_context' => true,], - 'to_account_nr_starts' => ['alias' => true, 'alias_for' => 'destination_account_nr_starts', 'needs_context' => true,], - 'account_is' => ['alias' => false, 'needs_context' => true,], - 'account_contains' => ['alias' => false, 'needs_context' => true,], - 'account_ends' => ['alias' => false, 'needs_context' => true,], - 'account_starts' => ['alias' => false, 'needs_context' => true,], - 'account_nr_is' => ['alias' => false, 'needs_context' => true,], - 'account_nr_contains' => ['alias' => false, 'needs_context' => true,], - 'account_nr_ends' => ['alias' => false, 'needs_context' => true,], - 'account_nr_starts' => ['alias' => false, 'needs_context' => true,], - 'category_is' => ['alias' => false, 'needs_context' => true,], - 'category_contains' => ['alias' => false, 'needs_context' => true,], - 'category' => ['alias' => true, 'alias_for' => 'category_contains', 'needs_context' => true,], - 'category_ends' => ['alias' => false, 'needs_context' => true,], - 'category_starts' => ['alias' => false, 'needs_context' => true,], - 'budget_is' => ['alias' => false, 'needs_context' => true,], - 'budget_contains' => ['alias' => false, 'needs_context' => true,], - 'budget' => ['alias' => true, 'alias_for' => 'budget_contains', 'needs_context' => true,], - 'budget_ends' => ['alias' => false, 'needs_context' => true,], - 'budget_starts' => ['alias' => false, 'needs_context' => true,], - 'bill_is' => ['alias' => false, 'needs_context' => true,], - 'bill_contains' => ['alias' => false, 'needs_context' => true,], - 'bill' => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true,], - 'bill_ends' => ['alias' => false, 'needs_context' => true,], - 'bill_starts' => ['alias' => false, 'needs_context' => true,], - 'external_id_is' => ['alias' => false, 'needs_context' => true,], - 'external_id_contains' => ['alias' => false, 'needs_context' => true,], - 'external_id' => ['alias' => true, 'alias_for' => 'external_id_contains', 'needs_context' => true,], - 'external_id_ends' => ['alias' => false, 'needs_context' => true,], - 'external_id_starts' => ['alias' => false, 'needs_context' => true,], - 'internal_reference_is' => ['alias' => false, 'needs_context' => true,], - 'internal_reference_contains' => ['alias' => false, 'needs_context' => true,], - 'internal_reference' => ['alias' => true, 'alias_for' => 'internal_reference_contains', 'needs_context' => true,], - 'internal_reference_ends' => ['alias' => false, 'needs_context' => true,], - 'internal_reference_starts' => ['alias' => false, 'needs_context' => true,], - 'external_url_is' => ['alias' => false, 'needs_context' => true,], - 'external_url_contains' => ['alias' => false, 'needs_context' => true,], - 'external_url' => ['alias' => true, 'alias_for' => 'external_url_contains', 'needs_context' => true,], - 'external_url_ends' => ['alias' => false, 'needs_context' => true,], - 'external_url_starts' => ['alias' => false, 'needs_context' => true,], - 'has_attachments' => ['alias' => false, 'needs_context' => false,], - 'has_any_category' => ['alias' => false, 'needs_context' => false,], - 'has_any_budget' => ['alias' => false, 'needs_context' => false,], - 'has_any_bill' => ['alias' => false, 'needs_context' => false,], - 'has_any_tag' => ['alias' => false, 'needs_context' => false,], - 'any_notes' => ['alias' => false, 'needs_context' => false,], - 'has_any_notes' => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false,], - 'any_external_url' => ['alias' => false, 'needs_context' => false,], - 'has_any_external_url' => ['alias' => true, 'alias_for' => 'any_external_url', 'needs_context' => false,], - 'has_no_attachments' => ['alias' => false, 'needs_context' => false,], - 'has_no_category' => ['alias' => false, 'needs_context' => false,], - 'has_no_budget' => ['alias' => false, 'needs_context' => false,], - 'has_no_bill' => ['alias' => false, 'needs_context' => false,], - 'has_no_tag' => ['alias' => false, 'needs_context' => false,], - 'no_notes' => ['alias' => false, 'needs_context' => false,], - 'no_external_url' => ['alias' => false, 'needs_context' => false,], - 'source_is_cash' => ['alias' => false, 'needs_context' => false,], - 'destination_is_cash' => ['alias' => false, 'needs_context' => false,], - 'account_is_cash' => ['alias' => false, 'needs_context' => false,], - 'currency_is' => ['alias' => false, 'needs_context' => true,], - 'foreign_currency_is' => ['alias' => false, 'needs_context' => true,], - 'id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true,], - 'journal_id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true,], - 'recurrence_id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true,], - 'date_on' => ['alias' => false, 'needs_context' => true,], - 'date' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true,], - 'date_is' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true,], - 'on' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true,], - 'date_before' => ['alias' => false, 'needs_context' => true,], - 'before' => ['alias' => true, 'alias_for' => 'date_before', 'needs_context' => true,], - 'date_after' => ['alias' => false, 'needs_context' => true,], - 'after' => ['alias' => true, 'alias_for' => 'date_after', 'needs_context' => true,], - 'interest_date_on' => ['alias' => false, 'needs_context' => true,], - 'interest_date' => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true,], - 'interest_date_is' => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true,], - 'interest_date_before' => ['alias' => false, 'needs_context' => true,], - 'interest_date_after' => ['alias' => false, 'needs_context' => true,], - 'book_date_on' => ['alias' => false, 'needs_context' => true,], - 'book_date' => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true,], - 'book_date_is' => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true,], - 'book_date_before' => ['alias' => false, 'needs_context' => true,], - 'book_date_after' => ['alias' => false, 'needs_context' => true,], - 'process_date_on' => ['alias' => false, 'needs_context' => true,], - 'process_date' => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true,], - 'process_date_is' => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true,], - 'process_date_before' => ['alias' => false, 'needs_context' => true,], - 'process_date_after' => ['alias' => false, 'needs_context' => true,], - 'due_date_on' => ['alias' => false, 'needs_context' => true,], - 'due_date' => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true,], - 'due_date_is' => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true,], - 'due_date_before' => ['alias' => false, 'needs_context' => true,], - 'due_date_after' => ['alias' => false, 'needs_context' => true,], - 'payment_date_on' => ['alias' => false, 'needs_context' => true,], - 'payment_date' => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true,], - 'payment_date_is' => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true,], - 'payment_date_before' => ['alias' => false, 'needs_context' => true,], - 'payment_date_after' => ['alias' => false, 'needs_context' => true,], - 'invoice_date_on' => ['alias' => false, 'needs_context' => true,], - 'invoice_date' => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true,], - 'invoice_date_is' => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true,], - 'invoice_date_before' => ['alias' => false, 'needs_context' => true,], - 'invoice_date_after' => ['alias' => false, 'needs_context' => true,], - 'created_at_on' => ['alias' => false, 'needs_context' => true,], - 'created_at' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true,], - 'created_at_is' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true,], - 'created_at_before' => ['alias' => false, 'needs_context' => true,], - 'created_at_after' => ['alias' => false, 'needs_context' => true,], - 'updated_at_on' => ['alias' => false, 'needs_context' => true,], - 'updated_at' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true,], - 'updated_at_is' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true,], - 'updated_at_before' => ['alias' => false, 'needs_context' => true,], - 'updated_at_after' => ['alias' => false, 'needs_context' => true,], - 'created_on_on' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true,], - 'created_on' => ['alias' => true, 'alias_for' => 'created_at', 'needs_context' => true,], - 'created_on_before' => ['alias' => true, 'alias_for' => 'created_at_before', 'needs_context' => true,], - 'created_on_after' => ['alias' => true, 'alias_for' => 'created_at_after', 'needs_context' => true,], - 'updated_on_on' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true,], - 'updated_on' => ['alias' => true, 'alias_for' => 'updated_at', 'needs_context' => true,], - 'updated_on_before' => ['alias' => true, 'alias_for' => 'updated_at_before', 'needs_context' => true,], - 'updated_on_after' => ['alias' => true, 'alias_for' => 'updated_at_after', 'needs_context' => true,], - 'amount_is' => ['alias' => false, 'needs_context' => true,], - 'amount' => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true,], - 'amount_exactly' => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true,], - 'amount_less' => ['alias' => false, 'needs_context' => true,], - 'amount_max' => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true,], - 'amount_more' => ['alias' => false, 'needs_context' => true,], - 'amount_min' => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true,], - 'foreign_amount_is' => ['alias' => false, 'needs_context' => true,], - 'foreign_amount' => ['alias' => true, 'alias_for' => 'foreign_amount_is', 'needs_context' => true,], - 'foreign_amount_less' => ['alias' => false, 'needs_context' => true,], - 'foreign_amount_max' => ['alias' => true, 'alias_for' => 'foreign_amount_less', 'needs_context' => true,], - 'foreign_amount_more' => ['alias' => false, 'needs_context' => true,], - 'foreign_amount_min' => ['alias' => true, 'alias_for' => 'foreign_amount_more', 'needs_context' => true,], + 'user_action' => ['alias' => false, 'needs_context' => true], + 'account_id' => ['alias' => false, 'needs_context' => true], + 'reconciled' => ['alias' => false, 'needs_context' => false], + 'source_account_id' => ['alias' => false, 'needs_context' => true], + 'destination_account_id' => ['alias' => false, 'needs_context' => true], + 'transaction_type' => ['alias' => false, 'needs_context' => true], + 'type' => ['alias' => true, 'alias_for' => 'transaction_type', 'needs_context' => true], + 'tag_is' => ['alias' => false, 'needs_context' => true], + 'tag_is_not' => ['alias' => false, 'needs_context' => true], + 'tag' => ['alias' => true, 'alias_for' => 'tag_is', 'needs_context' => true], + 'tag_contains' => ['alias' => false, 'needs_context' => true], + 'tag_ends' => ['alias' => false, 'needs_context' => true], + 'tag_starts' => ['alias' => false, 'needs_context' => true], + 'description_is' => ['alias' => false, 'needs_context' => true], + 'description' => ['alias' => true, 'alias_for' => 'description_is', 'needs_context' => true], + 'description_contains' => ['alias' => false, 'needs_context' => true], + 'description_ends' => ['alias' => false, 'needs_context' => true], + 'description_starts' => ['alias' => false, 'needs_context' => true], + 'notes_is' => ['alias' => false, 'needs_context' => true], + 'notes_are' => ['alias' => true, 'alias_for' => 'notes_is', 'needs_context' => true], + 'notes_contains' => ['alias' => false, 'needs_context' => true], + 'notes_contain' => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true], + 'notes' => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true], + 'notes_ends' => ['alias' => false, 'needs_context' => true], + 'notes_end' => ['alias' => true, 'alias_for' => 'notes_ends', 'needs_context' => true], + 'notes_starts' => ['alias' => false, 'needs_context' => true], + 'notes_start' => ['alias' => true, 'alias_for' => 'notes_starts', 'needs_context' => true], + 'source_account_is' => ['alias' => false, 'needs_context' => true], + 'from_account_is' => ['alias' => true, 'alias_for' => 'source_account_is', 'needs_context' => true], + 'source_account_contains' => ['alias' => false, 'needs_context' => true], + 'source' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true], + 'from' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true], + 'from_account_contains' => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true], + 'source_account_ends' => ['alias' => false, 'needs_context' => true], + 'from_account_ends' => ['alias' => true, 'alias_for' => 'source_account_ends', 'needs_context' => true], + 'source_account_starts' => ['alias' => false, 'needs_context' => true], + 'from_account_starts' => ['alias' => true, 'alias_for' => 'source_account_starts', 'needs_context' => true], + 'source_account_nr_is' => ['alias' => false, 'needs_context' => true], + 'from_account_nr_is' => ['alias' => true, 'alias_for' => 'source_account_nr_is', 'needs_context' => true], + 'source_account_nr_contains' => ['alias' => false, 'needs_context' => true], + 'from_account_nr_contains' => ['alias' => true, 'alias_for' => 'source_account_nr_contains', 'needs_context' => true], + 'source_account_nr_ends' => ['alias' => false, 'needs_context' => true], + 'from_account_nr_ends' => ['alias' => true, 'alias_for' => 'source_account_nr_ends', 'needs_context' => true], + 'source_account_nr_starts' => ['alias' => false, 'needs_context' => true], + 'from_account_nr_starts' => ['alias' => true, 'alias_for' => 'source_account_nr_starts', 'needs_context' => true], + 'destination_account_is' => ['alias' => false, 'needs_context' => true], + 'to_account_is' => ['alias' => true, 'alias_for' => 'destination_account_is', 'needs_context' => true], + 'destination_account_contains' => ['alias' => false, 'needs_context' => true], + 'destination' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true], + 'to' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true], + 'to_account_contains' => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true], + 'destination_account_ends' => ['alias' => false, 'needs_context' => true], + 'to_account_ends' => ['alias' => true, 'alias_for' => 'destination_account_ends', 'needs_context' => true], + 'destination_account_starts' => ['alias' => false, 'needs_context' => true], + 'to_account_starts' => ['alias' => true, 'alias_for' => 'destination_account_starts', 'needs_context' => true], + 'destination_account_nr_is' => ['alias' => false, 'needs_context' => true], + 'to_account_nr_is' => ['alias' => true, 'alias_for' => 'destination_account_nr_is', 'needs_context' => true], + 'destination_account_nr_contains' => ['alias' => false, 'needs_context' => true], + 'to_account_nr_contains' => ['alias' => true, 'alias_for' => 'destination_account_nr_contains', 'needs_context' => true], + 'destination_account_nr_ends' => ['alias' => false, 'needs_context' => true], + 'to_account_nr_ends' => ['alias' => true, 'alias_for' => 'destination_account_nr_ends', 'needs_context' => true], + 'destination_account_nr_starts' => ['alias' => false, 'needs_context' => true], + 'to_account_nr_starts' => ['alias' => true, 'alias_for' => 'destination_account_nr_starts', 'needs_context' => true], + 'account_is' => ['alias' => false, 'needs_context' => true], + 'account_contains' => ['alias' => false, 'needs_context' => true], + 'account_ends' => ['alias' => false, 'needs_context' => true], + 'account_starts' => ['alias' => false, 'needs_context' => true], + 'account_nr_is' => ['alias' => false, 'needs_context' => true], + 'account_nr_contains' => ['alias' => false, 'needs_context' => true], + 'account_nr_ends' => ['alias' => false, 'needs_context' => true], + 'account_nr_starts' => ['alias' => false, 'needs_context' => true], + 'category_is' => ['alias' => false, 'needs_context' => true], + 'category_contains' => ['alias' => false, 'needs_context' => true], + 'category' => ['alias' => true, 'alias_for' => 'category_contains', 'needs_context' => true], + 'category_ends' => ['alias' => false, 'needs_context' => true], + 'category_starts' => ['alias' => false, 'needs_context' => true], + 'budget_is' => ['alias' => false, 'needs_context' => true], + 'budget_contains' => ['alias' => false, 'needs_context' => true], + 'budget' => ['alias' => true, 'alias_for' => 'budget_contains', 'needs_context' => true], + 'budget_ends' => ['alias' => false, 'needs_context' => true], + 'budget_starts' => ['alias' => false, 'needs_context' => true], + 'bill_is' => ['alias' => false, 'needs_context' => true], + 'bill_contains' => ['alias' => false, 'needs_context' => true], + 'bill' => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true], + 'bill_ends' => ['alias' => false, 'needs_context' => true], + 'bill_starts' => ['alias' => false, 'needs_context' => true], + 'external_id_is' => ['alias' => false, 'needs_context' => true], + 'external_id_contains' => ['alias' => false, 'needs_context' => true], + 'external_id' => ['alias' => true, 'alias_for' => 'external_id_contains', 'needs_context' => true], + 'external_id_ends' => ['alias' => false, 'needs_context' => true], + 'external_id_starts' => ['alias' => false, 'needs_context' => true], + 'internal_reference_is' => ['alias' => false, 'needs_context' => true], + 'internal_reference_contains' => ['alias' => false, 'needs_context' => true], + 'internal_reference' => ['alias' => true, 'alias_for' => 'internal_reference_contains', 'needs_context' => true], + 'internal_reference_ends' => ['alias' => false, 'needs_context' => true], + 'internal_reference_starts' => ['alias' => false, 'needs_context' => true], + 'external_url_is' => ['alias' => false, 'needs_context' => true], + 'external_url_contains' => ['alias' => false, 'needs_context' => true], + 'external_url' => ['alias' => true, 'alias_for' => 'external_url_contains', 'needs_context' => true], + 'external_url_ends' => ['alias' => false, 'needs_context' => true], + 'external_url_starts' => ['alias' => false, 'needs_context' => true], + 'has_attachments' => ['alias' => false, 'needs_context' => false], + 'has_any_category' => ['alias' => false, 'needs_context' => false], + 'has_any_budget' => ['alias' => false, 'needs_context' => false], + 'has_any_bill' => ['alias' => false, 'needs_context' => false], + 'has_any_tag' => ['alias' => false, 'needs_context' => false], + 'any_notes' => ['alias' => false, 'needs_context' => false], + 'has_any_notes' => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false], + 'any_external_url' => ['alias' => false, 'needs_context' => false], + 'has_any_external_url' => ['alias' => true, 'alias_for' => 'any_external_url', 'needs_context' => false], + 'has_no_attachments' => ['alias' => false, 'needs_context' => false], + 'has_no_category' => ['alias' => false, 'needs_context' => false], + 'has_no_budget' => ['alias' => false, 'needs_context' => false], + 'has_no_bill' => ['alias' => false, 'needs_context' => false], + 'has_no_tag' => ['alias' => false, 'needs_context' => false], + 'no_notes' => ['alias' => false, 'needs_context' => false], + 'no_external_url' => ['alias' => false, 'needs_context' => false], + 'source_is_cash' => ['alias' => false, 'needs_context' => false], + 'destination_is_cash' => ['alias' => false, 'needs_context' => false], + 'account_is_cash' => ['alias' => false, 'needs_context' => false], + 'currency_is' => ['alias' => false, 'needs_context' => true], + 'foreign_currency_is' => ['alias' => false, 'needs_context' => true], + 'id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true], + 'journal_id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true], + 'recurrence_id' => ['alias' => false, 'trigger_class' => '', 'needs_context' => true], + 'date_on' => ['alias' => false, 'needs_context' => true], + 'date' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true], + 'date_is' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true], + 'on' => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true], + 'date_before' => ['alias' => false, 'needs_context' => true], + 'before' => ['alias' => true, 'alias_for' => 'date_before', 'needs_context' => true], + 'date_after' => ['alias' => false, 'needs_context' => true], + 'after' => ['alias' => true, 'alias_for' => 'date_after', 'needs_context' => true], + 'interest_date_on' => ['alias' => false, 'needs_context' => true], + 'interest_date' => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true], + 'interest_date_is' => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true], + 'interest_date_before' => ['alias' => false, 'needs_context' => true], + 'interest_date_after' => ['alias' => false, 'needs_context' => true], + 'book_date_on' => ['alias' => false, 'needs_context' => true], + 'book_date' => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true], + 'book_date_is' => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true], + 'book_date_before' => ['alias' => false, 'needs_context' => true], + 'book_date_after' => ['alias' => false, 'needs_context' => true], + 'process_date_on' => ['alias' => false, 'needs_context' => true], + 'process_date' => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true], + 'process_date_is' => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true], + 'process_date_before' => ['alias' => false, 'needs_context' => true], + 'process_date_after' => ['alias' => false, 'needs_context' => true], + 'due_date_on' => ['alias' => false, 'needs_context' => true], + 'due_date' => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true], + 'due_date_is' => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true], + 'due_date_before' => ['alias' => false, 'needs_context' => true], + 'due_date_after' => ['alias' => false, 'needs_context' => true], + 'payment_date_on' => ['alias' => false, 'needs_context' => true], + 'payment_date' => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true], + 'payment_date_is' => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true], + 'payment_date_before' => ['alias' => false, 'needs_context' => true], + 'payment_date_after' => ['alias' => false, 'needs_context' => true], + 'invoice_date_on' => ['alias' => false, 'needs_context' => true], + 'invoice_date' => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true], + 'invoice_date_is' => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true], + 'invoice_date_before' => ['alias' => false, 'needs_context' => true], + 'invoice_date_after' => ['alias' => false, 'needs_context' => true], + 'created_at_on' => ['alias' => false, 'needs_context' => true], + 'created_at' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true], + 'created_at_is' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true], + 'created_at_before' => ['alias' => false, 'needs_context' => true], + 'created_at_after' => ['alias' => false, 'needs_context' => true], + 'updated_at_on' => ['alias' => false, 'needs_context' => true], + 'updated_at' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true], + 'updated_at_is' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true], + 'updated_at_before' => ['alias' => false, 'needs_context' => true], + 'updated_at_after' => ['alias' => false, 'needs_context' => true], + 'created_on_on' => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true], + 'created_on' => ['alias' => true, 'alias_for' => 'created_at', 'needs_context' => true], + 'created_on_before' => ['alias' => true, 'alias_for' => 'created_at_before', 'needs_context' => true], + 'created_on_after' => ['alias' => true, 'alias_for' => 'created_at_after', 'needs_context' => true], + 'updated_on_on' => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true], + 'updated_on' => ['alias' => true, 'alias_for' => 'updated_at', 'needs_context' => true], + 'updated_on_before' => ['alias' => true, 'alias_for' => 'updated_at_before', 'needs_context' => true], + 'updated_on_after' => ['alias' => true, 'alias_for' => 'updated_at_after', 'needs_context' => true], + 'amount_is' => ['alias' => false, 'needs_context' => true], + 'amount' => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true], + 'amount_exactly' => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true], + 'amount_less' => ['alias' => false, 'needs_context' => true], + 'amount_max' => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true], + 'amount_more' => ['alias' => false, 'needs_context' => true], + 'amount_min' => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true], + 'foreign_amount_is' => ['alias' => false, 'needs_context' => true], + 'foreign_amount' => ['alias' => true, 'alias_for' => 'foreign_amount_is', 'needs_context' => true], + 'foreign_amount_less' => ['alias' => false, 'needs_context' => true], + 'foreign_amount_max' => ['alias' => true, 'alias_for' => 'foreign_amount_less', 'needs_context' => true], + 'foreign_amount_more' => ['alias' => false, 'needs_context' => true], + 'foreign_amount_min' => ['alias' => true, 'alias_for' => 'foreign_amount_more', 'needs_context' => true], 'attachment_name_is' => ['alias' => false, 'needs_context' => true], 'attachment' => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true], 'attachment_is' => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true], @@ -233,10 +233,9 @@ return [ 'attachment_notes_start' => ['alias' => true, 'alias_for' => 'attachment_notes_starts', 'needs_context' => true], 'attachment_notes_ends' => ['alias' => false, 'needs_context' => true], 'attachment_notes_end' => ['alias' => true, 'alias_for' => 'attachment_notes_ends', 'needs_context' => true], - 'exists' => ['alias' => false, 'needs_context' => false,], + 'exists' => ['alias' => false, 'needs_context' => false], 'sepa_ct_is' => ['alias' => false, 'needs_context' => true], 'no_external_id' => ['alias' => false, 'needs_context' => false], 'any_external_id' => ['alias' => false, 'needs_context' => false], - ], ]; diff --git a/config/twigbridge.php b/config/twigbridge.php index 70ecf8d088..5f3dec4e86 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -22,8 +22,7 @@ declare(strict_types=1); - -/** +/* * This file is part of the TwigBridge package. * * @copyright Robert Crowe @@ -53,11 +52,8 @@ use TwigBridge\Extension\Loader\Filters; use TwigBridge\Extension\Loader\Functions; use TwigBridge\Extension\Loader\Globals; -/** - * Configuration options for Twig. - */ +// Configuration options for Twig. return [ - 'twig' => [ 'extension' => 'twig', 'environment' => [ @@ -95,7 +91,6 @@ return [ ], 'extensions' => [ - /* |-------------------------------------------------------------------------- | Extensions @@ -193,7 +188,6 @@ return [ 'amountNoCurrency', 'percentage', 'objectGroup', - ], ], 'AccountForm' => [ diff --git a/config/user_roles.php b/config/user_roles.php index e7c057a2b4..6fac33621c 100644 --- a/config/user_roles.php +++ b/config/user_roles.php @@ -22,13 +22,12 @@ declare(strict_types=1); - use FireflyIII\Enums\UserRoleEnum; $result = []; - foreach (UserRoleEnum::cases() as $role) { $result[$role->value] = []; } + return $result; diff --git a/config/view.php b/config/view.php index 20ff1589d5..d240484f07 100644 --- a/config/view.php +++ b/config/view.php @@ -28,7 +28,6 @@ if ('v2' === env('FIREFLY_III_LAYOUT')) { realpath(base_path('resources/views'))]; } - return [ /* |-------------------------------------------------------------------------- @@ -55,5 +54,4 @@ return [ */ 'compiled' => realpath(storage_path('framework/views')), - ];