Merge branch 'release/6.0.9'

Fix 7394

.ci/php-cs-fixer/composer.lock

@@ -379,16 +379,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.15.1",
+            "version": "v3.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "d48755372a113bddb99f749e34805d83f3acfe04"
+                "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d48755372a113bddb99f749e34805d83f3acfe04",
-                "reference": "d48755372a113bddb99f749e34805d83f3acfe04",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
+                "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
                 "shasum": ""
             },
             "require": {
@@ -463,7 +463,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.15.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0"
             },
             "funding": [
                 {
@@ -471,7 +471,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-13T23:26:30+00:00"
+            "time": "2023-04-02T19:30:06+00:00"
         },
         {
             "name": "psr/cache",

.ci/phpcs.sh

@@ -31,6 +31,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
 composer update
+rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
 cd $SCRIPT_DIR/..
 

.github/workflows/cleanup.yml

@@ -55,7 +55,6 @@ jobs:
             // because we track the duration of runs over time
             
             const workflows = [
-              'build.yml',
               'cleanup.yml',
               'depsreview.yaml',
               'laravel.yml',

.github/workflows/lock.yml

@@ -5,26 +5,15 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
-permissions:
-  contents: read
-
 jobs:
   lock:
     permissions:
-      issues: write  # for dessant/lock-threads to lock issues
-      pull-requests: write  # for dessant/lock-threads to lock PRs
+      issues: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: JC5/lock-threads@main
         with:
           github-token: ${{ github.token }}
-          issue-lock-inactive-days: '90'
-          issue-comment: >
-            Hi there! This is an automatic reply. `Share and enjoy`
-
-            This issue is now `locked` :lock:. 
-
-            - If you feel there is more to be said about this specific issue, please feel free to open a new issue. Please refer to this issue for clarity. 
-            - Follow-up questions and comments can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
-
-            Thank you for your consideration.
+          issue-inactive-days: 90
+          pr-inactive-days: 90

.github/workflows/stale.yml

@@ -31,4 +31,4 @@ jobs:
             Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,layout-v3'
+          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic'

app/Api/V1/Controllers/Controller.php

@@ -85,12 +85,11 @@ abstract class Controller extends BaseController
     {
         $bag  = new ParameterBag();
         $page = (int)request()->get('page');
-
         if ($page < 1) {
             $page = 1;
         }
-        if ($page > (2 ^ 16)) {
-            $page = (2 ^ 16);
+        if ($page > pow(2, 16)) {
+            $page = pow(2, 16);
         }
         $bag->set('page', $page);
 

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
@@ -108,12 +108,12 @@ class ShowController extends Controller
      *
      * Display a listing of the budget limits for this budget.
      *
-     * @param  DateRequest  $request
+     * @param  SameDateRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function indexAll(DateRequest $request): JsonResponse
+    public function indexAll(SameDateRequest $request): JsonResponse
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');

app/Api/V1/Requests/Data/DestroyRequest.php

@@ -57,7 +57,7 @@ class DestroyRequest extends FormRequest
                  ',not_assets_liabilities';
 
         return [
-            'objects' => sprintf('required|min:1|string|in:%s', $valid),
+            'objects' => sprintf('required|max:255|min:1|string|in:%s', $valid),
             'unused'  => 'in:true,false',
         ];
     }

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -73,7 +73,7 @@ class ExportRequest extends FormRequest
     {
         return [
             'type'     => 'in:csv',
-            'accounts' => 'min:1',
+            'accounts' => 'min:1|max:65536',
             'start'    => 'date|before:end',
             'end'      => 'date|after:start',
         ];

app/Api/V1/Requests/Data/SameDateRequest.php

@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * DateRequest.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests\Data;
+
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Request class for end points that require date parameters.
+ *
+ * Class SameDateRequest
+ */
+class SameDateRequest extends FormRequest
+{
+    use ConvertsDataTypes;
+    use ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'start' => $this->getCarbonDate('start'),
+            'end'   => $this->getCarbonDate('end'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start' => 'required|date',
+            'end'   => 'required|date|after_or_equal:start',
+        ];
+    }
+}

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -103,8 +103,8 @@ class StoreRequest extends FormRequest
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
         $type           = $this->convertString('type');
         $rules          = [
-            'name'                 => 'required|min:1|uniqueAccountForUser',
-            'type'                 => 'required|min:1|'.sprintf('in:%s', $types),
+            'name'                 => 'required|max:1024|min:1|uniqueAccountForUser',
+            'type'                 => 'required|max:1024|min:1|'.sprintf('in:%s', $types),
             'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
             'bic'                  => 'bic|nullable',
             'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber(null, $type)],
@@ -120,7 +120,7 @@ class StoreRequest extends FormRequest
             'credit_card_type'     => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
             'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
             'liability_type'       => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
-            'liability_amount'     => 'required_with:liability_start_date|min:0|numeric',
+            'liability_amount'     => 'required_with:liability_start_date|min:0|numeric|max:1000000000',
             'liability_start_date' => 'required_with:liability_amount|date',
             'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
             'interest'             => 'between:0,100|numeric',

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -94,7 +94,7 @@ class UpdateRequest extends FormRequest
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
 
         $rules = [
-            'name'                 => sprintf('min:1|uniqueAccountForUser:%d', $account->id),
+            'name'                 => sprintf('min:1|max:1024|uniqueAccountForUser:%d', $account->id),
             'type'                 => sprintf('in:%s', $types),
             'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))],
             'bic'                  => 'bic|nullable',
@@ -104,7 +104,7 @@ class UpdateRequest extends FormRequest
             'virtual_balance'      => 'numeric|nullable',
             'order'                => 'numeric|nullable',
             'currency_id'          => 'numeric|exists:transaction_currencies,id',
-            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code'        => 'min:3|max:51|exists:transaction_currencies,code',
             'active'               => [new IsBoolean()],
             'include_net_worth'    => [new IsBoolean()],
             'account_role'         => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles),

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -67,7 +67,7 @@ class Request extends FormRequest
     {
         return [
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
             'amount'        => 'numeric|gt:0',
             'start'         => 'date',
             'end'           => 'date',

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -82,7 +82,7 @@ class StoreRequest extends FormRequest
             'amount_min'     => 'numeric|gt:0|required',
             'amount_max'     => 'numeric|gt:0|required',
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
-            'currency_code'  => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
             'date'           => 'date|required',
             'end_date'       => 'date|after:date',
             'extension_date' => 'date|after:date',

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -84,7 +84,7 @@ class UpdateRequest extends FormRequest
             'amount_min'     => 'numeric|gt:0',
             'amount_max'     => 'numeric|gt:0',
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
-            'currency_code'  => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
             'date'           => 'date',
             'end_date'       => 'date|after:date',
             'extension_date' => 'date|after:date',

app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php

@@ -65,7 +65,7 @@ class StoreRequest extends FormRequest
             'end'           => 'required|after:start|date',
             'amount'        => 'required|gt:0',
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
         ];
     }
 }

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -69,7 +69,7 @@ class UpdateRequest extends FormRequest
             'end'           => 'date',
             'amount'        => 'gt:0',
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
         ];
     }
 

app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php

@@ -63,7 +63,7 @@ class UpdateRequest extends FormRequest
         $objectGroup = $this->route()->parameter('objectGroup');
 
         return [
-            'title' => sprintf('min:1|uniqueObjectGroup:%d', $objectGroup->id),
+            'title' => sprintf('max:1024|min:1|uniqueObjectGroup:%d', $objectGroup->id),
             'order' => 'numeric',
         ];
     }

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -158,9 +158,9 @@ class StoreRequest extends FormRequest
             'transactions.*.amount'                => 'required|numeric|gt:0',
             'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
             'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.currency_code'         => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser()],
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser()],

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -172,9 +172,9 @@ class UpdateRequest extends FormRequest
             'transactions.*.amount'                => 'numeric|gt:0',
             'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
             'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.currency_code'         => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser()],
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser()],

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -79,7 +79,7 @@ class StoreRequest extends FormRequest
                 $return[] = [
                     'type'            => $trigger['type'],
                     'value'           => $trigger['value'],
-                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'false')),
+                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'true')),
                     'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
                 ];
             }
@@ -100,7 +100,7 @@ class StoreRequest extends FormRequest
                 $return[] = [
                     'type'            => $action['type'],
                     'value'           => $action['value'],
-                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'false')),
+                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'true')),
                     'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
                 ];
             }
@@ -130,7 +130,7 @@ class StoreRequest extends FormRequest
             'rule_group_title'           => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
             'trigger'                    => 'required|in:store-journal,update-journal',
             'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
-            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue',
+            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -147,7 +147,7 @@ class UpdateRequest extends FormRequest
             'rule_group_title'           => 'nullable|between:1,255|belongsToUser:rule_groups,title',
             'trigger'                    => 'in:store-journal,update-journal',
             'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
-            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue',
+            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -65,8 +65,8 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         $rules = [
-            'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag',
-            'description' => 'min:1|nullable',
+            'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag|max:1024',
+            'description' => 'min:1|nullable|max:65536',
             'date'        => 'date|nullable',
         ];
 

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -71,8 +71,8 @@ class UpdateRequest extends FormRequest
         $tag = $this->route()->parameter('tagOrId');
         // TODO check if uniqueObjectForUser is obsolete
         $rules = [
-            'tag'         => 'min:1|uniqueObjectForUser:tags,tag,'.$tag->id,
-            'description' => 'min:1|nullable',
+            'tag'         => 'min:1|max:1024|uniqueObjectForUser:tags,tag,'.$tag->id,
+            'description' => 'min:1|nullable|max:65536',
             'date'        => 'date|nullable',
         ];
 

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -188,9 +188,9 @@ class StoreRequest extends FormRequest
 
             // currency info
             'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id|nullable',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code|nullable',
+            'transactions.*.currency_code'         => 'min:3|max:51|exists:transaction_currencies,code|nullable',
             'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id|nullable',
-            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable',
+            'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable',
 
             // amount
             'transactions.*.amount'                => 'required|numeric|gt:0',
@@ -225,25 +225,25 @@ class StoreRequest extends FormRequest
 
             // other interesting fields
             'transactions.*.reconciled'            => [new IsBoolean()],
-            'transactions.*.notes'                 => 'min:1,max:50000|nullable',
+            'transactions.*.notes'                 => 'min:1|max:50000|nullable',
             'transactions.*.tags'                  => 'between:0,255',
 
             // meta info fields
-            'transactions.*.internal_reference'    => 'min:1,max:255|nullable',
-            'transactions.*.external_id'           => 'min:1,max:255|nullable',
-            'transactions.*.recurrence_id'         => 'min:1,max:255|nullable',
-            'transactions.*.bunq_payment_id'       => 'min:1,max:255|nullable',
-            'transactions.*.external_url'          => 'min:1,max:255|nullable|url',
+            'transactions.*.internal_reference'    => 'min:1|max:255|nullable',
+            'transactions.*.external_id'           => 'min:1|max:255|nullable',
+            'transactions.*.recurrence_id'         => 'min:1|max:255|nullable',
+            'transactions.*.bunq_payment_id'       => 'min:1|max:255|nullable',
+            'transactions.*.external_url'          => 'min:1|max:255|nullable|url',
 
             // SEPA fields:
-            'transactions.*.sepa_cc'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_op'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_id'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_db'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_country'          => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ep'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ci'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_batch_id'         => 'min:1,max:255|nullable',
+            'transactions.*.sepa_cc'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'            => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'            => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'          => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'         => 'min:1|max:255|nullable',
 
             // dates
             'transactions.*.interest_date'         => 'date|nullable',
@@ -270,7 +270,9 @@ class StoreRequest extends FormRequest
                 $this->validateTransactionArray($validator);
 
                 // must submit at least one transaction.
+                Log::debug('Now going to validateOneTransaction');
                 $this->validateOneTransaction($validator);
