Refer to classes directly.

2025-10-15 16:57:09 +00:00 · 2018-04-02 14:43:06 +02:00
parent d956c795a4
commit 379b104778
7 changed files with 239 additions and 163 deletions
--- a/config/breadcrumbs.php
+++ b/config/breadcrumbs.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);


-
 /**
 * breadcrumbs.php
 * Copyright (c) 2018 thegrumpydictator@gmail.com
--- a/config/csv.php
+++ b/config/csv.php
@@ -1,4 +1,12 @@
 <?php
+declare(strict_types=1);
+
+use FireflyIII\Import\Specifics\AbnAmroDescription;
+use FireflyIII\Import\Specifics\IngDescription;
+use FireflyIII\Import\Specifics\PresidentsChoice;
+use FireflyIII\Import\Specifics\RabobankDescription;
+use FireflyIII\Import\Specifics\SnsDescription;
+
 /**
 * csv.php
 * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,8 +27,6 @@
 * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
 */

-declare(strict_types=1);
-

 return [

@@ -28,11 +34,11 @@ return [
     * Configuration for the CSV specifics.
     */
    'import_specifics' => [
-        'IngDescription'      => 'FireflyIII\Import\Specifics\IngDescription',
-        'RabobankDescription' => 'FireflyIII\Import\Specifics\RabobankDescription',
-        'AbnAmroDescription'  => 'FireflyIII\Import\Specifics\AbnAmroDescription',
-        'SnsDescription'      => 'FireflyIII\Import\Specifics\SnsDescription',
-        'PresidentsChoice'    => 'FireflyIII\Import\Specifics\PresidentsChoice',
+        'IngDescription'      => IngDescription::class,
+        'RabobankDescription' => RabobankDescription::class,
+        'AbnAmroDescription'  => AbnAmroDescription::class,
+        'SnsDescription'      => SnsDescription::class,
+        'PresidentsChoice'    => PresidentsChoice::class,
    ],

    /*
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -1,4 +1,58 @@
 <?php
+
+declare(strict_types=1);
+
+use FireflyIII\Export\Exporter\CsvExporter;
+use FireflyIII\TransactionRules\Actions\AddTag;
+use FireflyIII\TransactionRules\Actions\AppendDescription;
+use FireflyIII\TransactionRules\Actions\AppendNotes;
+use FireflyIII\TransactionRules\Actions\ClearBudget;
+use FireflyIII\TransactionRules\Actions\ClearCategory;
+use FireflyIII\TransactionRules\Actions\ClearNotes;
+use FireflyIII\TransactionRules\Actions\PrependDescription;
+use FireflyIII\TransactionRules\Actions\PrependNotes;
+use FireflyIII\TransactionRules\Actions\RemoveAllTags;
+use FireflyIII\TransactionRules\Actions\RemoveTag;
+use FireflyIII\TransactionRules\Actions\SetBudget;
+use FireflyIII\TransactionRules\Actions\SetCategory;
+use FireflyIII\TransactionRules\Actions\SetDescription;
+use FireflyIII\TransactionRules\Actions\SetDestinationAccount;
+use FireflyIII\TransactionRules\Actions\SetNotes;
+use FireflyIII\TransactionRules\Actions\SetSourceAccount;
+use FireflyIII\TransactionRules\Triggers\AmountExactly;
+use FireflyIII\TransactionRules\Triggers\AmountLess;
+use FireflyIII\TransactionRules\Triggers\AmountMore;
+use FireflyIII\TransactionRules\Triggers\BudgetIs;
+use FireflyIII\TransactionRules\Triggers\CategoryIs;
+use FireflyIII\TransactionRules\Triggers\DescriptionContains;
+use FireflyIII\TransactionRules\Triggers\DescriptionEnds;
+use FireflyIII\TransactionRules\Triggers\DescriptionIs;
+use FireflyIII\TransactionRules\Triggers\DescriptionStarts;
+use FireflyIII\TransactionRules\Triggers\FromAccountContains;
+use FireflyIII\TransactionRules\Triggers\FromAccountEnds;
+use FireflyIII\TransactionRules\Triggers\FromAccountIs;
+use FireflyIII\TransactionRules\Triggers\FromAccountStarts;
+use FireflyIII\TransactionRules\Triggers\HasAnyBudget;
+use FireflyIII\TransactionRules\Triggers\HasAnyCategory;
+use FireflyIII\TransactionRules\Triggers\HasAnyTag;
+use FireflyIII\TransactionRules\Triggers\HasAttachment;
+use FireflyIII\TransactionRules\Triggers\HasNoBudget;
+use FireflyIII\TransactionRules\Triggers\HasNoCategory;
+use FireflyIII\TransactionRules\Triggers\HasNoTag;
+use FireflyIII\TransactionRules\Triggers\NotesAny;
+use FireflyIII\TransactionRules\Triggers\NotesAre;
+use FireflyIII\TransactionRules\Triggers\NotesContain;
+use FireflyIII\TransactionRules\Triggers\NotesEmpty;
+use FireflyIII\TransactionRules\Triggers\NotesEnd;
+use FireflyIII\TransactionRules\Triggers\NotesStart;
+use FireflyIII\TransactionRules\Triggers\TagIs;
+use FireflyIII\TransactionRules\Triggers\ToAccountContains;
+use FireflyIII\TransactionRules\Triggers\ToAccountEnds;
+use FireflyIII\TransactionRules\Triggers\ToAccountIs;
+use FireflyIII\TransactionRules\Triggers\ToAccountStarts;
+use FireflyIII\TransactionRules\Triggers\TransactionType;
+use FireflyIII\TransactionRules\Triggers\UserAction;
+
 /**
 * firefly.php
 * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,7 +73,6 @@
 * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
 */

-declare(strict_types=1);

 /*
 * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED.
@@ -101,7 +154,7 @@ return [
    ],
    'list_length'    => 10,
    'export_formats' => [
-        'csv' => 'FireflyIII\Export\Exporter\CsvExporter',
+        'csv' => CsvExporter::class,
    ],
    'spectre'        => [
        'server' => 'https://www.saltedge.com',
@@ -250,57 +303,57 @@ return [

    ],
    'rule-triggers'            => [
-        'user_action'           => 'FireflyIII\TransactionRules\Triggers\UserAction',
-        'from_account_starts'   => 'FireflyIII\TransactionRules\Triggers\FromAccountStarts',
-        'from_account_ends'     => 'FireflyIII\TransactionRules\Triggers\FromAccountEnds',
-        'from_account_is'       => 'FireflyIII\TransactionRules\Triggers\FromAccountIs',
-        'from_account_contains' => 'FireflyIII\TransactionRules\Triggers\FromAccountContains',
-        'to_account_starts'     => 'FireflyIII\TransactionRules\Triggers\ToAccountStarts',
-        'to_account_ends'       => 'FireflyIII\TransactionRules\Triggers\ToAccountEnds',
-        'to_account_is'         => 'FireflyIII\TransactionRules\Triggers\ToAccountIs',
-        'to_account_contains'   => 'FireflyIII\TransactionRules\Triggers\ToAccountContains',
-        'amount_less'           => 'FireflyIII\TransactionRules\Triggers\AmountLess',
-        'amount_exactly'        => 'FireflyIII\TransactionRules\Triggers\AmountExactly',
-        'amount_more'           => 'FireflyIII\TransactionRules\Triggers\AmountMore',
-        'description_starts'    => 'FireflyIII\TransactionRules\Triggers\DescriptionStarts',
-        'description_ends'      => 'FireflyIII\TransactionRules\Triggers\DescriptionEnds',
-        'description_contains'  => 'FireflyIII\TransactionRules\Triggers\DescriptionContains',
-        'description_is'        => 'FireflyIII\TransactionRules\Triggers\DescriptionIs',
-        'transaction_type'      => 'FireflyIII\TransactionRules\Triggers\TransactionType',
-        'category_is'           => 'FireflyIII\TransactionRules\Triggers\CategoryIs',
-        'budget_is'             => 'FireflyIII\TransactionRules\Triggers\BudgetIs',
-        'tag_is'                => 'FireflyIII\TransactionRules\Triggers\TagIs',
-        'has_attachments'       => 'FireflyIII\TransactionRules\Triggers\HasAttachment',
-        'has_no_category'       => 'FireflyIII\TransactionRules\Triggers\HasNoCategory',
-        'has_any_category'      => 'FireflyIII\TransactionRules\Triggers\HasAnyCategory',
-        'has_no_budget'         => 'FireflyIII\TransactionRules\Triggers\HasNoBudget',
-        'has_any_budget'        => 'FireflyIII\TransactionRules\Triggers\HasAnyBudget',
-        'has_no_tag'            => 'FireflyIII\TransactionRules\Triggers\HasNoTag',
-        'has_any_tag'           => 'FireflyIII\TransactionRules\Triggers\HasAnyTag',
-        'notes_contain'         => 'FireflyIII\TransactionRules\Triggers\NotesContain',
-        'notes_start'           => 'FireflyIII\TransactionRules\Triggers\NotesStart',
-        'notes_end'             => 'FireflyIII\TransactionRules\Triggers\NotesEnd',
-        'notes_are'             => 'FireflyIII\TransactionRules\Triggers\NotesAre',
-        'no_notes'              => 'FireflyIII\TransactionRules\Triggers\NotesEmpty',
-        'any_notes'             => 'FireflyIII\TransactionRules\Triggers\NotesAny',
+        'user_action'           => UserAction::class,
+        'from_account_starts'   => FromAccountStarts::class,
+        'from_account_ends'     => FromAccountEnds::class,
+        'from_account_is'       => FromAccountIs::class,
+        'from_account_contains' => FromAccountContains::class,
+        'to_account_starts'     => ToAccountStarts::class,
+        'to_account_ends'       => ToAccountEnds::class,
+        'to_account_is'         => ToAccountIs::class,
+        'to_account_contains'   => ToAccountContains::class,
+        'amount_less'           => AmountLess::class,
+        'amount_exactly'        => AmountExactly::class,
+        'amount_more'           => AmountMore::class,
+        'description_starts'    => DescriptionStarts::class,
+        'description_ends'      => DescriptionEnds::class,
+        'description_contains'  => DescriptionContains::class,
+        'description_is'        => DescriptionIs::class,
+        'transaction_type'      => TransactionType::class,
+        'category_is'           => CategoryIs::class,
+        'budget_is'             => BudgetIs::class,
+        'tag_is'                => TagIs::class,
+        'has_attachments'       => HasAttachment::class,
+        'has_no_category'       => HasNoCategory::class,
+        'has_any_category'      => HasAnyCategory::class,
+        'has_no_budget'         => HasNoBudget::class,
+        'has_any_budget'        => HasAnyBudget::class,
+        'has_no_tag'            => HasNoTag::class,
+        'has_any_tag'           => HasAnyTag::class,
+        'notes_contain'         => NotesContain::class,
+        'notes_start'           => NotesStart::class,
+        'notes_end'             => NotesEnd::class,
+        'notes_are'             => NotesAre::class,
+        'no_notes'              => NotesEmpty::class,
+        'any_notes'             => NotesAny::class,
    ],
    'rule-actions'             => [
-        'set_category'            => 'FireflyIII\TransactionRules\Actions\SetCategory',
-        'clear_category'          => 'FireflyIII\TransactionRules\Actions\ClearCategory',
-        'set_budget'              => 'FireflyIII\TransactionRules\Actions\SetBudget',
-        'clear_budget'            => 'FireflyIII\TransactionRules\Actions\ClearBudget',
-        'add_tag'                 => 'FireflyIII\TransactionRules\Actions\AddTag',
-        'remove_tag'              => 'FireflyIII\TransactionRules\Actions\RemoveTag',
-        'remove_all_tags'         => 'FireflyIII\TransactionRules\Actions\RemoveAllTags',
-        'set_description'         => 'FireflyIII\TransactionRules\Actions\SetDescription',
-        'append_description'      => 'FireflyIII\TransactionRules\Actions\AppendDescription',
-        'prepend_description'     => 'FireflyIII\TransactionRules\Actions\PrependDescription',
-        'set_source_account'      => 'FireflyIII\TransactionRules\Actions\SetSourceAccount',
-        'set_destination_account' => 'FireflyIII\TransactionRules\Actions\SetDestinationAccount',
-        'set_notes'               => 'FireflyIII\TransactionRules\Actions\SetNotes',
-        'append_notes'            => 'FireflyIII\TransactionRules\Actions\AppendNotes',
-        'prepend_notes'           => 'FireflyIII\TransactionRules\Actions\PrependNotes',
-        'clear_notes'             => 'FireflyIII\TransactionRules\Actions\ClearNotes',
+        'set_category'            => SetCategory::class,
+        'clear_category'          => ClearCategory::class,
+        'set_budget'              => SetBudget::class,
+        'clear_budget'            => ClearBudget::class,
+        'add_tag'                 => AddTag::class,
+        'remove_tag'              => RemoveTag::class,
+        'remove_all_tags'         => RemoveAllTags::class,
+        'set_description'         => SetDescription::class,
+        'append_description'      => AppendDescription::class,
+        'prepend_description'     => PrependDescription::class,
+        'set_source_account'      => SetSourceAccount::class,
+        'set_destination_account' => SetDestinationAccount::class,
+        'set_notes'               => SetNotes::class,
+        'append_notes'            => AppendNotes::class,
+        'prepend_notes'           => PrependNotes::class,
+        'clear_notes'             => ClearNotes::class,
    ],
    'rule-actions-text'        => [
        'set_category',
@@ -320,9 +373,4 @@ return [
    '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'],
    // tag notes has_attachments
-    'currency_exchange_services' => [
-        'fixerio' => 'FireflyIII\Services\Currency\FixerIO',
-    ],
-    'preferred_exchange_service' => 'fixerio',
-
 ];
--- a/config/google2fa.php
+++ b/config/google2fa.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);


-
 /**
 * google2fa.php
 * Copyright (c) 2018 thegrumpydictator@gmail.com
--- a/config/import.php
+++ b/config/import.php
@@ -1,4 +1,17 @@
 <?php
+declare(strict_types=1);
+
+use FireflyIII\Import\Configuration\BunqConfigurator;
+use FireflyIII\Import\Configuration\FileConfigurator;
+use FireflyIII\Import\Configuration\SpectreConfigurator;
+use FireflyIII\Import\FileProcessor\CsvProcessor;
+use FireflyIII\Import\Prerequisites\BunqPrerequisites;
+use FireflyIII\Import\Prerequisites\FilePrerequisites;
+use FireflyIII\Import\Prerequisites\SpectrePrerequisites;
+use FireflyIII\Import\Routine\BunqRoutine;
+use FireflyIII\Import\Routine\FileRoutine;
+use FireflyIII\Import\Routine\SpectreRoutine;
+
 /**
 * import.php
 * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,7 +32,6 @@
 * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
 */

-declare(strict_types=1);

 return [
    'enabled'       => [
@@ -29,22 +41,22 @@ return [
        'plaid'   => false,
    ],
    'prerequisites' => [
-        'file'    => 'FireflyIII\Import\Prerequisites\FilePrerequisites',
-        'bunq'    => 'FireflyIII\Import\Prerequisites\BunqPrerequisites',
-        'spectre' => 'FireflyIII\Import\Prerequisites\SpectrePrerequisites',
+        'file'    => FilePrerequisites::class,
+        'bunq'    => BunqPrerequisites::class,
+        'spectre' => SpectrePrerequisites::class,
        'plaid'   => 'FireflyIII\Import\Prerequisites\PlaidPrerequisites',

    ],
    'configuration' => [
-        'file'    => 'FireflyIII\Import\Configuration\FileConfigurator',
-        'bunq'    => 'FireflyIII\Import\Configuration\BunqConfigurator',
-        'spectre' => 'FireflyIII\Import\Configuration\SpectreConfigurator',
+        'file'    => FileConfigurator::class,
+        'bunq'    => BunqConfigurator::class,
+        'spectre' => SpectreConfigurator::class,
        'plaid'   => 'FireflyIII\Import\Configuration\PlaidConfigurator',
    ],
    'routine'       => [
-        'file'    => 'FireflyIII\Import\Routine\FileRoutine',
-        'bunq'    => 'FireflyIII\Import\Routine\BunqRoutine',
-        'spectre' => 'FireflyIII\Import\Routine\SpectreRoutine',
+        'file'    => FileRoutine::class,
+        'bunq'    => BunqRoutine::class,
+        'spectre' => SpectreRoutine::class,
        'plaid'   => 'FireflyIII\Import\Routine\PlaidRoutine',
    ],

@@ -53,7 +65,7 @@ return [
            'import_formats'        => ['csv'], // mt940
            'default_import_format' => 'csv',
            'processors'            => [
-                'csv' => 'FireflyIII\Import\FileProcessor\CsvProcessor',
+                'csv' => CsvProcessor::class,
            ],
        ],
        'bunq' => [
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -1,4 +1,18 @@
 <?php
+declare(strict_types=1);
+
+use TwigBridge\Extension\Laravel\Auth;
+use TwigBridge\Extension\Laravel\Config;
+use TwigBridge\Extension\Laravel\Dump;
+use TwigBridge\Extension\Laravel\Input;
+use TwigBridge\Extension\Laravel\Session;
+use TwigBridge\Extension\Laravel\Str;
+use TwigBridge\Extension\Laravel\Translator;
+use TwigBridge\Extension\Laravel\Url;
+use TwigBridge\Extension\Loader\Facades;
+use TwigBridge\Extension\Loader\Filters;
+use TwigBridge\Extension\Loader\Functions;
+use TwigBridge\Twig\Template;

 /**
 * twigbridge.php
@@ -20,8 +34,6 @@
 * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
 */

-declare(strict_types=1);
-

 /**
 * Configuration options for Twig.
@@ -59,7 +71,7 @@ return [

            // The base template class to use for generated templates.
            // default: TwigBridge\Twig\Template
-            'base_template_class' => 'TwigBridge\Twig\Template',
+            'base_template_class' => Template::class,

            // An absolute path where to store the compiled templates, or false to disable caching. If null
            // then the cache file path is used.
@@ -111,18 +123,18 @@ return [
        |
        */
        'enabled'   => [
-            'TwigBridge\Extension\Loader\Facades',
-            'TwigBridge\Extension\Loader\Filters',
-            'TwigBridge\Extension\Loader\Functions',
+            Facades::class,
+            Filters::class,
+            Functions::class,

-            'TwigBridge\Extension\Laravel\Auth',
-            'TwigBridge\Extension\Laravel\Config',
-            'TwigBridge\Extension\Laravel\Dump',
-            'TwigBridge\Extension\Laravel\Input',
-            'TwigBridge\Extension\Laravel\Session',
-            'TwigBridge\Extension\Laravel\Str',
-            'TwigBridge\Extension\Laravel\Translator',
-            'TwigBridge\Extension\Laravel\Url',
+            Auth::class,
+            Config::class,
+            Dump::class,
+            Input::class,
+            Session::class,
+            Str::class,
+            Translator::class,
+            Url::class,
            // 'TwigBridge\Extension\Laravel\Gate',

            // 'TwigBridge\Extension\Laravel\Form',