diff --git a/.env.example b/.env.example index e6737be1e7..f323006adc 100644 --- a/.env.example +++ b/.env.example @@ -188,9 +188,6 @@ MAILERSEND_API_KEY= # Firefly III can send you the following messages. SEND_ERROR_MESSAGE=true -# These messages contain (sensitive) transaction information: -SEND_REPORT_JOURNALS=true - # Set this value to true if you want to set the location of certain things, like transactions. # Since this involves an external service, it's optional and disabled by default. ENABLE_EXTERNAL_MAP=false @@ -326,12 +323,6 @@ USE_RUNNING_BALANCE=false # FIREFLY_III_LAYOUT=v1 -# -# Which Query Parser implementation to use for the search engine and rules -# 'new' is experimental, 'legacy' is the classic one -# -QUERY_PARSER_IMPLEMENTATION=new - # # Please make sure this URL matches the external URL of your Firefly III installation. # It is used to validate specific requests and to generate URLs in emails. diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index baf32f811b..295c00c936 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -50,12 +50,14 @@ class SearchServiceProvider extends ServiceProvider { $this->app->bind( static function (): QueryParserInterface { - $implementation = config('search.query_parser'); - - return match ($implementation) { - 'new' => app(QueryParser::class), - default => app(GdbotsQueryParser::class), - }; + return app(QueryParser::class); + // 2025-12-20 ignore this setting. +// $implementation = config('search.query_parser'); +// +// return match ($implementation) { +// 'new' => app(QueryParser::class), +// default => app(GdbotsQueryParser::class), +// }; } ); diff --git a/config/firefly.php b/config/firefly.php index 556eefacd9..9522bf9cf7 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -99,9 +99,6 @@ return [ 'disable_csp_header' => env('DISABLE_CSP_HEADER', false), 'allow_webhooks' => env('ALLOW_WEBHOOKS', false), - // flags - 'send_report_journals' => envNonEmpty('SEND_REPORT_JOURNALS', true), - // info for demo site 'demo_username' => env('DEMO_USERNAME', ''), 'demo_password' => env('DEMO_PASSWORD', ''), diff --git a/config/search.php b/config/search.php index e6386d5240..05bd7eb0f1 100644 --- a/config/search.php +++ b/config/search.php @@ -261,6 +261,4 @@ return [ 'destination_balance_lt' => ['alias' => false, 'needs_context' => true], 'destination_balance_is' => ['alias' => false, 'needs_context' => true], ], - // Which query parser to use - 'new' or 'legacy' - 'query_parser' => env('QUERY_PARSER_IMPLEMENTATION', 'legacy'), ];