+                Log::debug('Now done with validateOneTransaction');
 
                 // all journals must have a description
                 $this->validateDescriptions($validator);

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
@@ -61,6 +62,7 @@ class UpdateRequest extends FormRequest
      */
     public function getAll(): array
     {
+
         Log::debug(sprintf('Now in %s', __METHOD__));
         $this->integerFields = [
             'order',
@@ -163,6 +165,9 @@ class UpdateRequest extends FormRequest
 
         /** @var array $transaction */
         foreach ($this->get('transactions') as $transaction) {
+            if(!is_array($transaction)) {
+                throw new FireflyException('Invalid data submitted: transaction is not array.');
+            }
             // default response is to update nothing in the transaction:
             $current  = [];
             $current  = $this->getIntegerData($current, $transaction);
@@ -330,9 +335,9 @@ class UpdateRequest extends FormRequest
 
             // currency info
             'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'          => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:51|exists:transaction_currencies,code',
 
             // amount
             'transactions.*.amount'                 => 'numeric|gt:0|max:100000000000',
@@ -359,25 +364,25 @@ class UpdateRequest extends FormRequest
 
             // other interesting fields
             'transactions.*.reconciled'             => [new IsBoolean()],
-            'transactions.*.notes'                  => 'min:1,max:50000|nullable',
+            'transactions.*.notes'                  => 'min:1|max:50000|nullable',
             'transactions.*.tags'                   => 'between:0,255',
 
             // meta info fields
-            'transactions.*.internal_reference'     => 'min:1,max:255|nullable',
-            'transactions.*.external_id'            => 'min:1,max:255|nullable',
-            'transactions.*.recurrence_id'          => 'min:1,max:255|nullable',
-            'transactions.*.bunq_payment_id'        => 'min:1,max:255|nullable',
-            'transactions.*.external_url'           => 'min:1,max:255|nullable|url',
+            'transactions.*.internal_reference'     => 'min:1|max:255|nullable',
+            'transactions.*.external_id'            => 'min:1|max:255|nullable',
+            'transactions.*.recurrence_id'          => 'min:1|max:255|nullable',
+            'transactions.*.bunq_payment_id'        => 'min:1|max:255|nullable',
+            'transactions.*.external_url'           => 'min:1|max:255|nullable|url',
 
             // SEPA fields:
-            'transactions.*.sepa_cc'                => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_op'             => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_id'             => 'min:1,max:255|nullable',
-            'transactions.*.sepa_db'                => 'min:1,max:255|nullable',
-            'transactions.*.sepa_country'           => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ep'                => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ci'                => 'min:1,max:255|nullable',
-            'transactions.*.sepa_batch_id'          => 'min:1,max:255|nullable',
+            'transactions.*.sepa_cc'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'             => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'           => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'                => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'          => 'min:1|max:255|nullable',
 
             // dates
             'transactions.*.interest_date'          => 'date|nullable',
@@ -398,6 +403,7 @@ class UpdateRequest extends FormRequest
      */
     public function withValidator(Validator $validator): void
     {
+        Log::debug('Now in withValidator');
         /** @var TransactionGroup $transactionGroup */
         $transactionGroup = $this->route()->parameter('transactionGroup');
         $validator->after(

app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php

@@ -75,7 +75,7 @@ class StoreRequest extends FormRequest
             'name'           => 'required|between:1,255|unique:transaction_currencies,name',
             'code'           => 'required|between:3,51|unique:transaction_currencies,code',
             'symbol'         => 'required|between:1,51|unique:transaction_currencies,symbol',
-            'decimal_places' => 'between:0,20|numeric|min:0|max:20',
+            'decimal_places' => 'between:0,20|numeric|min:0|max:12',
             'enabled'        => [new IsBoolean()],
             'default'        => [new IsBoolean()],
 

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -74,7 +74,7 @@ class UpdateRequest extends FormRequest
             'name'           => sprintf('between:1,255|unique:transaction_currencies,name,%d', $currency->id),
             'code'           => sprintf('between:3,51|unique:transaction_currencies,code,%d', $currency->id),
             'symbol'         => sprintf('between:1,51|unique:transaction_currencies,symbol,%d', $currency->id),
-            'decimal_places' => 'between:0,20|numeric|min:0|max:20',
+            'decimal_places' => 'between:0,20|numeric|min:0|max:12',
             'enabled'        => [new IsBoolean()],
             'default'        => [new IsBoolean()],
         ];

app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php

@@ -59,9 +59,9 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name'    => 'required|unique:link_types,name|min:1',
-            'outward' => 'required|unique:link_types,outward|min:1|different:inward',
-            'inward'  => 'required|unique:link_types,inward|min:1|different:outward',
+            'name'    => 'required|unique:link_types,name|min:1|max:1024',
+            'outward' => 'required|unique:link_types,outward|min:1|different:inward|max:1024',
+            'inward'  => 'required|unique:link_types,inward|min:1|different:outward|max:1024',
         ];
     }
 }

app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php

@@ -64,9 +64,9 @@ class UpdateRequest extends FormRequest
         $linkType = $this->route()->parameter('linkType');
 
         return [
-            'name'    => [Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'],
-            'outward' => ['different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'],
-            'inward'  => ['different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'],
+            'name'    => [Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1','max:1024'],
+            'outward' => ['different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1','max:1024'],
+            'inward'  => ['different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1','max:1024'],
         ];
     }
 }

app/Console/Commands/Correction/CorrectAmounts.php

@@ -0,0 +1,263 @@
+<?php
+/*
+ * CorrectAmounts.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\AutoBudget;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\RecurrenceTransaction;
+use FireflyIII\Models\RuleTrigger;
+use Illuminate\Console\Command;
+
+/**
+ * Class ReportSkeleton
+ */
+class CorrectAmounts extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command makes sure positive and negative amounts are recorded correctly.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-amount-pos-neg';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        // auto budgets must be positive
+        $this->fixAutoBudgets();
+        // available budgets must be positive
+        $this->fixAvailableBudgets();
+        // bills must be positive (both amounts)
+        $this->fixBills();
+        // budget limits must be positive
+        $this->fixBudgetLimits();
+        // currency_exchange_rates must be positive
+        $this->fixExchangeRates();
+        // piggy_bank_repetitions must be positive
+        $this->fixRepetitions();
+        // piggy_banks must be positive
+        $this->fixPiggyBanks();
+        // recurrences_transactions amount must be positive
+        $this->fixRecurrences();
+        // rule_triggers must be positive or zero (amount_less, amount_more, amount_is)
+        $this->fixRuleTriggers();
+
+
+        return 0;
+    }
+
+    /**
+     * @return void
+     */
+    private function fixAutoBudgets(): void
+    {
+        $set   = AutoBudget::where('amount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All auto budget amounts are positive.');
+            return;
+        }
+        /** @var AutoBudget $item */
+        foreach ($set as $item) {
+            $item->amount = app('steam')->positive((string)$item->amount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d auto budget amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixAvailableBudgets(): void
+    {
+        $set   = AvailableBudget::where('amount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All available budget amounts are positive.');
+            return;
+        }
+        /** @var AvailableBudget $item */
+        foreach ($set as $item) {
+            $item->amount = app('steam')->positive((string)$item->amount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d available budget amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixBills(): void
+    {
+        $set   = Bill::where('amount_min', '<', 0)->orWhere('amount_max', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All bill amounts are positive.');
+            return;
+        }
+        /** @var Bill $item */
+        foreach ($set as $item) {
+            $item->amount_min = app('steam')->positive((string)$item->amount_min);
+            $item->amount_max = app('steam')->positive((string)$item->amount_max);
+            $item->save();
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function fixBudgetLimits(): void
+    {
+        $set   = BudgetLimit::where('amount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All budget limit amounts are positive.');
+            return;
+        }
+        /** @var BudgetLimit $item */
+        foreach ($set as $item) {
+            $item->amount = app('steam')->positive((string)$item->amount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d budget limit amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixExchangeRates(): void
+    {
+        $set   = CurrencyExchangeRate::where('rate', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All currency exchange rates are positive.');
+            return;
+        }
+        /** @var BudgetLimit $item */
+        foreach ($set as $item) {
+            $item->rate = app('steam')->positive((string)$item->rate);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d currency exchange rate(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixRepetitions(): void
+    {
+        $set   = PiggyBankRepetition::where('currentamount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All piggy bank repetition amounts are positive.');
+            return;
+        }
+        /** @var PiggyBankRepetition $item */
+        foreach ($set as $item) {
+            $item->currentamount = app('steam')->positive((string)$item->currentamount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixPiggyBanks(): void
+    {
+        $set   = PiggyBank::where('targetamount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All piggy bank amounts are positive.');
+            return;
+        }
+        /** @var PiggyBankRepetition $item */
+        foreach ($set as $item) {
+            $item->targetamount = app('steam')->positive((string)$item->targetamount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d piggy bank amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixRecurrences(): void
+    {
+        $set   = RecurrenceTransaction::where('amount', '<', 0)
+                                      ->orWhere('foreign_amount', '<', 0)
+                                      ->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->info('Correct: All recurring transaction amounts are positive.');
+            return;
+        }
+        /** @var PiggyBankRepetition $item */
+        foreach ($set as $item) {
+            $item->amount         = app('steam')->positive((string)$item->amount);
+            $item->foreign_amount = app('steam')->positive((string)$item->foreign_amount);
+            $item->save();
+        }
+        $this->line(sprintf('Corrected %d recurring transaction amount(s).', $count));
+    }
+
+    /**
+     * @return void
+     */
+    private function fixRuleTriggers(): void
+    {
+        $set   = RuleTrigger::whereIn('trigger_type', ['amount_less', 'amount_more', 'amount_is'])->get();
+        $fixed = 0;
+        /** @var RuleTrigger $item */
+        foreach ($set as $item) {
+            // basic check:
+            if (-1 === bccomp((string)$item->trigger_value, '0')) {
+                $fixed++;
+                $item->trigger_value = app('steam')->positive((string)$item->trigger_value);
+                $item->save();
+            }
+        }
+        if (0 === $fixed) {
+            $this->info('Correct: All rule trigger amounts are positive.');
+            return;
+        }
+        $this->line(sprintf('Corrected %d rule trigger amount(s).', $fixed));
+    }
+
+}

app/Console/Commands/Correction/CorrectDatabase.php

@@ -52,8 +52,10 @@ class CorrectDatabase extends Command
      */
     public function handle(): int
     {
+        $this->line('Handle Firefly III database correction commands.');
         // if table does not exist, return false
         if (!Schema::hasTable('users')) {
+            $this->error('No "users"-table, will not continue.');
             return 1;
         }
         $commands = [
@@ -61,7 +63,7 @@ class CorrectDatabase extends Command
             'firefly-iii:create-link-types',
             'firefly-iii:create-access-tokens',
             'firefly-iii:remove-bills',
-            'firefly-iii:fix-negative-limits',
+            'firefly-iii:fix-amount-pos-neg',
             'firefly-iii:enable-currencies',
             'firefly-iii:fix-transfer-budgets',
             'firefly-iii:fix-uneven-amount',
@@ -76,16 +78,16 @@ class CorrectDatabase extends Command
             'firefly-iii:fix-ob-currencies',
             'firefly-iii:fix-long-descriptions',
             'firefly-iii:fix-recurring-transactions',
-            'firefly-iii:restore-oauth-keys',
             'firefly-iii:upgrade-group-information',
             'firefly-iii:fix-transaction-types',
             'firefly-iii:fix-frontpage-accounts',
+            // new!
+            'firefly-iii:unify-group-accounts',
+            'firefly-iii:trigger-credit-recalculation'
         ];
         foreach ($commands as $command) {
-            $this->line(sprintf('Now executing %s', $command));
-            Artisan::call($command);
-            $result = Artisan::output();
-            echo $result;
+            $this->line(sprintf('Now executing command "%s"', $command));
+            $this->call($command);
         }
 
         return 0;

app/Console/Commands/Correction/FixBudgetLimits.php

@@ -1,67 +0,0 @@
-<?php
-
-/*
- * FixBudgetLimits.php
- * Copyright (c) 2022 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Console\Commands\Correction;
-
-use DB;
-use FireflyIII\Models\BudgetLimit;
-use Illuminate\Console\Command;
-
-/**
- * Class CorrectionSkeleton
- */
-class FixBudgetLimits extends Command
-{
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fixes negative budget limits';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'firefly-iii:fix-negative-limits';
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle(): int
-    {
-        $set = BudgetLimit::where('amount', '<', '0')->get();
-        if (0 === $set->count()) {
-            $this->info('All budget limits are OK.');
-            return 0;
-        }
-        $count = BudgetLimit::where('amount', '<', '0')->update(['amount' => DB::raw('amount * -1')]);
-
-        $this->info(sprintf('Fixed %d budget limit(s)', $count));
-
-        return 0;
-    }
-}

app/Console/Commands/Correction/FixIbans.php

@@ -25,7 +25,9 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 
 /**
  * Class FixIbans
@@ -53,6 +55,52 @@ class FixIbans extends Command
     public function handle(): int
     {
         $accounts = Account::whereNotNull('iban')->get();
+        $this->filterIbans($accounts);
+        $this->countAndCorrectIbans($accounts);
+
+        return 0;
+    }
+
+    /**
+     * @param  Collection  $accounts
+     * @return void
+     */
+    private function countAndCorrectIbans(Collection $accounts): void
+    {
+        $set = [];
+        /** @var Account $account */
+        foreach($accounts as $account) {
+            $userId = (int)$account->user_id;
+            $set[$userId] = $set[$userId] ?? [];
+            $iban = (string)$account->iban;
+            $type = $account->accountType->type;
+            if(in_array($type, [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
+                $type = 'liabilities';
+            }
+            if(array_key_exists($iban, $set[$userId])) {
+                // iban already in use! two exceptions exist:
+                if(
+                    !(AccountType::EXPENSE === $set[$userId][$iban] && AccountType::REVENUE === $type) && // allowed combination
+                    !(AccountType::REVENUE === $set[$userId][$iban] && AccountType::EXPENSE === $type) // also allowed combination.
+                ) {
+                    $this->line(sprintf('IBAN "%s" is used more than once and will be removed from %s #%d ("%s")', $iban, $account->accountType->type, $account->id, $account->name));
+                    $account->iban = null;
+                    $account->save();
+                }
+            }
+
+            if(!array_key_exists($iban, $set[$userId])) {
+                $set[$userId][$iban] = $type;
+            }
+        }
+    }
+
+    /**
+     * @param  Collection  $accounts
+     * @return void
+     */
+    private function filterIbans(Collection $accounts): void
+    {
         /** @var Account $account */
         foreach ($accounts as $account) {
             $iban = $account->iban;
@@ -65,7 +113,5 @@ class FixIbans extends Command
                 }
             }
         }
-
-        return 0;
     }
 }

app/Console/Commands/Integrity/ReportIntegrity.php

@@ -57,14 +57,15 @@ class ReportIntegrity extends Command
             return 1;
         }
         $commands = [
+            'firefly-iii:create-group-memberships',
             'firefly-iii:report-empty-objects',
             'firefly-iii:report-sum',
+            'firefly-iii:restore-oauth-keys',
+            'firefly-iii:upgrade-group-information'
         ];
         foreach ($commands as $command) {
             $this->line(sprintf('Now executing %s', $command));
-            Artisan::call($command);
-            $result = Artisan::output();
-            echo $result;
+            $this->call($command);
         }
 
         return 0;

app/Console/Commands/System/CreateDatabase.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * CreateDatabase.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 use PDO;

app/Console/Commands/System/CreateFirstUser.php

@@ -2,7 +2,7 @@
 
 /*
  * CreateFirstUser.php
- * Copyright (c) 2021 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;

app/Console/Commands/System/ForceDecimalSize.php

@@ -0,0 +1,107 @@
+<?php
+/*
+ * ForceDecimalSize.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\VerifiesAccessToken;
+use FireflyIII\Exceptions\FireflyException;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class ForceDecimalSize extends Command
+{
+    use VerifiesAccessToken;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:force-decimal-size
+                                {--user=1 : The user ID.}
+                            {--token= : The user\'s access token.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL.';
+
+    /**
+     * Execute the console command.
+     * @throws FireflyException
+     */
+    public function handle(): int
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return 1;
+        }
+
+        $this->error('Running this command is dangerous and can cause data loss.');
+        $this->error('Please do not continue.');
+        $question = $this->confirm('Do you want to continue?');
+        if (true === $question) {
+            $user = $this->getUser();
+            Log::channel('audit')->info(sprintf('User #%d ("%s") forced DECIMAL size.', $user->id, $user->email));
+            $this->updateDecimals();
+            return 0;
+        }
+        $this->line('Done!');
+        return 0;
+    }
+
+    private function updateDecimals(): void
+    {
+        $this->info('Going to force the size of DECIMAL columns. Please hold.');
+        $tables = [
+            'accounts'                 => ['virtual_balance'],
+            'auto_budgets'             => ['amount'],
+            'available_budgets'        => ['amount'],
+            'bills'                    => ['amount_min', 'amount_max'],
+            'budget_limits'            => ['amount'],
+            'currency_exchange_rates'  => ['rate', 'user_rate'],
+            'limit_repetitions'        => ['amount'],
+            'piggy_bank_events'        => ['amount'],
+            'piggy_bank_repetitions'   => ['currentamount'],
+            'piggy_banks'              => ['targetamount'],
+            'recurrences_transactions' => ['amount', 'foreign_amount'],
+            'transactions'             => ['amount', 'foreign_amount'],
+        ];
+        /**
+         * @var string $name
+         * @var array $fields
+         */
+        foreach($tables as $name => $fields) {
+            /** @var string $field */
+            foreach($fields as $field) {
+                $this->line(sprintf('Updating table "%s", field "%s"...', $name, $field));
+                $query = sprintf('ALTER TABLE %s CHANGE COLUMN %s %s DECIMAL(32, 12);', $name, $field, $field);
+                DB::select($query);
+                sleep(1);
+            }
+        }
+    }
+}

app/Console/Commands/System/ForceMigration.php

@@ -0,0 +1,95 @@
+<?php
+/*
+ * ForceMigration.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\VerifiesAccessToken;
+use FireflyIII\Exceptions\FireflyException;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+class ForceMigration extends Command
+{
+    use VerifiesAccessToken;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:force-migrations
+                            {--user=1 : The user ID.}
+                            {--token= : The user\'s access token.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will force-run all database migrations.';
+
+    /**
+     * Execute the console command.
+     * @throws FireflyException
+     */
+    public function handle(): int
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return 1;
+        }
+
+        $this->error('Running this command is dangerous and can cause data loss.');
+        $this->error('Please do not continue.');
+        $question = $this->confirm('Do you want to continue?');
+        if (true === $question) {
+            $user = $this->getUser();
+            Log::channel('audit')->info(sprintf('User #%d ("%s") forced migrations.', $user->id, $user->email));
+            $this->forceMigration();
+            return 0;
+        }
+        return 0;
+    }
+
+    private function forceMigration(): void
+    {
+        DB::commit();
+        $this->line('Dropping "migrations" table...');
+        sleep(2);
+        Schema::dropIfExists('migrations');
+        $this->line('Done!');
+        $this->line('Re-run all migrations...');
+        Artisan::call('migrate', ['--seed' => true]);
+        sleep(2);
+        $this->line('');
+        $this->info('Done!');
+        $this->line('There is a good chance you just saw a lot of error messages.');
+        $this->line('No need to panic yet. First try to access Firefly III (again).');
+        $this->line('The issue, whatever it was, may have been solved now.');
+        $this->line('');
+    }
+}

app/Console/Commands/System/ScanAttachments.php

@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * ScanAttachments.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use Crypt;
 use FireflyIII\Models\Attachment;
@@ -42,7 +42,7 @@ class ScanAttachments extends Command
      *
      * @var string
      */
-    protected $description = 'Rescan all attachments and re-set the MD5 hash and mime.';
+    protected $description = 'Rescan all attachments and re-set the correct MD5 hash and mime.';
 
     /**
      * The name and signature of the console command.

app/Console/Commands/System/SetLatestVersion.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * SetLatestVersion.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 

app/Console/Commands/System/UpgradeFireflyInstructions.php

@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * UpgradeFireflyInstructions.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,11 +21,13 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Console\Command;
 
+use function FireflyIII\Console\Commands\str_starts_with;
+
 /**
  * Class UpgradeFireflyInstructions.
  *
@@ -75,14 +77,15 @@ class UpgradeFireflyInstructions extends Command
         $text    = '';
         foreach (array_keys($config) as $compare) {
             // if string starts with:
-            if (str_starts_with($version, $compare)) {
+            if (\str_starts_with($version, $compare)) {
                 $text = $config[$compare];
             }
+
         }
 
         $this->showLine();
         $this->boxed('');
-        if (null === $text) {
+        if (null === $text || '' === $text) {
             $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
             $this->boxedInfo('There are no extra upgrade instructions.');
             $this->boxed('Firefly III should be ready for use.');
@@ -146,13 +149,13 @@ class UpgradeFireflyInstructions extends Command
         $text    = '';
         foreach (array_keys($config) as $compare) {
             // if string starts with:
-            if (str_starts_with($version, $compare)) {
+            if (\str_starts_with($version, $compare)) {
                 $text = $config[$compare];
             }
         }
         $this->showLine();
         $this->boxed('');
-        if (null === $text) {
+        if (null === $text || '' === $text) {
             $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -2,7 +2,7 @@
 
 /*
  * VerifySecurityAlerts.php
- * Copyright (c) 2021 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,12 +22,12 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
-use League\Flysystem\FilesystemException;
 use Illuminate\Support\Facades\Log;
+use League\Flysystem\FilesystemException;
 use Storage;
 
 /**

app/Console/Commands/Upgrade/DecryptDatabase.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * DecryptDatabase.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands;
+namespace FireflyIII\Console\Commands\Upgrade;
 
 use Crypt;
 use DB;
@@ -30,8 +30,8 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Preference;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
-use JsonException;
 use Illuminate\Support\Facades\Log;
+use JsonException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use stdClass;

app/Console/Commands/Upgrade/FixPostgresSequences.php

@@ -2,7 +2,7 @@
 
 /*
  * FixPostgresSequences.php
- * Copyright (c) 2021 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands\Correction;
+namespace FireflyIII\Console\Commands\Upgrade;
 
 use DB;
 use Illuminate\Console\Command;
@@ -76,10 +76,8 @@ class FixPostgresSequences extends Command
             'category_transaction_journal',
             'configuration',
             'currency_exchange_rates',
-            'export_jobs',
             'failed_jobs',
             'group_journals',
-            'import_jobs',
             'jobs',
             'journal_links',
             'journal_meta',

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -57,7 +57,6 @@ class UpgradeDatabase extends Command
     {
         $this->callInitialCommands();
         $commands = [
-            // there are 14 upgrade commands.
             'firefly-iii:transaction-identifiers',
             'firefly-iii:migrate-to-groups',
             'firefly-iii:account-currencies',
@@ -75,41 +74,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:migrate-recurrence-type',
             'firefly-iii:upgrade-liabilities',
             'firefly-iii:liabilities-600',
-
-            // there are 16 verify commands.
-            'firefly-iii:fix-piggies',
-            'firefly-iii:create-link-types',
-            'firefly-iii:create-access-tokens',
-            'firefly-iii:remove-bills',
-            'firefly-iii:fix-negative-limits',
-            'firefly-iii:enable-currencies',
-            'firefly-iii:fix-transfer-budgets',
-            'firefly-iii:fix-uneven-amount',
-            'firefly-iii:delete-zero-amount',
-            'firefly-iii:delete-orphaned-transactions',
-            'firefly-iii:delete-empty-journals',
-            'firefly-iii:delete-empty-groups',
-            'firefly-iii:fix-account-types',
-            'firefly-iii:fix-account-order',
-            'firefly-iii:rename-meta-fields',
-            'firefly-iii:fix-ob-currencies',
-            'firefly-iii:fix-long-descriptions',
-            'firefly-iii:fix-recurring-transactions',
-            'firefly-iii:unify-group-accounts',
-            'firefly-iii:fix-transaction-types',
-            'firefly-iii:fix-frontpage-accounts',
-            'firefly-iii:fix-ibans',
-            'firefly-iii:create-group-memberships',
-            'firefly-iii:upgrade-group-information',
-
-            // two report commands
-            'firefly-iii:report-empty-objects',
-            'firefly-iii:report-sum',
-            'firefly-iii:restore-oauth-keys',
-
-            // instructions
-            'firefly:instructions update',
-            'firefly-iii:verify-security-alerts',
+            'firefly-iii:budget-limit-periods',
         ];
         $args     = [];
         if ($this->option('force')) {
@@ -117,9 +82,7 @@ class UpgradeDatabase extends Command
         }
         foreach ($commands as $command) {
             $this->line(sprintf('Now executing %s', $command));
-            Artisan::call($command, $args);
-            $result = Artisan::output();
-            echo $result;
+            $this->call($command, $args);
         }
         // set new DB version.
         app('fireflyconfig')->set('db_version', (int)config('firefly.db_version'));
@@ -129,22 +92,19 @@ class UpgradeDatabase extends Command
         return 0;
     }
 
+    /**
+     * @return void
+     */
     private function callInitialCommands(): void
     {
         $this->line('Now seeding the database...');
-        Artisan::call('migrate', ['--seed' => true, '--force' => true]);
-        $result = Artisan::output();
-        echo $result;
+        $this->call('migrate', ['--seed' => true, '--force' => true,'--no-interaction' => true]);
 
         $this->line('Fix PostgreSQL sequences.');
-        Artisan::call('firefly-iii:fix-pgsql-sequences');
-        $result = Artisan::output();
-        echo $result;
+        $this->call('firefly-iii:fix-pgsql-sequences');
 
         $this->line('Now decrypting the database (if necessary)...');
-        Artisan::call('firefly-iii:decrypt-all');
-        $result = Artisan::output();
-        echo $result;
+        $this->call('firefly-iii:decrypt-all');
 
         $this->line('Done!');
     }

app/Events/Model/BudgetLimit/Created.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * Created.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Events\Model\BudgetLimit;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class Created
+ */
+class Created extends Event
+{
+    use SerializesModels;
+
+    public BudgetLimit $budgetLimit;
+
+    /**
+     * @param  BudgetLimit  $budgetLimit
+     */
+    public function __construct(BudgetLimit $budgetLimit)
+    {
+        $this->budgetLimit = $budgetLimit;
+    }
+}

app/Events/Model/BudgetLimit/Deleted.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * Created.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Events\Model\BudgetLimit;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class Deleted
+ */
+class Deleted extends Event
+{
+    use SerializesModels;
+
+    public BudgetLimit $budgetLimit;
+
+    /**
+     * @param  BudgetLimit  $budgetLimit
+     */
+    public function __construct(BudgetLimit $budgetLimit)
+    {
+        $this->budgetLimit = $budgetLimit;
+    }
+}

app/Events/Model/BudgetLimit/Updated.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * Created.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Events\Model\BudgetLimit;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class Updated
+ */
+class Updated extends Event
+{
+    use SerializesModels;
+
+    public BudgetLimit $budgetLimit;
+
+    /**
+     * @param  BudgetLimit  $budgetLimit
+     */
+    public function __construct(BudgetLimit $budgetLimit)
+    {
+        $this->budgetLimit = $budgetLimit;
+    }
+}

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -122,7 +122,7 @@ class ChartJsGenerator implements GeneratorInterface
 
         foreach ($data as $set) {
             $currentSet = [
-                'label' => $set['label'],
+                'label' => $set['label'] ?? '(no label)',
                 'type'  => $set['type'] ?? 'line',
                 'data'  => array_values($set['entries']),
             ];

app/Handlers/Events/Model/BudgetLimitHandler.php

@@ -0,0 +1,218 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * BudgetLimitHandler.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Handlers\Events\Model;
+
+use FireflyIII\Events\Model\BudgetLimit\Created;
+use FireflyIII\Events\Model\BudgetLimit\Deleted;
+use FireflyIII\Events\Model\BudgetLimit\Updated;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use Illuminate\Support\Facades\Log;
+use Spatie\Period\Boundaries;
+use Spatie\Period\Period;
+use Spatie\Period\Precision;
+
+/**
+ * Class BudgetLimitHandler
+ */
+class BudgetLimitHandler
+{
+    /**
+     * @param  Created  $event
+     * @return void
+     */
+    public function created(Created $event): void
+    {
+        Log::debug(sprintf('BudgetLimitHandler::created(%s)', $event->budgetLimit->id));
+        $this->updateAvailableBudget($event->budgetLimit);
+    }
+
+    /**
+     * @param  Updated  $event
+     * @return void
+     */
+    public function updated(Updated $event): void
+    {
+        Log::debug(sprintf('BudgetLimitHandler::updated(%s)', $event->budgetLimit->id));
+        $this->updateAvailableBudget($event->budgetLimit);
+    }
+
+    /**
+     * @param  Deleted  $event
+     * @return void
+     */
+    public function deleted(Deleted $event): void
+    {
+        Log::debug(sprintf('BudgetLimitHandler::deleted(%s)', $event->budgetLimit->id));
+        $this->updateAvailableBudget($event->budgetLimit);
+    }
+
+    /**
+     * @param  AvailableBudget  $availableBudget
+     * @return void
+     */
+    private function calculateAmount(AvailableBudget $availableBudget): void
+    {
+        $repository = app(BudgetLimitRepositoryInterface::class);
+        $repository->setUser($availableBudget->user);
+        $newAmount = '0';
+        $abPeriod  = Period::make($availableBudget->start_date, $availableBudget->end_date, Precision::DAY());
+        Log::debug(
+            sprintf(
+                'Now at AB #%d, ("%s" to "%s")',
+                $availableBudget->id,
+                $availableBudget->start_date->format('Y-m-d'),
+                $availableBudget->end_date->format('Y-m-d')
+            )
+        );
+        // have to recalc everything just in case.
+        $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);
+        Log::debug(sprintf('Found %d interesting budget limit(s).', $set->count()));
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($set as $budgetLimit) {
+            Log::debug(
+                sprintf(
+                    'Found interesting budget limit #%d ("%s" to "%s")',
+                    $budgetLimit->id,
+                    $budgetLimit->start_date->format('Y-m-d'),
+                    $budgetLimit->end_date->format('Y-m-d')
+                )
+            );
+            // overlap in days:
+            $limitPeriod = Period::make(
+                $budgetLimit->start_date,
+                $budgetLimit->end_date,
+                precision: Precision::DAY(),
+                boundaries: Boundaries::EXCLUDE_NONE()
+            );
+            // if both equal eachother, amount from this BL must be added to the AB
+            if ($limitPeriod->equals($abPeriod)) {
+                $newAmount = bcadd($newAmount, $budgetLimit->amount);
+            }
+            // if budget limit period inside AB period, can be added in full.
+            if (!$limitPeriod->equals($abPeriod) && $abPeriod->contains($limitPeriod)) {
+                $newAmount = bcadd($newAmount, $budgetLimit->amount);
+            }
+            if (!$limitPeriod->equals($abPeriod) && $abPeriod->overlapsWith($limitPeriod)) {
+                $overlap = $abPeriod->overlap($limitPeriod);
+                if (null !== $overlap) {
+                    $length    = $overlap->length();
+                    $daily     = bcmul($this->getDailyAmount($budgetLimit), (string)$length);
+                    $newAmount = bcadd($newAmount, $daily);
+                }
+            }
+        }
+        Log::debug(sprintf('Concluded new amount for this AB must be %s', $newAmount));
+        $availableBudget->amount = $newAmount;
+        $availableBudget->save();
+    }
+
+    /**
+     * @param  BudgetLimit  $budgetLimit
+     * @return string
+     */
+    private function getDailyAmount(BudgetLimit $budgetLimit): string
+    {
+        $limitPeriod = Period::make(
+            $budgetLimit->start_date,
+            $budgetLimit->end_date,
+            precision: Precision::DAY(),
+            boundaries: Boundaries::EXCLUDE_NONE()
+        );
+        $days        = $limitPeriod->length();
+        $amount      = bcdiv((string)$budgetLimit->amount, (string)$days, 12);
+        Log::debug(
+            sprintf('Total amount for budget limit #%d is %s. Nr. of days is %d. Amount per day is %s', $budgetLimit->id, $budgetLimit->amount, $days, $amount)
+        );
+        return $amount;
+    }
+
+    /**
+     * @param  BudgetLimit  $budgetLimit
+     * @return void
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
+     */
+    private function updateAvailableBudget(BudgetLimit $budgetLimit): void
+    {
+        Log::debug(sprintf('Now in updateAvailableBudget(#%d)', $budgetLimit->id));
+
+        // based on the view range of the user (month week quarter etc) the budget limit could
+        // either overlap multiple available budget periods or be contained in a single one.
+        // all have to be created or updated.
+        $viewRange = app('preferences')->get('viewRange', '1M')->data;
+        $start     = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);
+        $end       = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);
+        $end       = app('navigation')->endOfPeriod($end, $viewRange);
+        $user      = $budgetLimit->budget->user;
+
+        // limit period in total is:
+        $limitPeriod = Period::make($start, $end, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());
+
+        // from the start until the end of the budget limit, need to loop!
+        $current = clone $start;
+        while ($current <= $end) {
+            $currentEnd = app('navigation')->endOfPeriod($current, $viewRange);
+
+            // create or find AB for this particular period, and set the amount accordingly.
+            /** @var AvailableBudget $availableBudget */
+            $availableBudget = $user->availableBudgets()->where('start_date', $current->format('Y-m-d'))->where(
+                'end_date',
+                $currentEnd->format('Y-m-d')
+            )->where('transaction_currency_id', $budgetLimit->transaction_currency_id)->first();
+            if (null !== $availableBudget) {
+                Log::debug('Found 1 AB, will update.');
+                $this->calculateAmount($availableBudget);
+            }
+            if (null === $availableBudget) {
+                // if not exists:
+                $currentPeriod = Period::make($current, $currentEnd, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());
+                $daily         = $this->getDailyAmount($budgetLimit);
+                $amount        = bcmul($daily, (string)$currentPeriod->length(), 12);
+
+                // no need to calculate if period is equal.
+                if ($currentPeriod->equals($limitPeriod)) {
+                    $amount = $budgetLimit->amount;
+                }
+                Log::debug(sprintf('Will create AB for period %s to %s', $current->format('Y-m-d'), $currentEnd->format('Y-m-d')));
+                $availableBudget = new AvailableBudget(
+                    [
+                        'user_id'                 => $budgetLimit->budget->user->id,
+                        'transaction_currency_id' => $budgetLimit->transaction_currency_id,
+                        'start_date'              => $current,
+                        'end_date'                => $currentEnd,
+                        'amount'                  => $amount,
+                    ]
+                );
+                $availableBudget->save();
+            }
+
+            // prep for next loop
+            $current = app('navigation')->addPeriod($current, $viewRange, 0);
+        }
+    }
+
+}

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -92,7 +92,8 @@ trait AttachmentCollection
                         ->where(
                             static function (EloquentBuilder $q1) {
                                 $q1->where('attachments.attachable_type', TransactionJournal::class);
-                                //$q1->where('attachments.uploaded', true);
+                                $q1->where('attachments.uploaded', true);
+                                $q1->whereNull('attachments.deleted_at');
                                 $q1->orWhereNull('attachments.attachable_type');
                             }
                         );

app/Helpers/Report/NetWorth.php

@@ -78,7 +78,7 @@ class NetWorth implements NetWorthInterface
 
         $netWorth = [];
         $result   = [];
-//        Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
+        //        Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
 
         // get default currency
         $default = app('amount')->getDefaultCurrencyByUser($this->user);
@@ -89,11 +89,11 @@ class NetWorth implements NetWorthInterface
         // get the preferred currency for this account
         /** @var Account $account */
         foreach ($accounts as $account) {
-//            Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
+            //            Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
             $currencyId = (int)$this->accountRepository->getMetaValue($account, 'currency_id');
             $currencyId = 0 === $currencyId ? $default->id : $currencyId;
 
-//            Log::debug(sprintf('Currency ID is #%d', $currencyId));
+            //            Log::debug(sprintf('Currency ID is #%d', $currencyId));
 
             // balance in array:
             $balance = $balances[$account->id] ?? '0';
@@ -106,13 +106,13 @@ class NetWorth implements NetWorthInterface
                 $balance = bcsub($balance, $virtualBalance);
             }
 
-//            Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
+            //            Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
 
             if (!array_key_exists($currencyId, $netWorth)) {
                 $netWorth[$currencyId] = '0';
             }
             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]);
-//            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
+            //            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
         }
         ksort($netWorth);
 

app/Helpers/Update/UpdateTrait.php

@@ -41,7 +41,6 @@ trait UpdateTrait
      * 'level' => 'info' / 'success' / 'error'
      *
      * @return array
-     * @throws FireflyException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -89,12 +89,13 @@ class BudgetLimitController extends Controller
         $collection   = $this->currencyRepos->get();
         $budgetLimits = $this->blRepository->getBudgetLimits($budget, $start, $end);
 
-        // remove already budgeted currencies:
+        // remove already budgeted currencies with the same date range
         $currencies = $collection->filter(
-            static function (TransactionCurrency $currency) use ($budgetLimits) {
-                /** @var AvailableBudget $budget */
-                foreach ($budgetLimits as $budget) {
-                    if ($budget->transaction_currency_id === $currency->id) {
+            static function (TransactionCurrency $currency) use ($budgetLimits, $start, $end) {
+                /** @var BudgetLimit $limit */
+                foreach ($budgetLimits as $limit) {
+                    if ($limit->transaction_currency_id === $currency->id && $limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)
+                    ) {
                         return false;
                     }
                 }

app/Http/Controllers/Budget/IndexController.php

@@ -40,9 +40,9 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use JsonException;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -101,12 +101,23 @@ class IndexController extends Controller
      */
     public function index(Request $request, Carbon $start = null, Carbon $end = null)
     {
-        Log::debug('Start of IndexController::index()');
+        Log::debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));
 
         // collect some basic vars:
-        $range           = app('navigation')->getViewRange(true);
-        $start           = $start ?? session('start', today(config('app.timezone'))->startOfMonth());
-        $end             = $end ?? app('navigation')->endOfPeriod($start, $range);
+        $range         = app('navigation')->getViewRange(true);
+        $isCustomRange = session('is_custom_range', false);
+        if (false === $isCustomRange) {
+            $start = $start ?? session('start', today(config('app.timezone'))->startOfMonth());
+            $end   = $end ?? app('navigation')->endOfPeriod($start, $range);
+        }
+
+        // overrule start and end if necessary:
+        if (true === $isCustomRange) {
+            $start = $start ?? session('start', today(config('app.timezone'))->startOfMonth());
+            $end   = $end ?? session('end', today(config('app.timezone'))->endOfMonth());
+        }
+
+
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $currencies      = $this->currencyRepository->get();
         $budgeted        = '0';

app/Http/Controllers/Controller.php

@@ -100,11 +100,12 @@ abstract class Controller extends BaseController
                 $this->monthFormat       = (string)trans('config.month_js', [], $locale);
                 $this->monthAndDayFormat = (string)trans('config.month_and_day_js', [], $locale);
                 $this->dateTimeFormat    = (string)trans('config.date_time_js', [], $locale);
-
+                $darkMode                = 'browser';
                 // get shown-intro-preference:
                 if (auth()->check()) {
                     $language  = app('steam')->getLanguage();
                     $locale    = app('steam')->getLocale();
+                    $darkMode  = app('preferences')->get('darkMode', 'browser')->data;
                     $page      = $this->getPageName();
                     $shownDemo = $this->hasSeenDemo();
                     app('view')->share('language', $language);
@@ -113,6 +114,7 @@ abstract class Controller extends BaseController
                     app('view')->share('current_route_name', $page);
                     app('view')->share('original_route_name', Route::currentRouteName());
                 }
+                app('view')->share('darkMode', $darkMode);
 
                 return $next($request);
             }

app/Http/Controllers/HomeController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
 use Exception;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
@@ -66,12 +67,24 @@ class HomeController extends Controller
      */
     public function dateRange(Request $request): JsonResponse
     {
-        $start         = new Carbon($request->get('start'));
-        $end           = new Carbon($request->get('end'));
+        try {
+            $stringStart = e((string)$request->get('start'));
+            $start  = Carbon::createFromFormat('Y-m-d', $stringStart);
+        } catch (InvalidFormatException $e) {
+            Log::error(sprintf('Start: could not parse date string "%s" so ignore it.', $stringStart));
+            $start = Carbon::now()->startOfMonth();
+        }
+        try {
+            $stringEnd = e((string)$request->get('end'));
+            $end    = Carbon::createFromFormat('Y-m-d', $stringEnd);
+        } catch (InvalidFormatException $e) {
+            Log::error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
+            $end = Carbon::now()->endOfMonth();
+        }
         $label         = $request->get('label');
         $isCustomRange = false;
 
-        Log::debug('Received dateRange', ['start' => $request->get('start'), 'end' => $request->get('end'), 'label' => $request->get('label')]);
+        Log::debug('Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
         // check if the label is "everything" or "Custom range" which will betray
         // a possible problem with the budgets.
         if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) {

app/Http/Controllers/Json/BudgetController.php

@@ -82,8 +82,10 @@ class BudgetController extends Controller
         $percentage      = '0';
 
         if (null !== $availableBudget) {
-            $available  = $availableBudget->amount;
-            $percentage = bcmul(bcdiv($budgeted, $available), '100');
+            $available = $availableBudget->amount;
+            if (0 !== bccomp($available, '0')) {
+                $percentage = bcmul(bcdiv($budgeted, $available), '100');
+            }
         }
 
         // if available, get the AB for this period + currency, so the bar can be redrawn.

app/Http/Controllers/PreferencesController.php

@@ -32,9 +32,9 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use JsonException;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -102,14 +102,15 @@ class PreferencesController extends Controller
         $languages          = config('firefly.languages');
         $locale             = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;
         $listPageSize       = app('preferences')->get('listPageSize', 50)->data;
+        $darkMode           = app('preferences')->get('darkMode', 'browser')->data;
         $slackUrl           = app('preferences')->get('slack_webhook_url', '')->data;
         $customFiscalYear   = app('preferences')->get('customFiscalYear', 0)->data;
         $fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
         $fiscalYearStart    = date('Y').'-'.$fiscalYearStartStr;
         $tjOptionalFields   = app('preferences')->get('transaction_journal_optional_fields', [])->data;
+        $availableDarkModes = config('firefly.available_dark_modes');
 
         // notification preferences (single value for each):
-
         $notifications = [];
         foreach (config('firefly.available_notifications') as $notification) {
             $notifications[$notification] = app('preferences')->get(sprintf('notification_%s', $notification), true)->data;
@@ -140,6 +141,8 @@ class PreferencesController extends Controller
                 'isDocker',
                 'frontPageAccounts',
                 'languages',
+                'darkMode',
+                'availableDarkModes',
                 'notifications',
                 'slackUrl',
                 'locales',
@@ -257,6 +260,12 @@ class PreferencesController extends Controller
         ];
         app('preferences')->set('transaction_journal_optional_fields', $optionalTj);
 
+        // dark mode
+        $darkMode = $request->get('darkMode') ?? 'browser';
+        if(in_array($darkMode, config('firefly.available_dark_modes'), true)) {
+            app('preferences')->set('darkMode', $darkMode);
+        }
+
         session()->flash('success', (string)trans('firefly.saved_preferences'));
         app('preferences')->mark();
 

app/Http/Controllers/Rule/SelectController.php

@@ -38,8 +38,8 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Collection;
-use Illuminate\View\View;
 use Illuminate\Support\Facades\Log;
+use Illuminate\View\View;
 use Throwable;
 
 /**
@@ -150,9 +150,13 @@ class SelectController extends Controller
         }
 
         foreach ($textTriggers as $textTrigger) {
-            $trigger                = new RuleTrigger();
-            $trigger->trigger_type  = $textTrigger['type'];
-            $trigger->trigger_value = $textTrigger['value'];
+            $trigger                  = new RuleTrigger();
+            $trigger->trigger_type    = $textTrigger['type'];
+            $trigger->trigger_value   = $textTrigger['value'];
+            $trigger->stop_processing = $textTrigger['stop_processing'];
+            if ($textTrigger['prohibited']) {
+                $trigger->trigger_type = sprintf('-%s', $textTrigger['type']);
+            }
             $triggers->push($trigger);
         }
 

app/Http/Controllers/System/InstallController.php

@@ -33,9 +33,9 @@ use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use Laravel\Passport\Passport;
-use Illuminate\Support\Facades\Log;
 use phpseclib3\Crypt\RSA;
 
 /**
@@ -60,61 +60,15 @@ class InstallController extends Controller
     {
         // empty on purpose.
         $this->upgradeCommands = [
-            // there are 3 initial commands
-            'migrate'                                  => ['--seed' => true, '--force' => true],
-            'firefly-iii:fix-pgsql-sequences'          => [],
-            'firefly-iii:decrypt-all'                  => [],
-            'firefly-iii:restore-oauth-keys'           => [],
-            'generate-keys'                            => [], // an exception :(
-
-            // upgrade commands
-            'firefly-iii:transaction-identifiers'      => [],
-            'firefly-iii:migrate-to-groups'            => [],
-            'firefly-iii:account-currencies'           => [],
-            'firefly-iii:transfer-currencies'          => [],
-            'firefly-iii:other-currencies'             => [],
-            'firefly-iii:migrate-notes'                => [],
-            'firefly-iii:migrate-attachments'          => [],
-            'firefly-iii:bills-to-rules'               => [],
-            'firefly-iii:bl-currency'                  => [],
-            'firefly-iii:cc-liabilities'               => [],
-            'firefly-iii:back-to-journals'             => [],
-            'firefly-iii:rename-account-meta'          => [],
-            'firefly-iii:migrate-recurrence-meta'      => [],
-            'firefly-iii:migrate-tag-locations'        => [],
-            'firefly-iii:migrate-recurrence-type'      => [],
-            'firefly-iii:upgrade-liabilities'          => [],
-            'firefly-iii:liabilities-600'              => [],
-
-            // verify commands
-            'firefly-iii:fix-piggies'                  => [],
-            'firefly-iii:create-link-types'            => [],
-            'firefly-iii:create-access-tokens'         => [],
-            'firefly-iii:remove-bills'                 => [],
-            'firefly-iii:fix-negative-limits'          => [],
-            'firefly-iii:enable-currencies'            => [],
-            'firefly-iii:fix-transfer-budgets'         => [],
-            'firefly-iii:fix-uneven-amount'            => [],
-            'firefly-iii:delete-zero-amount'           => [],
-            'firefly-iii:delete-orphaned-transactions' => [],
-            'firefly-iii:delete-empty-journals'        => [],
-            'firefly-iii:delete-empty-groups'          => [],
-            'firefly-iii:fix-account-types'            => [],
-            'firefly-iii:fix-account-order'            => [],
-            'firefly-iii:rename-meta-fields'           => [],
-            'firefly-iii:fix-ob-currencies'            => [],
-            'firefly-iii:fix-long-descriptions'        => [],
-            'firefly-iii:fix-recurring-transactions'   => [],
-            'firefly-iii:unify-group-accounts'         => [],
-            'firefly-iii:fix-transaction-types'        => [],
-            'firefly-iii:fix-frontpage-accounts'       => [],
-            'firefly-iii:fix-ibans'                    => [],
-            'firefly-iii:create-group-memberships'     => [],
-            'firefly-iii:upgrade-group-information'    => [],
-
-            // final command to set the latest version in DB
-            'firefly-iii:set-latest-version'           => ['--james-is-cool' => true],
-            'firefly-iii:verify-security-alerts'       => [],
+            // there are 5 initial commands
+            // Check 4 places: InstallController, Docker image, UpgradeDatabase, composer.json
+            'migrate'                            => ['--seed' => true, '--force' => true],
+            'generate-keys'                      => [], // an exception :(
+            'firefly-iii:upgrade-database'       => [],
+            'firefly-iii:correct-database'       => [],
+            'firefly-iii:report-integrity'       => [],
+            'firefly-iii:set-latest-version'     => ['--james-is-cool' => true],
+            'firefly-iii:verify-security-alerts' => [],
         ];
 
         $this->lastError = '';
@@ -127,6 +81,7 @@ class InstallController extends Controller
      */
     public function index()
     {
+        app('view')->share('FF_VERSION', config('firefly.version'));
         // index will set FF3 version.
         app('fireflyconfig')->set('ff3_version', (string)config('firefly.version'));
 
@@ -147,27 +102,19 @@ class InstallController extends Controller
         $response     = [
             'hasNextCommand' => false,
             'done'           => true,
-            'next'           => 0,
             'previous'       => null,
             'error'          => false,
             'errorMessage'   => null,
         ];
 
         Log::debug(sprintf('Will now run commands. Request index is %d', $requestIndex));
-        $index = 0;
-        /**
-         * @var string $command
-         * @var array $args
-         */
-        foreach ($this->upgradeCommands as $command => $args) {
-            Log::debug(sprintf('Current command is "%s", index is %d', $command, $index));
-            if ($index < $requestIndex) {
-                Log::debug('Will not execute.');
-                $index++;
-                continue;
-            }
+        $indexes = array_values(array_keys($this->upgradeCommands));
+        if (array_key_exists($requestIndex, $indexes)) {
+            $command    = $indexes[$requestIndex];
+            $parameters = $this->upgradeCommands[$command];
+            Log::debug(sprintf('Will now execute command "%s" with parameters', $command), $parameters);
             try {
-                $result = $this->executeCommand($command, $args);
+                $result = $this->executeCommand($command, $parameters);
             } catch (FireflyException $e) {
                 Log::error($e->getMessage());
                 Log::error($e->getTraceAsString());
@@ -180,15 +127,11 @@ class InstallController extends Controller
             if (false === $result) {
                 $response['errorMessage'] = $this->lastError;
                 $response['error']        = true;
-
                 return response()->json($response);
             }
-            $index++;
-            $response['hasNextCommand'] = true;
+            $response['hasNextCommand'] = array_key_exists($requestIndex + 1, $indexes);
             $response['previous']       = $command;
         }
-        $response['next'] = $index;
-
         return response()->json($response);
     }
 

app/Http/Middleware/AcceptHeaders.php

@@ -45,8 +45,8 @@ class AcceptHeaders
     public function handle($request, $next): mixed
     {
         $method       = $request->getMethod();
-        $accepts      = ['application/x-www-form-urlencoded', 'application/json', 'application/vnd.api+json', '*/*'];
-        $contentTypes = ['application/x-www-form-urlencoded', 'application/json', 'application/vnd.api+json'];
+        $accepts      = ['application/x-www-form-urlencoded', 'application/json', 'application/vnd.api+json', 'application/octet-stream', '*/*'];
+        $contentTypes = ['application/x-www-form-urlencoded', 'application/json', 'application/vnd.api+json', 'application/octet-stream'];
         $submitted    = (string)$request->header('Content-Type');
 
 

app/Http/Middleware/Authenticate.php

@@ -87,13 +87,10 @@ class Authenticate
      */
     protected function authenticate($request, array $guards)
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
         if (0 === count($guards)) {
-            Log::debug('No guards present.');
             // go for default guard:
             /** @noinspection PhpUndefinedMethodInspection */
             if ($this->auth->check()) {
-                Log::debug('Default guard says user is authenticated.');
                 // do an extra check on user object.
                 /** @noinspection PhpUndefinedMethodInspection */
                 /** @var User $user */
@@ -104,18 +101,13 @@ class Authenticate
             /** @noinspection PhpUndefinedMethodInspection */
             return $this->auth->authenticate();
         }
-        Log::debug('Guard array is not empty.');
 
         foreach ($guards as $guard) {
-            Log::debug(sprintf('Now in guard loop, guard is "%s"', $guard));
             if ('api' !== $guard) {
-                Log::debug('Guard is "api", call authenticate()');
                 $this->auth->guard($guard)->authenticate();
             }
             $result = $this->auth->guard($guard)->check();
-            Log::debug(sprintf('Result is %s', var_export($result, true)));
             if ($result) {
-                Log::debug('Guard says user is authenticated.');
                 $user = $this->auth->guard($guard)->user();
                 $this->validateBlockedUser($user, $guards);
                 // According to PHPstan the method returns void, but we'll see.
@@ -134,7 +126,6 @@ class Authenticate
      */
     private function validateBlockedUser(?User $user, array $guards): void
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
         if (null === $user) {
             Log::warning('User is null, throw exception?');
         }

app/Http/Requests/AccountFormRequest.php

@@ -110,7 +110,7 @@ class AccountFormRequest extends FormRequest
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
         $rules          = [
             'administration_id'                  => 'min:1|max:16777216|numeric',
-            'name'                               => 'required|min:1|uniqueAccountForUser',
+            'name'                               => 'required|max:1024|min:1|uniqueAccountForUser',
             'opening_balance'                    => 'numeric|nullable|max:1000000000',
             'opening_balance_date'               => 'date|required_with:opening_balance|nullable',
             'iban'                               => ['iban', 'nullable', new UniqueIban(null, $this->convertString('objectType'))],
@@ -133,7 +133,7 @@ class AccountFormRequest extends FormRequest
         if (null !== $account) {
             // add rules:
             $rules['id']   = 'belongsToUser:accounts';
-            $rules['name'] = 'required|min:1|uniqueAccountForUser:'.$account->id;
+            $rules['name'] = 'required|max:1024|min:1|uniqueAccountForUser:'.$account->id;
             $rules['iban'] = ['iban', 'nullable', new UniqueIban($account, $account->accountType->type)];
         }
 

app/Http/Requests/BillUpdateRequest.php

@@ -81,6 +81,7 @@ class BillUpdateRequest extends FormRequest
             'repeat_freq'             => sprintf('required|in:%s', join(',', config('firefly.bill_periods'))),
             'skip'                    => 'required|integer|gte:0|lte:31',
             'active'                  => 'boolean',
+            'notes'                   => 'between:1,65536|nullable',
         ];
     }
 }

app/Http/Requests/LinkTypeFormRequest.php

@@ -43,7 +43,7 @@ class LinkTypeFormRequest extends FormRequest
     public function rules(): array
     {
         // fixed
-        $nameRule = 'required|min:1|unique:link_types,name';
+        $nameRule = 'required|max:255|min:1|unique:link_types,name';
         $idRule   = '';
 
         // get parameter link:
@@ -51,14 +51,14 @@ class LinkTypeFormRequest extends FormRequest
 
         if (null !== $link) {
             $idRule   = 'exists:link_types,id';
-            $nameRule = 'required|min:1';
+            $nameRule = 'required|max:255|min:1';
         }
 
         return [
             'id'      => $idRule,
             'name'    => $nameRule,
-            'inward'  => 'required|min:1|different:outward',
-            'outward' => 'required|min:1|different:inward',
+            'inward'  => 'required|max:255|min:1|different:outward',
+            'outward' => 'required|max:255|min:1|different:inward',
         ];
     }
 }

app/Http/Requests/MassEditJournalRequest.php

@@ -45,7 +45,7 @@ class MassEditJournalRequest extends FormRequest
         // fixed
 
         return [
-            'description.*'    => 'required|min:1,max:255',
+            'description.*'    => 'required|min:1|max:255',
             'source_id.*'      => 'numeric|belongsToUser:accounts,id',
             'destination_id.*' => 'numeric|belongsToUser:accounts,id',
             'journals.*'       => 'numeric|belongsToUser:transaction_journals,id',

app/Http/Requests/PiggyBankUpdateRequest.php

@@ -70,7 +70,7 @@ class PiggyBankUpdateRequest extends FormRequest
             'targetamount' => 'nullable|numeric|max:1000000000',
             'startdate'    => 'date',
             'targetdate'   => 'date|nullable',
-            'order'        => 'integer|min:1',
+            'order'        => 'integer|max:65536|min:1',
             'object_group' => 'min:0|max:255',
         ];
     }

app/Http/Requests/RuleFormRequest.php

@@ -157,9 +157,9 @@ class RuleFormRequest extends FormRequest
             'rule_group_id'    => 'required|belongsToUser:rule_groups',
             'trigger'          => 'required|in:store-journal,update-journal',
             'triggers.*.type'  => 'required|in:'.implode(',', $validTriggers),
-            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|min:1|ruleTriggerValue', $contextTriggers),
+            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
             'actions.*.type'   => 'required|in:'.implode(',', $validActions),
-            'actions.*.value'  => sprintf('required_if:actions.*.type,%s|min:0|max:255|ruleActionValue', $contextActions),
+            'actions.*.value'  => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions),
             'strict'           => 'in:0,1',
         ];
 

app/Http/Requests/TagFormRequest.php

@@ -66,17 +66,18 @@ class TagFormRequest extends FormRequest
 
         /** @var Tag $tag */
         $tag     = $this->route()->parameter('tag');
-        $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag';
+        $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag';
         if (null !== $tag) {
             $idRule  = 'belongsToUser:tags';
-            $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,'.$tag->id;
+            $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag,'.$tag->id;
         }
 
         $rules = [
             'tag'         => $tagRule,
             'id'          => $idRule,
-            'description' => 'min:1|nullable',
+            'description' => 'max:65536|min:1|nullable',
             'date'        => 'date|nullable',
+
         ];
 
         return Location::requestRules($rules);

app/Http/Requests/TestRuleFormRequest.php

@@ -49,8 +49,8 @@ class TestRuleFormRequest extends FormRequest
         $validTriggers = $this->getTriggers();
 
         return [
-            'rule-trigger.*'       => 'required|min:1|in:'.implode(',', $validTriggers),
-            'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue',
+            'rule-trigger.*'       => 'required|max:1024|min:1|in:'.implode(',', $validTriggers),
+            'rule-trigger-value.*' => 'required|max:1024|min:1|ruleTriggerValue',
         ];
     }
 }

app/Models/BudgetLimit.php

@@ -24,6 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use Eloquent;
+use FireflyIII\Events\Model\BudgetLimit\Created;
+use FireflyIII\Events\Model\BudgetLimit\Deleted;
+use FireflyIII\Events\Model\BudgetLimit\Updated;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -81,6 +84,12 @@ class BudgetLimit extends Model
     /** @var array Fields that can be filled */
     protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
 
+    protected $dispatchesEvents = [
+        'created' => Created::class,
+        'updated' => Updated::class,
+        'deleted' => Deleted::class,
+    ];
+
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).
      *

app/Models/UserGroup.php

@@ -49,6 +49,11 @@ use Illuminate\Support\Carbon;
  * @method static Builder|UserGroup whereId($value)
  * @method static Builder|UserGroup whereTitle($value)
  * @method static Builder|UserGroup whereUpdatedAt($value)
+ * @property-read Collection<int, \FireflyIII\Models\Account> $accounts
+ * @property-read int|null $accounts_count
+ * @property-read Collection<int, \FireflyIII\Models\Account> $accounts
+ * @property-read Collection<int, \FireflyIII\Models\Account> $accounts
+ * @property-read Collection<int, \FireflyIII\Models\Account> $accounts
  * @mixin Eloquent
  */
 class UserGroup extends Model

app/Providers/EventServiceProvider.php

@@ -29,6 +29,9 @@ use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Events\ChangedPiggyBankAmount;
 use FireflyIII\Events\DestroyedTransactionGroup;
 use FireflyIII\Events\DetectedNewIPAddress;
+use FireflyIII\Events\Model\BudgetLimit\Created;
+use FireflyIII\Events\Model\BudgetLimit\Deleted;
+use FireflyIII\Events\Model\BudgetLimit\Updated;
 use FireflyIII\Events\NewVersionAvailable;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
@@ -42,6 +45,7 @@ use FireflyIII\Events\UpdatedAccount;
 use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Events\WarnUserAboutBill;
+use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
@@ -160,6 +164,17 @@ class EventServiceProvider extends ServiceProvider
             ChangedPiggyBankAmount::class       => [
                 'FireflyIII\Handlers\Events\PiggyBankEventHandler@changePiggyAmount',
             ],
+            // budget related events: CRUD budget limit
+            Created::class          => [
+                'FireflyIII\Handlers\Events\Model\BudgetLimitHandler@created',
+            ],
+            Updated::class          => [
+                'FireflyIII\Handlers\Events\Model\BudgetLimitHandler@updated',
+            ],
+            Deleted::class          => [
+                'FireflyIII\Handlers\Events\Model\BudgetLimitHandler@deleted',
+            ],
+
         ];
 
     /**
@@ -169,7 +184,6 @@ class EventServiceProvider extends ServiceProvider
     {
         parent::boot();
         $this->registerCreateEvents();
-        $this->registerBudgetEvents();
     }
 
     /**
@@ -188,57 +202,4 @@ class EventServiceProvider extends ServiceProvider
             }
         );
     }
-
-    /**
-     * TODO needs a dedicated method.
-     */
-    protected function registerBudgetEvents(): void
-    {
-        $func = static function (BudgetLimit $limit) {
-            Log::debug('Trigger budget limit event.');
-            // find available budget with same period and same currency or create it.
-            // then set it or add money:
-            $user            = $limit->budget->user;
-            $availableBudget = $user
-                ->availableBudgets()
-                ->where('start_date', $limit->start_date->format('Y-m-d'))
-                ->where('end_date', $limit->end_date->format('Y-m-d'))
-                ->where('transaction_currency_id', $limit->transaction_currency_id)
-                ->first();
-            // update!
-            if (null !== $availableBudget) {
-                $repository = app(BudgetLimitRepositoryInterface::class);
-                $repository->setUser($user);
-                $set = $repository->getAllBudgetLimitsByCurrency($limit->transactionCurrency, $limit->start_date, $limit->end_date);
-                $sum = (string)$set->sum('amount');
-
-
-                Log::debug(
-                    sprintf(
-                        'Because budget limit #%d had its amount changed to %s, available budget limit #%d will be updated.',
-                        $limit->id,
-                        $limit->amount,
-                        $availableBudget->id
-                    )
-                );
-                $availableBudget->amount = $sum;
-                $availableBudget->save();
-                return;
-            }
-            Log::debug('Does not exist, create it.');
-            // create it.
-            $data       = [
-                'amount'      => $limit->amount,
-                'start'       => $limit->start_date,
-                'end'         => $limit->end_date,
-                'currency_id' => $limit->transaction_currency_id,
-            ];
-            $repository = app(AvailableBudgetRepositoryInterface::class);
-            $repository->setUser($user);
-            $repository->store($data);
-        };
-
-        BudgetLimit::created($func);
-        BudgetLimit::updated($func);
-    }
 }

app/Repositories/Attachment/AttachmentRepository.php

@@ -84,10 +84,10 @@ class AttachmentRepository implements AttachmentRepositoryInterface
 
         if ($disk->exists($file)) {
             $encryptedContent = (string)$disk->get($file);
-
             try {
                 $unencryptedContent = Crypt::decrypt($encryptedContent); // verified
             } catch (DecryptException $e) {
+                Log::debug(sprintf('Could not decrypt attachment #%d but this is fine: %s', $attachment->id, $e->getMessage()));
                 $unencryptedContent = $encryptedContent;
             }
         }

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -178,7 +178,7 @@ trait ModifiesPiggyBanks
             return $piggyBank;
         }
         $max = $piggyBank->targetamount;
-        if (1 === bccomp($amount, $max)) {
+        if (1 === bccomp($amount, $max) && 0 !== bccomp($piggyBank->targetamount, '0')) {
             $amount = $max;
         }
         $difference                = bcsub($amount, $repetition->currentamount);

app/Rules/UniqueIban.php

@@ -23,18 +23,20 @@ declare(strict_types=1);
 
 namespace FireflyIII\Rules;
 
+use Closure;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Support\Facades\Log;
 
 /**
  * Class UniqueIban
  */
-class UniqueIban implements Rule
+class UniqueIban implements ValidationRule
 {
     private ?Account $account;
-    private ?string  $expectedType;
+    private array    $expectedTypes;
 
     /**
      * Create a new rule instance.
@@ -45,17 +47,24 @@ class UniqueIban implements Rule
      */
     public function __construct(?Account $account, ?string $expectedType)
     {
-        $this->account      = $account;
-        $this->expectedType = $expectedType;
+        $this->account       = $account;
+        $this->expectedTypes = [];
+        if (null === $expectedType) {
+            return;
+        }
+        $this->expectedTypes = [$expectedType];
         // a very basic fix to make sure we get the correct account type:
         if ('expense' === $expectedType) {
-            $this->expectedType = AccountType::EXPENSE;
+            $this->expectedTypes = [AccountType::EXPENSE];
         }
         if ('revenue' === $expectedType) {
-            $this->expectedType = AccountType::REVENUE;
+            $this->expectedTypes = [AccountType::REVENUE];
         }
         if ('asset' === $expectedType) {
-            $this->expectedType = AccountType::ASSET;
+            $this->expectedTypes = [AccountType::ASSET];
+        }
+        if ('liabilities' === $expectedType) {
+            $this->expectedTypes = [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
         }
     }
 
@@ -84,7 +93,7 @@ class UniqueIban implements Rule
         if (!auth()->check()) {
             return true;
         }
-        if (null === $this->expectedType) {
+        if (0 === count($this->expectedTypes)) {
             return true;
         }
         $maxCounts = $this->getMaxOccurrences();
@@ -95,11 +104,11 @@ class UniqueIban implements Rule
             if ($count > $max) {
                 Log::debug(
                     sprintf(
-                        'IBAN "%s" is in use with %d account(s) of type "%s", which is too much for expected type "%s"',
+                        'IBAN "%s" is in use with %d account(s) of type "%s", which is too much for expected types "%s"',
                         $value,
                         $count,
                         $type,
-                        $this->expectedType
+                        join(', ', $this->expectedTypes)
                     )
                 );
 
@@ -120,14 +129,15 @@ class UniqueIban implements Rule
             AccountType::ASSET   => 0,
             AccountType::EXPENSE => 0,
             AccountType::REVENUE => 0,
+            'liabilities'        => 0,
         ];
 
-        if ('expense' === $this->expectedType || AccountType::EXPENSE === $this->expectedType) {
+        if (in_array('expense', $this->expectedTypes, true) || in_array(AccountType::EXPENSE, $this->expectedTypes, true)) {
             // IBAN should be unique amongst expense and asset accounts.
             // may appear once in revenue accounts
             $maxCounts[AccountType::REVENUE] = 1;
         }
-        if ('revenue' === $this->expectedType || AccountType::REVENUE === $this->expectedType) {
+        if (in_array('revenue', $this->expectedTypes, true) || in_array(AccountType::REVENUE, $this->expectedTypes, true)) {
             // IBAN should be unique amongst revenue and asset accounts.
             // may appear once in expense accounts
             $maxCounts[AccountType::EXPENSE] = 1;
@@ -144,12 +154,16 @@ class UniqueIban implements Rule
      */
     private function countHits(string $type, string $iban): int
     {
+        $typesArray = [$type];
+        if ('liabilities' === $type) {
+            $typesArray = [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        }
         $query
             = auth()->user()
                     ->accounts()
                     ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                     ->where('accounts.iban', $iban)
-                    ->where('account_types.type', $type);
+                    ->whereIn('account_types.type', $typesArray);
 
         if (null !== $this->account) {
             $query->where('accounts.id', '!=', $this->account->id);
@@ -157,4 +171,14 @@ class UniqueIban implements Rule
 
         return $query->count();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (!$this->passes($attribute, $value)) {
+            $fail((string)trans('validation.unique_iban_for_user'));
+        }
+    }
 }

app/Support/ExpandedForm.php

@@ -34,7 +34,6 @@ use Throwable;
 /**
  * Class ExpandedForm.
  *
- * @SuppressWarnings(PHPMD.TooManyMethods)
  *
 
  */

app/Support/Http/Controllers/RequestInformation.php

@@ -33,9 +33,9 @@ use FireflyIII\User;
 use Hash;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use InvalidArgumentException;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Route as RouteFacade;
@@ -75,6 +75,7 @@ trait RequestInformation
                 $current    = [
                     'type'            => $triggerInfo['type'] ?? '',
                     'value'           => $triggerInfo['value'] ?? '',
+                    'prohibited'      => $triggerInfo['prohibited'] ?? false,
                     'stop_processing' => 1 === (int)($triggerInfo['stop_processing'] ?? '0'),
                 ];
                 $current    = RuleFormRequest::replaceAmountTrigger($current);

app/Support/Search/OperatorQuerySearch.php

@@ -263,9 +263,9 @@ class OperatorQuerySearch implements SearchInterface
                 Log::info(sprintf('Ignore search operator "%s"', $operator));
 
                 return false;
-            //
+                //
                 // all account related searches:
-            //
+                //
             case 'account_is':
                 $this->searchAccount($value, 3, 4);
                 break;
@@ -496,9 +496,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->findNothing();
                 }
                 break;
-            //
+                //
                 // cash account
-            //
+                //
             case 'source_is_cash':
                 $account = $this->getCashAccount();
                 $this->collector->setSourceAccounts(new Collection([$account]));
@@ -523,9 +523,9 @@ class OperatorQuerySearch implements SearchInterface
                 $account = $this->getCashAccount();
                 $this->collector->excludeAccounts(new Collection([$account]));
                 break;
-            //
+                //
                 // description
-            //
+                //
             case 'description_starts':
                 $this->collector->descriptionStarts([$value]);
                 break;
@@ -552,9 +552,9 @@ class OperatorQuerySearch implements SearchInterface
             case '-description_is':
                 $this->collector->descriptionIsNot($value);
                 break;
-            //
+                //
                 // currency
-            //
+                //
             case 'currency_is':
                 $currency = $this->findCurrency($value);
                 if (null !== $currency) {
@@ -591,9 +591,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->findNothing();
                 }
                 break;
-            //
+                //
                 // attachments
-            //
+                //
             case 'has_attachments':
             case '-has_no_attachments':
                 Log::debug('Set collector to filter on attachments.');
@@ -604,7 +604,7 @@ class OperatorQuerySearch implements SearchInterface
                 Log::debug('Set collector to filter on NO attachments.');
                 $this->collector->hasNoAttachments();
                 break;
-            //
+                //
                 // categories
             case '-has_any_category':
             case 'has_no_category':
@@ -683,9 +683,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->findNothing();
                 }
                 break;
-            //
+                //
                 // budgets
-            //
+                //
             case '-has_any_budget':
             case 'has_no_budget':
                 $this->collector->withoutBudget();
@@ -764,9 +764,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->findNothing();
                 }
                 break;
-            //
+                //
                 // bill
-            //
+                //
             case '-has_any_bill':
             case 'has_no_bill':
                 $this->collector->withoutBill();
@@ -843,9 +843,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->findNothing();
                 }
                 break;
-            //
+                //
                 // tags
-            //
+                //
             case '-has_any_tag':
             case 'has_no_tag':
                 $this->collector->withoutTags();
@@ -856,12 +856,12 @@ class OperatorQuerySearch implements SearchInterface
                 break;
             case '-tag_is_not':
             case 'tag_is':
-                $result = $this->tagRepository->searchTag($value);
-                if ($result->count() > 0) {
-                    $this->collector->setTags($result);
+                $result = $this->tagRepository->findByTag($value);
+                if (null !== $result) {
+                    $this->collector->setTags(new Collection([$result]));
                 }
                 // no tags found means search must result in nothing.
-                if (0 === $result->count()) {
+                if (null === $result) {
                     Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));
                     $this->collector->findNothing();
                 }
@@ -873,9 +873,9 @@ class OperatorQuerySearch implements SearchInterface
                     $this->collector->setWithoutSpecificTags($result);
                 }
                 break;
-            //
+                //
                 // notes
-            //
+                //
             case 'notes_contains':
                 $this->collector->notesContain($value);
                 break;
@@ -914,9 +914,9 @@ class OperatorQuerySearch implements SearchInterface
             case '-reconciled':
                 $this->collector->isNotReconciled();
                 break;
-            //
+                //
                 // amount
-            //
+                //
             case 'amount_is':
                 // strip comma's, make dots.
                 Log::debug(sprintf('Original value "%s"', $value));
@@ -987,9 +987,9 @@ class OperatorQuerySearch implements SearchInterface
                 Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
                 $this->collector->foreignAmountMore($amount);
                 break;
-            //
+                //
                 // transaction type
-            //
+                //
             case 'transaction_type':
                 $this->collector->setTypes([ucfirst($value)]);
                 Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));
@@ -998,9 +998,9 @@ class OperatorQuerySearch implements SearchInterface
                 $this->collector->excludeTypes([ucfirst($value)]);
                 Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));
                 break;
-            //
+                //
                 // dates
-            //
+                //
             case '-date_on':
             case 'date_on':
                 $range = $this->parseDateRange($value);
@@ -1150,9 +1150,9 @@ class OperatorQuerySearch implements SearchInterface
                 $range = $this->parseDateRange($value);
                 $this->setObjectDateAfterParams('updated_at', $range);
                 return false;
-            //
+                //
                 // external URL
-            //
+                //
             case '-any_external_url':
             case 'no_external_url':
                 $this->collector->withoutExternalUrl();
@@ -1195,9 +1195,9 @@ class OperatorQuerySearch implements SearchInterface
                 $this->collector->externalUrlDoesNotEnd($value);
                 break;
 
-            //
+                //
                 // other fields
-            //
+                //
             case 'external_id_is':
                 $this->collector->setExternalId($value);
                 break;

app/Transformers/V2/BudgetLimitTransformer.php

@@ -67,11 +67,11 @@ class BudgetLimitTransformer extends AbstractTransformer
      */
     public function transform(BudgetLimit $budgetLimit): array
     {
-//        $repository = app(OperationsRepository::class);
-//        $repository->setUser($budgetLimit->budget->user);
-//        $expenses              = $repository->sumExpenses(
-//            $budgetLimit->start_date, $budgetLimit->end_date, null, new Collection([$budgetLimit->budget]), $budgetLimit->transactionCurrency
-//        );
+        //        $repository = app(OperationsRepository::class);
+        //        $repository->setUser($budgetLimit->budget->user);
+        //        $expenses              = $repository->sumExpenses(
+        //            $budgetLimit->start_date, $budgetLimit->end_date, null, new Collection([$budgetLimit->budget]), $budgetLimit->transactionCurrency
+        //        );
         $currency              = $budgetLimit->transactionCurrency;
         $amount                = $budgetLimit->amount;
         $currencyDecimalPlaces = 2;

app/Transformers/V2/BudgetTransformer.php

@@ -68,30 +68,30 @@ class BudgetTransformer extends AbstractTransformer
         $start = $this->parameters->get('start');
         $end   = $this->parameters->get('end');
         //$autoBudget = $this->repository->getAutoBudget($budget);
-//        $spent      = [];
-//        if (null !== $start && null !== $end) {
-//            $spent = $this->beautify($this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget])));
-//        }
+        //        $spent      = [];
+        //        if (null !== $start && null !== $end) {
+        //            $spent = $this->beautify($this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget])));
+        //        }
 
-//        $abCurrencyId   = null;
-//        $abCurrencyCode = null;
-//        $abType         = null;
-//        $abAmount       = null;
-//        $abPeriod       = null;
-//        $notes          = $this->repository->getNoteText($budget);
-//
-//        $types = [
-//            AutoBudget::AUTO_BUDGET_RESET    => 'reset',
-//            AutoBudget::AUTO_BUDGET_ROLLOVER => 'rollover',
-//        ];
-//
-//        if (null !== $autoBudget) {
-//            $abCurrencyId   = (string) $autoBudget->transactionCurrency->id;
-//            $abCurrencyCode = $autoBudget->transactionCurrency->code;
-//            $abType         = $types[$autoBudget->auto_budget_type];
-//            $abAmount       = number_format((float) $autoBudget->amount, $autoBudget->transactionCurrency->decimal_places, '.', '');
-//            $abPeriod       = $autoBudget->period;
-//        }
+        //        $abCurrencyId   = null;
+        //        $abCurrencyCode = null;
+        //        $abType         = null;
+        //        $abAmount       = null;
+        //        $abPeriod       = null;
+        //        $notes          = $this->repository->getNoteText($budget);
+        //
+        //        $types = [
+        //            AutoBudget::AUTO_BUDGET_RESET    => 'reset',
+        //            AutoBudget::AUTO_BUDGET_ROLLOVER => 'rollover',
+        //        ];
+        //
+        //        if (null !== $autoBudget) {
+        //            $abCurrencyId   = (string) $autoBudget->transactionCurrency->id;
+        //            $abCurrencyCode = $autoBudget->transactionCurrency->code;
+        //            $abType         = $types[$autoBudget->auto_budget_type];
+        //            $abAmount       = number_format((float) $autoBudget->amount, $autoBudget->transactionCurrency->decimal_places, '.', '');
+        //            $abPeriod       = $autoBudget->period;
+        //        }
 
         return [
             'id'         => (string)$budget->id,

app/Validation/GroupValidation.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Validation;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Validation\Validator;
 use Illuminate\Support\Facades\Log;
@@ -53,6 +54,9 @@ trait GroupValidation
         ];
         /** @var array $transaction */
         foreach ($transactions as $index => $transaction) {
+            if(!is_array($transaction)) {
+                throw new FireflyException('Invalid data submitted: transaction is not array.');
+            }
             $hasAccountInfo = false;
             $hasJournalId   = array_key_exists('transaction_journal_id', $transaction);
             foreach ($keys as $key) {
@@ -165,7 +169,6 @@ trait GroupValidation
      * @param  array  $transaction
      * @param  TransactionGroup  $transactionGroup
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function validateJournalId(Validator $validator, int $index, array $transaction, TransactionGroup $transactionGroup): void
     {

app/Validation/TransactionValidation.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Validation;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
@@ -30,8 +31,8 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Illuminate\Validation\Validator;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
 
 /**
  * Trait TransactionValidation
@@ -74,19 +75,22 @@ trait TransactionValidation
      */
     protected function getTransactionsArray(Validator $validator): array
     {
+        Log::debug('Now in getTransactionsArray');
         $data         = $validator->getData();
-        $transactions = $data['transactions'] ?? [];
+        $transactions = [];
+        if (is_array($data) && array_key_exists('transactions', $data) && is_array($data['transactions'])) {
+            Log::debug('Transactions key exists and is array.');
+            $transactions = $data['transactions'];
+        }
+        if (is_array($data) && array_key_exists('transactions', $data) && !is_array($data['transactions'])) {
+            Log::debug(sprintf('Transactions key exists but is NOT array,  its a %s', gettype($data['transactions'])));
+        }
+        // should be impossible to hit this:
         if (!is_countable($transactions)) {
             Log::error(sprintf('Transactions array is not countable, because its a %s', gettype($transactions)));
-
-            return [];
-        }
-        // a superfluous check but you never know.
-        if (!is_array($transactions)) {
-            Log::error(sprintf('Transactions array is not an array, because its a %s', gettype($transactions)));
-
             return [];
         }
+        Log::debug('Returning transactions.', $transactions);
 
         return $transactions;
     }
@@ -355,6 +359,9 @@ trait TransactionValidation
          * @var array $transaction
          */
         foreach ($transactions as $index => $transaction) {
+            if(!is_int($index)) {
+                throw new FireflyException('Invalid data submitted: transaction is not array.');
+            }
             $this->validateSingleUpdate($validator, $index, $transaction, $transactionGroup);
         }
     }
@@ -489,10 +496,11 @@ trait TransactionValidation
      */
     public function validateOneTransaction(Validator $validator): void
     {
+        Log::debug('Now in validateOneTransaction');
         if ($validator->errors()->count() > 0) {
+            Log::debug('Validator already has errors, so return.');
             return;
         }
-        Log::debug('Now in validateOneTransaction()');
         $transactions = $this->getTransactionsArray($validator);
         // need at least one transaction
         if (0 === count($transactions)) {

changelog.md

@@ -2,6 +2,55 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.0.9 - 2023-04-29
+
+### Added
+- Better length validation for text fields.
+
+### Changed
+- Better calculation of available budget
+
+### Fixed
+- [Issue 7377](https://github.com/firefly-iii/firefly-iii/issues/7377) Tag search was broken
+- [Issue 7389](https://github.com/firefly-iii/firefly-iii/issues/7389) Bug in charts
+- [Issue 7394](https://github.com/firefly-iii/firefly-iii/issues/7394) unique iban check was broken
+- [Issue 7427](https://github.com/firefly-iii/firefly-iii/issues/7427) API would not accept page 18 and up.
+- [Issue 7410](https://github.com/firefly-iii/firefly-iii/issues/7410) Various dark mode color fixes
+- Old documentation links fixed by @mindlessroman and @noxonad!
+
+## 6.0.8 - 2023-04-16
+
+### Added
+- [Issue 7351](https://github.com/firefly-iii/firefly-iii/issues/7351) Optional command to force the decimal size.
+- [Issue 7352](https://github.com/firefly-iii/firefly-iii/issues/7352) Optional command to force the migrations.
+- [Issue 7354](https://github.com/firefly-iii/firefly-iii/issues/7354) The new v3 layout will redirect to the index when unauthenticated, thanks @corcom!
+
+### Fixed
+- [Issue 7349](https://github.com/firefly-iii/firefly-iii/issues/7349) Missing tables in PostgreSQL script.
+- [Issue 7358](https://github.com/firefly-iii/firefly-iii/issues/7358) Could not create liabilities with a pre-set amount.
+- Fix date field in bill warning mail.
+- Fix installer script.
+- Remove attachment paperclip from transactions with deleted attachments.
+
+### API
+- [Issue 7347](https://github.com/firefly-iii/firefly-iii/issues/7347) API made rules would be inactive by default.
+
+## v6.0.7 - 2023-04-09
+
+### Added
+- Lots of error catching in DB migrations for smoother upgrades.
+- New command `firefly-iii:force-migration` which will force database migrations to run. It will probably also destroy your database so don't use it.
+- You can now force light/dark mode in your settings.
+
+### Fixed
+- [Issue 7137](https://github.com/firefly-iii/firefly-iii/issues/7137) Inconsistent rule test form
+- [Issue 7320](https://github.com/firefly-iii/firefly-iii/issues/7320) Standard email values so less errors
+- [Issue 7311](https://github.com/firefly-iii/firefly-iii/issues/7311) Fix issue with date validation
+- [Issue 7310](https://github.com/firefly-iii/firefly-iii/issues/7310) Better color contrast in dark mode.
+
+### API
+- [Issue 7308](https://github.com/firefly-iii/firefly-iii/issues/7308) Could not set current amount for certain piggy banks
+
 ## v6.0.6 - 2023-04-02
 
 ### Changed
@@ -20,6 +69,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### API
 - Fixed: Could not give piggy bank an unlimited amount.
+- [Issue 7335](https://github.com/firefly-iii/firefly-iii/issues/7335) Fix upload of attachments, thanks @fengkaijia
 
 ## v6.0.5 - 2023-03-19
 

composer.json

@@ -82,7 +82,7 @@
     "ext-xml": "*",
     "ext-xmlwriter": "*",
     "bacon/bacon-qr-code": "2.*",
-    "diglactic/laravel-breadcrumbs": "^8.0",
+    "diglactic/laravel-breadcrumbs": "^8.1",
     "doctrine/dbal": "3.*",
     "gdbots/query-parser": "^3.0",
     "guzzlehttp/guzzle": "^7.5",
@@ -104,6 +104,7 @@
     "ramsey/uuid": "^4.7",
     "rcrowe/twigbridge": "^0.14",
     "spatie/laravel-ignition": "^2",
+    "spatie/period": "^2.4",
     "symfony/http-client": "^6.0",
     "symfony/mailgun-mailer": "^6.0",
     "therobfonz/laravel-mandrill-driver": "^5.0"
@@ -114,7 +115,7 @@
     "fakerphp/faker": "1.*",
     "filp/whoops": "2.*",
     "mockery/mockery": "1.*",
-    "nunomaduro/larastan": "^2.5",
+    "nunomaduro/larastan": "^2.6",
     "phpstan/phpstan": "^1.10",
     "phpstan/phpstan-deprecation-rules": "^1.1",
     "phpstan/phpstan-strict-rules": "^1.4",
@@ -155,57 +156,17 @@
       "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump"
     ],
     "post-update-cmd": [
+      "@php artisan config:clear",
+      "@php artisan route:clear",
+      "@php artisan twig:clean",
+      "@php artisan view:clear",
+      "@php artisan clear-compiled",
       "@php artisan cache:clear",
-      "@php artisan firefly-iii:fix-pgsql-sequences",
-      "@php artisan firefly-iii:decrypt-all",
-      "@php artisan firefly-iii:transaction-identifiers",
-      "@php artisan firefly-iii:migrate-to-groups",
-      "@php artisan firefly-iii:account-currencies",
-      "@php artisan firefly-iii:transfer-currencies",
-      "@php artisan firefly-iii:other-currencies",
-      "@php artisan firefly-iii:migrate-notes",
-      "@php artisan firefly-iii:migrate-attachments",
-      "@php artisan firefly-iii:bills-to-rules",
-      "@php artisan firefly-iii:bl-currency",
-      "@php artisan firefly-iii:cc-liabilities",
-      "@php artisan firefly-iii:back-to-journals",
-      "@php artisan firefly-iii:rename-account-meta",
-      "@php artisan firefly-iii:migrate-recurrence-meta",
-      "@php artisan firefly-iii:migrate-tag-locations",
-      "@php artisan firefly-iii:migrate-recurrence-type",
-      "@php artisan firefly-iii:upgrade-liabilities",
-      "@php artisan firefly-iii:liabilities-600",
-      "@php artisan firefly-iii:fix-piggies",
-      "@php artisan firefly-iii:create-link-types",
-      "@php artisan firefly-iii:create-access-tokens",
-      "@php artisan firefly-iii:remove-bills",
-      "@php artisan firefly-iii:fix-negative-limits",
-      "@php artisan firefly-iii:enable-currencies",
-      "@php artisan firefly-iii:fix-transfer-budgets",
-      "@php artisan firefly-iii:fix-uneven-amount",
-      "@php artisan firefly-iii:delete-zero-amount",
-      "@php artisan firefly-iii:delete-orphaned-transactions",
-      "@php artisan firefly-iii:delete-empty-journals",
-      "@php artisan firefly-iii:delete-empty-groups",
-      "@php artisan firefly-iii:fix-account-types",
-      "@php artisan firefly-iii:fix-account-order",
-      "@php artisan firefly-iii:rename-meta-fields",
-      "@php artisan firefly-iii:fix-ob-currencies",
-      "@php artisan firefly-iii:fix-long-descriptions",
-      "@php artisan firefly-iii:fix-recurring-transactions",
-      "@php artisan firefly-iii:unify-group-accounts",
-      "@php artisan firefly-iii:fix-transaction-types",
-      "@php artisan firefly-iii:fix-frontpage-accounts",
-      "@php artisan firefly-iii:fix-ibans",
-      "@php artisan firefly-iii:create-group-memberships",
-      "@php artisan firefly-iii:report-empty-objects",
-      "@php artisan firefly-iii:report-sum",
-      "@php artisan firefly-iii:restore-oauth-keys",
-      "@php artisan firefly-iii:upgrade-group-information",
-      "@php artisan firefly-iii:set-latest-version --james-is-cool",
-      "@php artisan firefly:instructions update",
-      "@php artisan firefly-iii:verify-security-alerts",
-      "@php artisan passport:install"
+      "@php artisan firefly-iii:upgrade-database",
+      "@php artisan firefly-iii:correct-database",
+      "@php artisan firefly-iii:report-integrity",
+      "@php artisan passport:install",
+      "@php artisan firefly:instructions update"
     ],
     "post-install-cmd": [
       "@php artisan firefly:instructions install",

config/firefly.php

@@ -107,7 +107,7 @@ return [
         'webhooks'     => true,
         'handle_debts' => true,
     ],
-    'version'                      => '6.0.6',
+    'version'                      => '6.0.9',
     'api_version'                  => '2.0.1',
     'db_version'                   => 19,
 
@@ -205,6 +205,7 @@ return [
     ],
 
     // default user-related values
+    'darkMode'                     => 'browser',
     'list_length'                  => 10, // to be removed if v1 is cancelled.
     'default_preferences'          => [
         'frontPageAccounts'  => [],
@@ -241,6 +242,7 @@ return [
         TransactionJournal::class,
         Recurrence::class,
     ],
+    'available_dark_modes'         => ['light', 'dark', 'browser'],
     'bill_reminder_periods'        => [90, 30, 14, 7, 0],
     'valid_view_ranges'            => ['1D', '1W', '1M', '3M', '6M', '1Y',],
     'allowedMimes'                 => [
@@ -877,7 +879,7 @@ return [
     ],
     'can_have_virtual_amounts'  => [AccountType::ASSET],
     'can_have_opening_balance'  => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
-    'dynamic_creation_allowed'  => [AccountType::EXPENSE, AccountType::REVENUE, AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION],
+    'dynamic_creation_allowed'  => [AccountType::EXPENSE, AccountType::REVENUE, AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION, AccountType::LIABILITY_CREDIT],
     'valid_asset_fields'        => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
     'valid_cc_fields'           => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
     'valid_account_fields'      => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],

config/mail.php

@@ -38,11 +38,11 @@ return [
     'mailers' => [
         'smtp' => [
             'transport'   => 'smtp',
-            'host'        => env('MAIL_HOST', 'smtp.mailtrap.io'),
+            'host'        => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
             'port'        => (int)env('MAIL_PORT', 2525),
-            'encryption'  => env('MAIL_ENCRYPTION', 'tls'),
-            'username'    => env('MAIL_USERNAME'),
-            'password'    => env('MAIL_PASSWORD'),
+            'encryption'  => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
+            'username'    => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
+            'password'    => envNonEmpty('MAIL_PASSWORD', 'password'),
             'timeout'     => null,
             'verify_peer' => null !== env('MAIL_ENCRYPTION'),
         ],
@@ -72,6 +72,11 @@ return [
             'channel'   => env('MAIL_LOG_CHANNEL', 'stack'),
             'level'     => 'notice',
         ],
+        'null'      => [
+            'transport' => 'log',
+            'channel'   => env('MAIL_LOG_CHANNEL', 'stack'),
+            'level'     => 'notice',
+        ],
 
         'array' => [
             'transport' => 'array',

database/migrations/2016_06_16_000000_create_support_tables.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -51,7 +52,6 @@ class CreateSupportTables extends Migration
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
@@ -67,177 +67,257 @@ class CreateSupportTables extends Migration
         $this->createConfigurationTable();
     }
 
+    /**
+     * @return void
+     */
     private function createAccountTypeTable(): void
     {
         if (!Schema::hasTable('account_types')) {
-            Schema::create(
-                'account_types',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->string('type', 50);
+            try {
+                Schema::create(
+                    'account_types',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->string('type', 50);
 
-                    // type must be unique.
-                    $table->unique(['type']);
-                }
-            );
-        }
-    }
-
-    private function createCurrencyTable(): void
-    {
-        if (!Schema::hasTable('transaction_currencies')) {
-            Schema::create(
-                'transaction_currencies',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->softDeletes();
-                    $table->string('code', 3);
-                    $table->string('name', 255);
-                    $table->string('symbol', 12);
-
-                    // code must be unique.
-                    $table->unique(['code']);
-                }
-            );
-        }
-    }
-
-    private function createTransactionTypeTable(): void
-    {
-        if (!Schema::hasTable('transaction_types')) {
-            Schema::create(
-                'transaction_types',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->softDeletes();
-                    $table->string('type', 50);
-
-                    // type must be unique.
-                    $table->unique(['type']);
-                }
-            );
-        }
-    }
-
-    private function createJobsTable(): void
-    {
-        if (!Schema::hasTable('jobs')) {
-            Schema::create(
-                'jobs',
-                static function (Blueprint $table) {
-                    // straight from Laravel
-                    $table->bigIncrements('id');
-                    $table->string('queue');
-                    $table->longText('payload');
-                    $table->tinyInteger('attempts')->unsigned();
-                    $table->tinyInteger('reserved')->unsigned();
-                    $table->unsignedInteger('reserved_at')->nullable();
-                    $table->unsignedInteger('available_at');
-                    $table->unsignedInteger('created_at');
-                    $table->index(['queue', 'reserved', 'reserved_at']);
-                }
-            );
-        }
-    }
-
-    private function createPasswordTable(): void
-    {
-        if (!Schema::hasTable('password_resets')) {
-            Schema::create(
-                'password_resets',
-                static function (Blueprint $table) {
-                    // straight from laravel
-                    $table->string('email')->index();
-                    $table->string('token')->index();
-                    $table->timestamp('created_at')->nullable();
-                }
-            );
-        }
-    }
-
-    private function createPermissionsTable(): void
-    {
-        if (!Schema::hasTable('permissions')) {
-            Schema::create(
-                'permissions',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->string('name')->unique();
-                    $table->string('display_name')->nullable();
-                    $table->string('description')->nullable();
-                }
-            );
-        }
-    }
-
-    private function createRolesTable(): void
-    {
-        if (!Schema::hasTable('roles')) {
-            Schema::create(
-                'roles',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->string('name')->unique();
-                    $table->string('display_name')->nullable();
-                    $table->string('description')->nullable();
-                }
-            );
-        }
-    }
-
-    private function createPermissionRoleTable(): void
-    {
-        if (!Schema::hasTable('permission_role')) {
-            Schema::create(
-                'permission_role',
-                static function (Blueprint $table) {
-                    $table->integer('permission_id')->unsigned();
-                    $table->integer('role_id')->unsigned();
-
-                    $table->foreign('permission_id')->references('id')->on('permissions')->onUpdate('cascade')->onDelete('cascade');
-                    $table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade')->onDelete('cascade');
-
-                    $table->primary(['permission_id', 'role_id']);
-                }
-            );
-        }
-    }
-
-    private function createSessionsTable(): void
-    {
-        if (!Schema::hasTable('sessions')) {
-            Schema::create(
-                'sessions',
-                static function (Blueprint $table) {
-                    $table->string('id')->unique();
-                    $table->integer('user_id')->nullable();
-                    $table->string('ip_address', 45)->nullable();
-                    $table->text('user_agent')->nullable();
-                    $table->text('payload');
-                    $table->integer('last_activity');
-                }
-            );
+                        // type must be unique.
+                        $table->unique(['type']);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "account_types": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
         }
     }
 
+    /**
+     * @return void
+     */
     private function createConfigurationTable(): void
     {
         if (!Schema::hasTable('configuration')) {
-            Schema::create(
-                'configuration',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->softDeletes();
-                    $table->string('name', 50);
-                    $table->text('data');
-                }
-            );
+            try {
+                Schema::create(
+                    'configuration',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->softDeletes();
+                        $table->string('name', 50);
+                        $table->text('data');
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "configuration": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createCurrencyTable(): void
+    {
+        if (!Schema::hasTable('transaction_currencies')) {
+            try {
+                Schema::create(
+                    'transaction_currencies',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->softDeletes();
+                        $table->string('code', 3);
+                        $table->string('name', 255);
+                        $table->string('symbol', 12);
+
+                        // code must be unique.
+                        $table->unique(['code']);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "transaction_currencies": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createJobsTable(): void
+    {
+        if (!Schema::hasTable('jobs')) {
+            try {
+                Schema::create(
+                    'jobs',
+                    static function (Blueprint $table) {
+                        // straight from Laravel
+                        $table->bigIncrements('id');
+                        $table->string('queue');
+                        $table->longText('payload');
+                        $table->tinyInteger('attempts')->unsigned();
+                        $table->tinyInteger('reserved')->unsigned();
+                        $table->unsignedInteger('reserved_at')->nullable();
+                        $table->unsignedInteger('available_at');
+                        $table->unsignedInteger('created_at');
+                        $table->index(['queue', 'reserved', 'reserved_at']);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "jobs": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createPasswordTable(): void
+    {
+        if (!Schema::hasTable('password_resets')) {
+            try {
+                Schema::create(
+                    'password_resets',
+                    static function (Blueprint $table) {
+                        // straight from laravel
+                        $table->string('email')->index();
+                        $table->string('token')->index();
+                        $table->timestamp('created_at')->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "password_resets": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createPermissionRoleTable(): void
+    {
+        if (!Schema::hasTable('permission_role')) {
+            try {
+                Schema::create(
+                    'permission_role',
+                    static function (Blueprint $table) {
+                        $table->integer('permission_id')->unsigned();
+                        $table->integer('role_id')->unsigned();
+
+                        $table->foreign('permission_id')->references('id')->on('permissions')->onUpdate('cascade')->onDelete('cascade');
+                        $table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade')->onDelete('cascade');
+
+                        $table->primary(['permission_id', 'role_id']);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "permission_role": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createPermissionsTable(): void
+    {
+        if (!Schema::hasTable('permissions')) {
+            try {
+                Schema::create(
+                    'permissions',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->string('name')->unique();
+                        $table->string('display_name')->nullable();
+                        $table->string('description')->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "permissions": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createRolesTable(): void
+    {
+        if (!Schema::hasTable('roles')) {
+            try {
+                Schema::create(
+                    'roles',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->string('name')->unique();
+                        $table->string('display_name')->nullable();
+                        $table->string('description')->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "roles": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createSessionsTable(): void
+    {
+        if (!Schema::hasTable('sessions')) {
+            try {
+                Schema::create(
+                    'sessions',
+                    static function (Blueprint $table) {
+                        $table->string('id')->unique();
+                        $table->integer('user_id')->nullable();
+                        $table->string('ip_address', 45)->nullable();
+                        $table->text('user_agent')->nullable();
+                        $table->text('payload');
+                        $table->integer('last_activity');
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "sessions": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function createTransactionTypeTable(): void
+    {
+        if (!Schema::hasTable('transaction_types')) {
+            try {
+                Schema::create(
+                    'transaction_types',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->softDeletes();
+                        $table->string('type', 50);
+
+                        // type must be unique.
+                        $table->unique(['type']);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "transaction_types": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
         }
     }
 }

database/migrations/2016_06_16_000001_create_users_table.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -42,24 +43,28 @@ class CreateUsersTable extends Migration
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
         if (!Schema::hasTable('users')) {
-            Schema::create(
-                'users',
-                static function (Blueprint $table) {
-                    $table->increments('id');
-                    $table->timestamps();
-                    $table->string('email', 255);
-                    $table->string('password', 60);
-                    $table->string('remember_token', 100)->nullable();
-                    $table->string('reset', 32)->nullable();
-                    $table->tinyInteger('blocked', false, true)->default('0');
-                    $table->string('blocked_code', 25)->nullable();
-                }
-            );
+            try {
+                Schema::create(
+                    'users',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->string('email', 255);
+                        $table->string('password', 60);
+                        $table->string('remember_token', 100)->nullable();
+                        $table->string('reset', 32)->nullable();
+                        $table->tinyInteger('blocked', false, true)->default('0');
+                        $table->string('blocked_code', 25)->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "users": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
+            }
         }
     }
 }

database/migrations/2016_08_25_091522_changes_for_3101.php

@@ -22,7 +22,6 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 
 /**
  * Class ChangesFor3101.
@@ -36,30 +35,13 @@ class ChangesFor3101 extends Migration
      */
     public function down(): void
     {
-        Schema::table(
-            'import_jobs',
-            static function (Blueprint $table) {
-                if (Schema::hasColumn('import_jobs', 'extended_status')) {
-                    $table->dropColumn('extended_status');
-                }
-            }
-        );
     }
 
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::table(
-            'import_jobs',
-            static function (Blueprint $table) {
-                if (!Schema::hasColumn('import_jobs', 'extended_status')) {
-                    $table->text('extended_status')->nullable();
-                }
-            }
-        );
     }
 }

database/migrations/2016_09_12_121359_fix_nullables.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -41,22 +42,35 @@ class FixNullables extends Migration
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::table(
-            'rule_groups',
-            static function (Blueprint $table) {
-                $table->text('description')->nullable()->change();
+        if (!Schema::hasColumn('rule_groups', 'description')) {
+            try {
+                Schema::table(
+                    'rule_groups',
+                    static function (Blueprint $table) {
+                        $table->text('description')->nullable()->change();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not update table: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
 
-        Schema::table(
-            'rules',
-            static function (Blueprint $table) {
-                $table->text('description')->nullable()->change();
+        if (!Schema::hasColumn('rules', 'description')) {
+            try {
+                Schema::table(
+                    'rules',
+                    static function (Blueprint $table) {
+                        $table->text('description')->nullable()->change();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 }

database/migrations/2016_10_09_150037_expand_transactions_table.php

@@ -21,7 +21,9 @@
  */
 declare(strict_types=1);
 
+use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -36,26 +38,39 @@ class ExpandTransactionsTable extends Migration
      */
     public function down(): void
     {
-        Schema::table(
-            'transactions',
-            static function (Blueprint $table) {
-                $table->dropColumn('identifier');
+        if (Schema::hasColumn('transactions', 'identifier')) {
+            try {
+                Schema::table(
+                    'transactions',
+                    static function (Blueprint $table) {
+                        $table->dropColumn('identifier');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not drop column "identifier": %s', $e->getMessage()));
+                Log::error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::table(
-            'transactions',
-            static function (Blueprint $table) {
-                $table->smallInteger('identifier', false, true)->default(0);
+        if (!Schema::hasColumn('transactions', 'identifier')) {
+            try {
+                Schema::table(
+                    'transactions',
+                    static function (Blueprint $table) {
+                        $table->smallInteger('identifier', false, true)->default(0);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 }

database/migrations/2016_10_22_075804_changes_for_v410.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -42,21 +43,27 @@ class ChangesForV410 extends Migration
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::create(
-            'notes',
-            static function (Blueprint $table) {
-                $table->increments('id');
-                $table->timestamps();
-                $table->softDeletes();
-                $table->integer('noteable_id', false, true);
-                $table->string('noteable_type');
-                $table->string('title')->nullable();
-                $table->text('text')->nullable();
+        if(!Schema::hasTable('notes')) {
+            try {
+                Schema::create(
+                    'notes',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->softDeletes();
+                        $table->integer('noteable_id', false, true);
+                        $table->string('noteable_type');
+                        $table->string('title')->nullable();
+                        $table->text('text')->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "notes": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
             }
-        );
+        }
     }
 }

database/migrations/2016_11_24_210552_changes_for_v420.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -36,26 +37,39 @@ class ChangesForV420 extends Migration
      */
     public function down(): void
     {
-        Schema::table(
-            'journal_meta',
-            static function (Blueprint $table) {
-                $table->dropSoftDeletes();
+        if (Schema::hasColumn('journal_meta', 'deleted_at')) {
+            try {
+                Schema::table(
+                    'journal_meta',
+                    static function (Blueprint $table) {
+                        $table->dropSoftDeletes();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::table(
-            'journal_meta',
-            static function (Blueprint $table) {
-                $table->softDeletes();
+        if (!Schema::hasColumn('journal_meta', 'deleted_at')) {
+            try {
+                Schema::table(
+                    'journal_meta',
+                    static function (Blueprint $table) {
+                        $table->softDeletes();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 }

database/migrations/2016_12_22_150431_changes_for_v430.php

@@ -22,6 +22,7 @@
 declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -42,25 +43,31 @@ class ChangesForV430 extends Migration
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
      */
     public function up(): void
     {
-        Schema::create(
-            'available_budgets',
-            static function (Blueprint $table) {
-                $table->increments('id');
-                $table->timestamps();
-                $table->softDeletes();
-                $table->integer('user_id', false, true);
-                $table->integer('transaction_currency_id', false, true);
-                $table->decimal('amount', 32, 12);
-                $table->date('start_date');
-                $table->date('end_date');
+        if (!Schema::hasTable('available_budgets')) {
+            try {
+                Schema::create(
+                    'available_budgets',
+                    static function (Blueprint $table) {
+                        $table->increments('id');
+                        $table->timestamps();
+                        $table->softDeletes();
+                        $table->integer('user_id', false, true);
+                        $table->integer('transaction_currency_id', false, true);
+                        $table->decimal('amount', 32, 12);
+                        $table->date('start_date');
+                        $table->date('end_date');
 
-                $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
-                $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+                        $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
+                        $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not create table "available_budgets": %s', $e->getMessage()));
+                Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.');
             }
-        );
+        }
     }
 }

database/migrations/2016_12_28_203205_changes_for_v431.php

@@ -21,7 +21,9 @@
  */
 declare(strict_types=1);
 
+use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
@@ -37,87 +39,154 @@ class ChangesForV431 extends Migration
     public function down(): void
     {
         // reinstate "repeats" and "repeat_freq".
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->string('repeat_freq', 30)->nullable();
+        if (!Schema::hasColumn('budget_limits', 'repeat_freq')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->string('repeat_freq', 30)->nullable();
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->boolean('repeats')->default(0);
+        }
+        if (!Schema::hasColumn('budget_limits', 'repeats')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->boolean('repeats')->default(0);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
-
+        }
         // change field "start_date" to "startdate"
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->renameColumn('start_date', 'startdate');
+        if (Schema::hasColumn('budget_limits', 'start_date') && !Schema::hasColumn('budget_limits', 'startdate')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->renameColumn('start_date', 'startdate');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
 
         // remove date field "end_date"
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->dropColumn('end_date');
+        if (Schema::hasColumn('budget_limits', 'end_date')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->dropColumn('end_date');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
         // remove decimal places
-        Schema::table(
-            'transaction_currencies',
-            static function (Blueprint $table) {
-                $table->dropColumn('decimal_places');
+        if (Schema::hasColumn('transaction_currencies', 'decimal_places')) {
+            try {
+                Schema::table(
+                    'transaction_currencies',
+                    static function (Blueprint $table) {
+                        $table->dropColumn('decimal_places');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 
     /**
      * Run the migrations.
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function up(): void
     {
         // add decimal places to "transaction currencies".
-        Schema::table(
-            'transaction_currencies',
-            static function (Blueprint $table) {
-                $table->smallInteger('decimal_places', false, true)->default(2);
+        if (!Schema::hasColumn('transaction_currencies', 'decimal_places')) {
+            try {
+                Schema::table(
+                    'transaction_currencies',
+                    static function (Blueprint $table) {
+                        $table->smallInteger('decimal_places', false, true)->default(2);
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
 
         // change field "startdate" to "start_date"
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->renameColumn('startdate', 'start_date');
+        if (Schema::hasColumn('budget_limits', 'startdate') && !Schema::hasColumn('budget_limits', 'start_date')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->renameColumn('startdate', 'start_date');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
 
         // add date field "end_date" after "start_date"
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->date('end_date')->nullable()->after('start_date');
+        if (!Schema::hasColumn('budget_limits', 'end_date')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->date('end_date')->nullable()->after('start_date');
+                    }
+                );
+            } catch (QueryException $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
 
         // drop "repeats" and "repeat_freq".
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->dropColumn('repeats');
+        if (Schema::hasColumn('budget_limits', 'repeats')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->dropColumn('repeats');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
-        Schema::table(
-            'budget_limits',
-            static function (Blueprint $table) {
-                $table->dropColumn('repeat_freq');
+        }
+        if (Schema::hasColumn('budget_limits', 'repeat_freq')) {
+            try {
+                Schema::table(
+                    'budget_limits',
+                    static function (Blueprint $table) {
+                        $table->dropColumn('repeat_freq');
+                    }
+                );
+            } catch (QueryException|ColumnDoesNotExist $e) {
+                Log::error(sprintf('Could not execute query: %s', $e->getMessage()));
+                Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
-        );
+        }
     }
 }