Auto commit for release 'develop' on 2024-03-25

Add relative path.

Signed-off-by: James Cole <james@firefly-iii.org>

.ci/all.sh

@@ -22,6 +22,9 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+echo "Running PHP CS Fixer"
 $SCRIPT_DIR/phpcs.sh
+echo "Running PHPStan"
 $SCRIPT_DIR/phpstan.sh
+echo "Running PHPMD"
 $SCRIPT_DIR/phpmd.sh

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

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "composer/pcre",
-            "version": "3.1.1",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
                 "shasum": ""
             },
             "require": {
@@ -59,7 +59,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.1.3"
             },
             "funding": [
                 {
@@ -75,7 +75,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-03-19T10:26:25+00:00"
         },
         {
             "name": "composer/semver",
@@ -226,16 +226,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.51.0",
+            "version": "v3.52.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "127fa74f010da99053e3f5b62672615b72dd6efd"
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd",
-                "reference": "127fa74f010da99053e3f5b62672615b72dd6efd",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
                 "shasum": ""
             },
             "require": {
@@ -306,7 +306,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.51.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
             },
             "funding": [
                 {
@@ -314,7 +314,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-28T19:50:06+00:00"
+            "time": "2024-03-19T21:02:43+00:00"
         },
         {
             "name": "psr/container",

.ci/phpmd/composer.lock

@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "3.1.1",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace",
+                "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace",
                 "shasum": ""
             },
             "require": {
@@ -60,7 +60,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.1.2"
             },
             "funding": [
                 {
@@ -76,7 +76,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-03-07T15:38:35+00:00"
         },
         {
             "name": "composer/xdebug-handler",

.env.example

@@ -184,6 +184,11 @@ SEND_REPORT_JOURNALS=true
 # Since this involves an external service, it's optional and disabled by default.
 ENABLE_EXTERNAL_MAP=false
 
+#
+# Enable or disable exchange rate conversion. This function isn't used yet by Firefly III
+#
+ENABLE_EXCHANGE_RATES=false
+
 # Set this value to true if you want Firefly III to download currency exchange rates
 # from the internet. These rates are hosted by the creator of Firefly III inside
 # an Azure Storage Container.

.github/funding.yml

@@ -1,4 +1,6 @@
-# These are supported funding model platforms
+# Firefly III sponsor options
 
 github: jc5
 patreon: JC5
+ko_fi: jamesc5
+liberapay: JC5

.github/workflows/cleanup.yml

@@ -7,7 +7,7 @@ permissions:
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 1 * * *'
   workflow_dispatch:
 jobs:
   prune:

.github/workflows/lock.yml

@@ -3,17 +3,27 @@ name: 'Issues - Lock old issues'
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
+
+concurrency:
+  group: lock-threads
+
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
 
 jobs:
   lock:
     permissions:
       issues: write
       pull-requests: write
+      discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: JC5/lock-threads@main
+      - uses: dessant/lock-threads@v5
         with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 7
-          pr-inactive-days: 7
+          issue-inactive-days: 21
+          pr-inactive-days: 21
+          discussion-inactive-days: 21
+          log-output: true

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
         required: true
         default: 'develop'
   schedule:
-    - cron:  '15 0 * * MON,THU'
+    - cron:  '0 3 * * MON,THU'
 
 jobs:
   build:
@@ -115,7 +115,8 @@ jobs:
           GH_TOKEN: ''
       - name: Build new JS
         run: |
-          npm upgrade
+          npm update
+          npm install
           npm run build
       - name: Build old JS
         id: old-js
@@ -140,8 +141,13 @@ jobs:
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
           git config advice.addIgnoredFile false
 
+          releaseName=$version
+          zipName=FireflyIII-$version.zip
+
           if [[ "develop" == "$version" ]]; then
             [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            releaseName=$version-$(date +'%Y%m%d')
+            zipName=FireflyIII-develop.zip
           fi
 
           git add -A
@@ -151,19 +157,29 @@ jobs:
           git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
           git push
 
+          # zip everything
+          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+
           if [[ "develop" == "$version" ]]; then
             echo "Create nightly release."
-            git tag -a $version-$(date +'%Y%m%d') -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
-            git push origin $version-$(date +'%Y%m%d')
-            gh release create $version-$(date +'%Y%m%d') -p --verify-tag \
+            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
               -t "Development release for $(date +'%Y-%m-%d')" \
               -n "Bi-weekly development release of Firefly III with the latest fixes, translations and features. This release was created on **$(date +'%Y-%m-%d')** and may contain bugs. Use at your own risk. Docker users can find this release under the \`develop\` tag."
+
+            # add zip file to release.
+            gh release upload $releaseName $zipName
+
           else
             echo "Create default release."
-            git tag -a $version -m "Here be changelog"
-            git push origin $version
-            gh release create $version -F output.txt -t "$version" --verify-tag
+            git tag -a $releaseName -m "Here be changelog"
+            git push origin $releaseName
+            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+            # add zip file to release.
+            gh release upload $releaseName $zipName
             rm output.txt
+            rm $zipName
             git checkout develop
             git merge main
             git push

.github/workflows/sonarcloud.yml

@@ -45,15 +45,6 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
 
-      - name: PHPStan
-        run: .ci/phpstan.sh
-
-      - name: PHPMD
-        run: .ci/phpmd.sh
-
-      - name: PHP CS Fixer
-        run: .ci/phpcs.sh
-
       - name: "Create database file"
         run: touch storage/database/database.sqlite
 

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: "Issues - Mark and close stale issues"
 on:
   schedule:
-    - cron: "30 1 * * *"
+    - cron: "0 4 * * *"
   workflow_dispatch:
 
 permissions:
@@ -18,16 +18,16 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: >
-            Hi there! 
-            
+            Hi there!
+
             This is an automatic reply. `Share and enjoy`
 
             This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
 
             Thank you for your contributions.
           stale-pr-message: >
-            Hi there! 
-            
+            Hi there!
+
             This is an automatic reply. `Share and enjoy`
 
             This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

.gitignore

@@ -7,3 +7,6 @@ yarn-error.log
 .env
 /.ci/php-cs-fixer/vendor
 coverage.xml
+
+# ignore generated files.
+public/build

app/Api/V1/Controllers/Models/Rule/ExpressionController.php

@@ -0,0 +1,47 @@
+<?php
+/*
+ * ExpressionController.php
+ * Copyright (c) 2024 Michael Thomas
+ *
+ * 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\Controllers\Models\Rule;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Rule\ValidateExpressionRequest;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ExpressionController
+ */
+class ExpressionController extends Controller
+{
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/validateExpression
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function validateExpression(ValidateExpressionRequest $request): JsonResponse
+    {
+        return response()->json([
+            'valid' => true,
+        ]);
+    }
+}

app/Api/V1/Controllers/Summary/BasicController.php

@@ -281,7 +281,7 @@ class BasicController extends Controller
             $spentInCurrency = $row['sum'];
             $leftToSpend     = bcadd($amount, $spentInCurrency);
 
-            $days            = $today->diffInDays($end) + 1;
+            $days            = (int)$today->diffInDays($end, true) + 1;
             $perDay          = '0';
             if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                 $perDay = bcdiv($leftToSpend, (string)$days);

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

@@ -46,7 +46,7 @@ class DateRequest extends FormRequest
     {
         $start = $this->getCarbonDate('start');
         $end   = $this->getCarbonDate('end');
-        if ($start->diffInYears($end) > 5) {
+        if ($start->diffInYears($end, true) > 5) {
             throw new FireflyException('Date range out of range.');
         }
 

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
@@ -57,7 +58,6 @@ class StoreRequest extends FormRequest
             'active'           => ['active', 'boolean'],
         ];
         $data             = $this->getAllData($fields);
-
         $data['triggers'] = $this->getRuleTriggers();
         $data['actions']  = $this->getRuleActions();
 
@@ -123,7 +123,7 @@ class StoreRequest extends FormRequest
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),
-            'actions.*.value'            => 'required_if:actions.*.type,'.$contextActions.'|ruleActionValue',
+            'actions.*.value'            => [sprintf('required_if:actions.*.type,%s', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
             'actions.*.stop_processing'  => [new IsBoolean()],
             'actions.*.active'           => [new IsBoolean()],
             'strict'                     => [new IsBoolean()],

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

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Rule;
 
 use FireflyIII\Models\Rule;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
@@ -140,7 +141,7 @@ class UpdateRequest extends FormRequest
             'triggers.*.stop_processing' => [new IsBoolean()],
             'triggers.*.active'          => [new IsBoolean()],
             'actions.*.type'             => 'required|in:'.implode(',', $validActions),
-            'actions.*.value'            => 'required_if:actions.*.type,'.$contextActions.'|ruleActionValue',
+            'actions.*.value'            => [sprintf('required_if:actions.*.type,%s', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
             'actions.*.stop_processing'  => [new IsBoolean()],
             'actions.*.active'           => [new IsBoolean()],
             'strict'                     => [new IsBoolean()],

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

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ValidateExpressionRequest.php
+ * Copyright (c) 2024 Michael Thomas
+ *
+ * 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\Models\Rule;
+
+use FireflyIII\Rules\IsValidActionExpression;
+use FireflyIII\Support\Request\ChecksLogin;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class ValidateExpressionRequest
+ */
+class ValidateExpressionRequest extends FormRequest
+{
+    use ChecksLogin;
+
+    public function rules(): array
+    {
+        return ['expression' => ['required', new IsValidActionExpression()]];
+    }
+}

app/Api/V2/Controllers/Controller.php

@@ -158,7 +158,8 @@ class Controller extends BaseController
 
         // the transformer, at this point, needs to collect information that ALL items in the collection
         // require, like meta-data and stuff like that, and save it for later.
-        $transformer->collectMetaData($objects);
+        $objects  = $transformer->collectMetaData($objects);
+        $paginator->setCollection($objects);
 
         $resource = new FractalCollection($objects, $transformer, $key);
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

app/Api/V2/Controllers/Model/Account/IndexController.php

@@ -63,13 +63,16 @@ class IndexController extends Controller
     public function index(IndexRequest $request): JsonResponse
     {
         $this->repository->resetAccountOrder();
-        $types       = $request->getAccountTypes();
-        $accounts    = $this->repository->getAccountsByType($types);
-        $pageSize    = $this->parameters->get('limit');
-        $count       = $accounts->count();
-        $accounts    = $accounts->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
-        $transformer = new AccountTransformer();
+        $types        = $request->getAccountTypes();
+        $instructions = $request->getSortInstructions('accounts');
+        $accounts     = $this->repository->getAccountsByType($types, $instructions);
+        $pageSize     = $this->parameters->get('limit');
+        $count        = $accounts->count();
+        $accounts     = $accounts->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $transformer  = new AccountTransformer();
+
+        $this->parameters->set('sort', $instructions);
         $transformer->setParameters($this->parameters); // give params to transformer
 
         return response()

app/Api/V2/Controllers/Model/Account/UpdateController.php

@@ -0,0 +1,79 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2024 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\V2\Controllers\Model\Account;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Account\UpdateRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Transformers\V2\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+
+class UpdateController extends Controller
+{
+    public const string RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                // new way of user group validation
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO this endpoint is not yet reachable.
+     */
+    public function update(UpdateRequest $request, Account $account): JsonResponse
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $data         = $request->getUpdateData();
+        $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
+        $account      = $this->repository->update($account, $data);
+        $account->refresh();
+        app('preferences')->mark();
+
+        $transformer  = new AccountTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('accounts', $account, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

app/Api/V2/Controllers/Summary/BasicController.php

@@ -298,7 +298,7 @@ class BasicController extends Controller
             app('log')->debug(sprintf('Amount left is %s', $left));
 
             // how much left per day?
-            $days                    = $today->diffInDays($end) + 1;
+            $days                    = (int) $today->diffInDays($end, true) + 1;
             $perDay                  = '0';
             $perDayNative            = '0';
             if (0 !== $days && bccomp($left, '0') > -1) {

app/Api/V2/Request/Model/Account/IndexRequest.php

@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetSortInstructions;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
@@ -39,6 +40,14 @@ class IndexRequest extends FormRequest
     use AccountFilter;
     use ChecksLogin;
     use ConvertsDataTypes;
+    use GetSortInstructions;
+
+    public function getAccountTypes(): array
+    {
+        $type = (string)$this->get('type', 'default');
+
+        return $this->mapAccountTypes($type);
+    }
 
     /**
      * Get all data from the request.
@@ -48,13 +57,6 @@ class IndexRequest extends FormRequest
         return $this->getCarbonDate('date');
     }
 
-    public function getAccountTypes(): array
-    {
-        $type = (string)$this->get('type', 'default');
-
-        return $this->mapAccountTypes($type);
-    }
-
     /**
      * The rules that the incoming request must be matched against.
      */

app/Api/V2/Request/Model/Account/UpdateRequest.php

@@ -0,0 +1,116 @@
+<?php
+/*
+ * UpdateRequest.php
+ * Copyright (c) 2024 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\V2\Request\Model\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Location;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\UniqueAccountNumber;
+use FireflyIII\Rules\UniqueIban;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateRequest extends FormRequest
+{
+    use AppendsLocationData;
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    /**
+     * TODO is a duplicate of the v1 update thing.
+     */
+    public function getUpdateData(): array
+    {
+        $fields = [
+            'name'                    => ['name', 'convertString'],
+            'active'                  => ['active', 'boolean'],
+            'include_net_worth'       => ['include_net_worth', 'boolean'],
+            'account_type_name'       => ['type', 'convertString'],
+            'virtual_balance'         => ['virtual_balance', 'convertString'],
+            'iban'                    => ['iban', 'convertString'],
+            'BIC'                     => ['bic', 'convertString'],
+            'account_number'          => ['account_number', 'convertString'],
+            'account_role'            => ['account_role', 'convertString'],
+            'liability_type'          => ['liability_type', 'convertString'],
+            'opening_balance'         => ['opening_balance', 'convertString'],
+            'opening_balance_date'    => ['opening_balance_date', 'convertDateTime'],
+            'cc_type'                 => ['credit_card_type', 'convertString'],
+            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertDateTime'],
+            'notes'                   => ['notes', 'stringWithNewlines'],
+            'interest'                => ['interest', 'convertString'],
+            'interest_period'         => ['interest_period', 'convertString'],
+            'order'                   => ['order', 'convertInteger'],
+            'currency_id'             => ['currency_id', 'convertInteger'],
+            'currency_code'           => ['currency_code', 'convertString'],
+            'liability_direction'     => ['liability_direction', 'convertString'],
+            'liability_amount'        => ['liability_amount', 'convertString'],
+            'liability_start_date'    => ['liability_start_date', 'date'],
+        ];
+        $data   = $this->getAllData($fields);
+
+        return $this->appendLocationData($data, null);
+    }
+
+    /**
+     * TODO is a duplicate of the v1 UpdateRequest method.
+     *
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        /** @var Account $account */
+        $account        = $this->route()->parameter('account');
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+
+        $rules          = [
+            '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',
+            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))],
+            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            'virtual_balance'      => 'numeric|nullable',
+            'order'                => 'numeric|nullable',
+            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            '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),
+            'credit_card_type'     => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes),
+            'monthly_payment_date' => 'date|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
+            'liability_direction'  => 'required_if:type,liability|in:credit,debit',
+            'interest'             => 'required_if:type,liability|min:0|max:100|numeric',
+            'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
+            'notes'                => 'min:0|max:32768',
+        ];
+
+        return Location::requestRules($rules);
+    }
+}

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -29,6 +29,7 @@ use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetSortInstructions;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
@@ -40,6 +41,7 @@ class InfiniteListRequest extends FormRequest
     use AccountFilter;
     use ChecksLogin;
     use ConvertsDataTypes;
+    use GetSortInstructions;
     use TransactionFilter;
 
     public function buildParams(): string
@@ -97,31 +99,6 @@ class InfiniteListRequest extends FormRequest
         return 0 === $page || $page > 65536 ? 1 : $page;
     }
 
-    public function getSortInstructions(string $key): array
-    {
-        $allowed = config(sprintf('firefly.sorting.allowed.%s', $key));
-        $set     = $this->get('sorting', []);
-        $result  = [];
-        if (0 === count($set)) {
-            return [];
-        }
-        foreach ($set as $info) {
-            $column          = $info['column'] ?? 'NOPE';
-            $direction       = $info['direction'] ?? 'NOPE';
-            if ('asc' !== $direction && 'desc' !== $direction) {
-                // skip invalid direction
-                continue;
-            }
-            if (false === in_array($column, $allowed, true)) {
-                // skip invalid column
-                continue;
-            }
-            $result[$column] = $direction;
-        }
-
-        return $result;
-    }
-
     public function getTransactionTypes(): array
     {
         $type = (string)$this->get('type', 'default');

app/Console/Commands/System/ForceDecimalSize.php

@@ -53,40 +53,40 @@ class ForceDecimalSize extends Command
 {
     use ShowsFriendlyMessages;
 
-    protected $description      = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
-    protected $signature        = 'firefly-iii:force-decimal-size';
+    protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
+    protected $signature   = 'firefly-iii:force-decimal-size';
     private string $cast;
     private array  $classes
-                                = [
-                                    'accounts'                 => Account::class,
-                                    'auto_budgets'             => AutoBudget::class,
-                                    'available_budgets'        => AvailableBudget::class,
-                                    'bills'                    => Bill::class,
-                                    'budget_limits'            => BudgetLimit::class,
-                                    'piggy_bank_events'        => PiggyBankEvent::class,
-                                    'piggy_bank_repetitions'   => PiggyBankRepetition::class,
-                                    'piggy_banks'              => PiggyBank::class,
-                                    'recurrences_transactions' => RecurrenceTransaction::class,
-                                    'transactions'             => Transaction::class,
-                                ];
+                           = [
+            'accounts'                 => Account::class,
+            'auto_budgets'             => AutoBudget::class,
+            'available_budgets'        => AvailableBudget::class,
+            'bills'                    => Bill::class,
+            'budget_limits'            => BudgetLimit::class,
+            'piggy_bank_events'        => PiggyBankEvent::class,
+            'piggy_bank_repetitions'   => PiggyBankRepetition::class,
+            'piggy_banks'              => PiggyBank::class,
+            'recurrences_transactions' => RecurrenceTransaction::class,
+            'transactions'             => Transaction::class,
+        ];
 
     private string $operator;
     private string $regularExpression;
     private array  $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'],
-                                ];
+                           = [
+            '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'],
+        ];
 
     /**
      * Execute the console command.

app/Console/Commands/System/LaravelPassportKeys.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * LaravelPassportKeys.php
+ * Copyright (c) 2024 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\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Symfony\Component\Console\Command\Command as CommandAlias;
+
+class LaravelPassportKeys extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:laravel-passport-keys';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Calls the Laravel "passport:keys" but doesn\'t exit 1.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        Artisan::call('passport:keys --no-interaction', []);
+        $result = Artisan::output();
+        if (str_contains($result, 'Encryption keys already exist')) {
+            $this->friendlyInfo('Encryption keys exist already.');
+
+            return CommandAlias::SUCCESS;
+        }
+        $this->friendlyPositive('Encryption keys have been created, nice!');
+
+        return CommandAlias::SUCCESS;
+    }
+}

app/Console/Commands/Tools/ApplyRules.php

@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * ApplyRules.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);

app/Console/Commands/Tools/Cron.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * Cron.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,7 +17,7 @@
  * 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/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);

app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php

@@ -110,7 +110,7 @@ class AppendBudgetLimitPeriods extends Command
             return 'daily';
         }
         // is weekly
-        if ('1' === $limit->start_date->format('N') && '7' === $limit->end_date->format('N') && 6 === $limit->end_date->diffInDays($limit->start_date)) {
+        if ('1' === $limit->start_date->format('N') && '7' === $limit->end_date->format('N') && 6 === (int)$limit->end_date->diffInDays($limit->start_date, true)) {
             return 'weekly';
         }
 
@@ -129,7 +129,7 @@ class AppendBudgetLimitPeriods extends Command
         if (
             in_array($limit->start_date->format('j-n'), $start, true) // start of quarter
             && in_array($limit->end_date->format('j-n'), $end, true) // end of quarter
-            && 2 === $limit->start_date->diffInMonths($limit->end_date)
+            && 2 === (int)$limit->start_date->diffInMonths($limit->end_date, true)
         ) {
             return 'quarterly';
         }
@@ -139,7 +139,7 @@ class AppendBudgetLimitPeriods extends Command
         if (
             in_array($limit->start_date->format('j-n'), $start, true) // start of quarter
             && in_array($limit->end_date->format('j-n'), $end, true) // end of quarter
-            && 5 === $limit->start_date->diffInMonths($limit->end_date)
+            && 5 === (int)$limit->start_date->diffInMonths($limit->end_date, true)
         ) {
             return 'half_year';
         }

app/Console/Commands/Upgrade/MigrateRuleActions.php

@@ -0,0 +1,182 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * MigrateRuleActions.php
+ * Copyright (c) 2024 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\Console\Commands\Upgrade;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Models\RuleAction;
+use Illuminate\Console\Command;
+
+class MigrateRuleActions extends Command
+{
+    use ShowsFriendlyMessages;
+
+    public const string CONFIG_NAME = '610_migrate_rule_actions';
+
+    protected $description          = 'Migrate rule actions away from expression engine';
+
+    protected $signature            = 'firefly-iii:migrate-rule-actions {--F|force : Force the execution of this command.}';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        if ($this->isExecuted() && true !== $this->option('force')) {
+            $this->friendlyInfo('This command has already been executed.');
+
+            return 0;
+        }
+        if (false === config('firefly.feature_flags.expression_engine')) {
+            $this->friendlyInfo('Expression engine is not enabled. Nothing to do.');
+
+            return 0;
+        }
+        $this->replaceEqualSign();
+        $this->replaceObsoleteActions();
+
+        return 0;
+    }
+
+    private function isExecuted(): bool
+    {
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        if (null !== $configVar) {
+            return (bool)$configVar->data;
+        }
+
+        return false;
+    }
+
+    private function replaceEqualSign(): void
+    {
+        $count   = 0;
+        $actions = RuleAction::get();
+
+        /** @var RuleAction $action */
+        foreach ($actions as $action) {
+            if (str_starts_with($action->action_value, '=')) {
+                $action->action_value = sprintf('%s%s', '\=', substr($action->action_value, 1));
+                $action->save();
+                ++$count;
+            }
+        }
+        if ($count > 0) {
+            $this->friendlyInfo(sprintf('Upgrading %d rule action(s) for the new expression engine.', $count));
+        }
+        if (0 === $count) {
+            $this->friendlyInfo('All rule actions are up to date.');
+        }
+    }
+
+    private function replaceObsoleteActions(): void
+    {
+        $obsolete = [
+            'append_description',
+            'prepend_description',
+            'append_notes',
+            'prepend_notes',
+            'append_descr_to_notes',
+            'append_notes_to_descr',
+            'move_descr_to_notes',
+            'move_notes_to_descr',
+        ];
+        $actions  = RuleAction::whereIn('action_type', $obsolete)->get();
+
+        /** @var RuleAction $action */
+        foreach ($actions as $action) {
+            $oldType = $action->action_type;
+
+            switch ($action->action_type) {
+                default:
+                    $this->friendlyError(sprintf('Cannot deal with action type "%s", skip it.', $action->action_type));
+
+                    break;
+
+                case 'append_description':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = sprintf('=description~"%s"', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'prepend_description':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = sprintf('="%s"~description', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = sprintf('=notes~"%s"', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'prepend_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = sprintf('="%s"~notes', str_replace('"', '\"', $action->action_value));
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_descr_to_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = '=notes~" "~description';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'append_notes_to_descr':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = '=description~" "~notes';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'move_descr_to_notes':
+                    $action->action_type  = 'set_notes';
+                    $action->action_value = '=description';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+
+                case 'move_notes_to_descr':
+                    $action->action_type  = 'set_description';
+                    $action->action_value = '=notes';
+                    $action->save();
+                    $this->friendlyInfo(sprintf('Upgraded action #%d from "%s" to "%s".', $action->id, $oldType, $action->action_type));
+
+                    break;
+            }
+        }
+    }
+}

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -63,6 +63,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:upgrade-liabilities',
             'firefly-iii:liabilities-600',
             'firefly-iii:budget-limit-periods',
+            'firefly-iii:migrate-rule-actions',
             'firefly-iii:restore-oauth-keys',
             // also just in case, some integrity commands:
             'firefly-iii:create-group-memberships',

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -26,11 +26,11 @@ class UpgradeSkeleton extends Command
     {
         $start = microtime(true);
         if ($this->isExecuted() && true !== $this->option('force')) {
-            $this->info('FRIENDLY This command has already been executed.');
+            $this->friendlyInfo('This command has already been executed.');
 
             return 0;
         }
-        $this->warn('Congrats, you found the skeleton command. Boo!');
+        $this->friendlyWarning('Congrats, you found the skeleton command. Boo!');
 
         //$this->markAsExecuted();
 

app/Generator/Report/ReportGeneratorFactory.php

@@ -40,12 +40,12 @@ class ReportGeneratorFactory
     {
         $period = 'Month';
         // more than two months date difference means year report.
-        if ($start->diffInMonths($end) > 1) {
+        if ($start->diffInMonths($end, true) > 1) {
             $period = 'Year';
         }
 
-        // more than one year date difference means multi year report.
-        if ($start->diffInMonths($end) > 12) {
+        // more than one year date difference means multi-year report.
+        if ($start->diffInMonths($end, true) > 12) {
             $period = 'MultiYear';
         }
 

app/Handlers/Events/UserEventHandler.php

@@ -405,7 +405,7 @@ class UserEventHandler
             }
             // clean up old entries (6 months)
             $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $preference[$index]['time']);
-            if (false !== $carbon && $carbon->diffInMonths(today()) > 6) {
+            if (false !== $carbon && $carbon->diffInMonths(today(), true) > 6) {
                 app('log')->debug(sprintf('Entry for %s is very old, remove it.', $row['ip']));
                 unset($preference[$index]);
             }

app/Helpers/Attachments/AttachmentHelper.php

@@ -236,7 +236,9 @@ class AttachmentHelper implements AttachmentHelperInterface
             $fileObject->rewind();
 
             if (0 === $file->getSize()) {
-                throw new FireflyException('Cannot upload empty or non-existent file.');
+                $this->errors->add('attachments', trans('validation.file_zero_length'));
+
+                return null;
             }
 
             $content              = (string)$fileObject->fread($file->getSize());

app/Helpers/Collector/Extensions/CollectorProperties.php

@@ -36,7 +36,7 @@ trait CollectorProperties
     public const string TEST = 'Test';
 
     /** @var array<int, string> */
-    public array $sorting;
+    public array    $sorting;
     private ?int    $endRow;
     private bool    $expandGroupSearch;
     private array   $fields;

app/Http/Controllers/Account/ReconcileController.php

@@ -75,7 +75,7 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
+    public function reconcile(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         if (!$this->isEditableAccount($account)) {
             return $this->redirectAccountToAccount($account);

app/Http/Controllers/Account/ShowController.php

@@ -75,7 +75,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         $objectType       = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 

app/Http/Controllers/Auth/LoginController.php

@@ -80,7 +80,18 @@ class LoginController extends Controller
         Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username())));
         app('log')->debug('User is trying to login.');
 
-        $this->validateLogin($request);
+        try {
+            $this->validateLogin($request);
+        } catch (ValidationException $e) {
+            return redirect(route('login'))
+                ->withErrors(
+                    [
+                        $this->username => trans('auth.failed'),
+                    ]
+                )
+                ->onlyInput($this->username)
+            ;
+        }
         app('log')->debug('Login data is present.');
 
         // Copied directly from AuthenticatesUsers, but with logging added:
@@ -91,7 +102,6 @@ class LoginController extends Controller
             Log::channel('audit')->warning(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
             app('log')->error(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
             $this->fireLockoutEvent($request);
-
             $this->sendLockoutResponse($request);
         }
         // Copied directly from AuthenticatesUsers, but with logging added:

app/Http/Controllers/Budget/IndexController.php

@@ -85,7 +85,7 @@ class IndexController extends Controller
      *
      * @throws FireflyException
      *                                              */
-    public function index(Carbon $start = null, Carbon $end = null)
+    public function index(?Carbon $start = null, ?Carbon $end = null)
     {
         $this->abRepository->cleanup();
         app('log')->debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));

app/Http/Controllers/Budget/ShowController.php

@@ -75,7 +75,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
+    public function noBudget(Request $request, ?Carbon $start = null, ?Carbon $end = null)
     {
         // @var Carbon $start
         $start ??= session('start');

app/Http/Controllers/Category/NoCategoryController.php

@@ -70,7 +70,7 @@ class NoCategoryController extends Controller
      *
      * @throws FireflyException
      */
-    public function show(Request $request, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, ?Carbon $start = null, ?Carbon $end = null)
     {
         app('log')->debug('Start of noCategory()');
         // @var Carbon $start

app/Http/Controllers/Category/ShowController.php

@@ -71,7 +71,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Category $category, ?Carbon $start = null, ?Carbon $end = null)
     {
         // @var Carbon $start
         $start ??= session('start', today(config('app.timezone'))->startOfMonth());

app/Http/Controllers/Chart/ReportController.php

@@ -143,7 +143,7 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return response()->json($cache->get());
+            // return response()->json($cache->get());
         }
 
         app('log')->debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
@@ -220,11 +220,14 @@ class ReportController extends Controller
                 $currentEnd = app('navigation')->endOfPeriod($currentEnd, $preferredRange);
             }
             while ($currentStart <= $currentEnd) {
-                $key                        = $currentStart->format($format);
-                $title                      = $currentStart->isoFormat($titleFormat);
-                $income['entries'][$title]  = app('steam')->bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);
-                $expense['entries'][$title] = app('steam')->bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);
-                $currentStart               = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
+                $key          = $currentStart->format($format);
+                $title        = $currentStart->isoFormat($titleFormat);
+                // #8663 make sure the period exists in the data previously collected.
+                if (array_key_exists($key, $currency)) {
+                    $income['entries'][$title]  = app('steam')->bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);
+                    $expense['entries'][$title] = app('steam')->bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);
+                }
+                $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
             }
 
             $chartData[]  = $income;

app/Http/Controllers/HomeController.php

@@ -89,7 +89,7 @@ class HomeController extends Controller
         $label         = $request->get('label');
         $isCustomRange = false;
 
-        app('log')->debug('Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
+        app('log')->debug('dateRange: 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')) {
@@ -97,10 +97,10 @@ class HomeController extends Controller
             app('log')->debug('Range is now marked as "custom".');
         }
 
-        $diff          = $start->diffInDays($end) + 1;
+        $diff          = $start->diffInDays($end, true) + 1;
 
-        if ($diff > 50) {
-            $request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => $diff]));
+        if ($diff > 366) {
+            $request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => (int)$diff]));
         }
 
         $request->session()->put('is_custom_range', $isCustomRange);

app/Http/Controllers/Json/BoxController.php

@@ -113,7 +113,7 @@ class BoxController extends Controller
         $spentAmount       = $spent[$currency->id]['sum'] ?? '0';
         app('log')->debug(sprintf('Spent for default currency for all budgets in this period: %s', $spentAmount));
 
-        $days              = $today->between($start, $end) ? $today->diffInDays($start) + 1 : $end->diffInDays($start) + 1;
+        $days              = (int)($today->between($start, $end) ? $today->diffInDays($start, true) + 1 : $end->diffInDays($start, true) + 1);
         app('log')->debug(sprintf('Number of days left: %d', $days));
         $spentPerDay       = bcdiv($spentAmount, (string)$days);
         app('log')->debug(sprintf('Available to spend per day: %s', $spentPerDay));

app/Http/Controllers/Json/IntroController.php

@@ -38,7 +38,7 @@ class IntroController extends Controller
     /**
      * Returns the introduction wizard for a page.
      */
-    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
+    public function getIntroSteps(string $route, ?string $specificPage = null): JsonResponse
     {
         app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
         $specificPage ??= '';
@@ -91,7 +91,7 @@ class IntroController extends Controller
      *
      * @throws FireflyException
      */
-    public function postEnable(string $route, string $specialPage = null): JsonResponse
+    public function postEnable(string $route, ?string $specialPage = null): JsonResponse
     {
         $specialPage ??= '';
         $route = str_replace('.', '_', $route);
@@ -111,7 +111,7 @@ class IntroController extends Controller
      *
      * @throws FireflyException
      */
-    public function postFinished(string $route, string $specialPage = null): JsonResponse
+    public function postFinished(string $route, ?string $specialPage = null): JsonResponse
     {
         $specialPage ??= '';
         $key = 'shown_demo_'.$route;

app/Http/Controllers/Json/ReconcileController.php

@@ -67,7 +67,7 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      */
-    public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
+    public function overview(Request $request, ?Account $account = null, ?Carbon $start = null, ?Carbon $end = null): JsonResponse
     {
         $startBalance    = $request->get('startBalance');
         $endBalance      = $request->get('endBalance');
@@ -177,7 +177,7 @@ class ReconcileController extends Controller
      *
      * @throws FireflyException
      */
-    public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
+    public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
         if (null === $start || null === $end) {
             throw new FireflyException('Invalid dates submitted.');

app/Http/Controllers/Rule/CreateController.php

@@ -76,7 +76,7 @@ class CreateController extends Controller
      *
      * @throws FireflyException
      */
-    public function create(Request $request, RuleGroup $ruleGroup = null)
+    public function create(Request $request, ?RuleGroup $ruleGroup = null)
     {
         $this->createDefaultRuleGroup();
         $preFilled    = [

app/Http/Controllers/TagController.php

@@ -215,7 +215,7 @@ class TagController extends Controller
      *
      * @throws FireflyException
      */
-    public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Tag $tag, ?Carbon $start = null, ?Carbon $end = null)
     {
         // default values:
         $subTitleIcon = 'fa-tag';
@@ -312,6 +312,9 @@ class TagController extends Controller
         if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
         }
+        if (count($this->attachmentsHelper->getErrors()->get('attachments')) > 0) {
+            $request->session()->flash('error', $this->attachmentsHelper->getErrors()->get('attachments'));
+        }
         $redirect = redirect($this->getPreviousUrl('tags.create.url'));
         if (1 === (int)$request->get('create_another')) {
             session()->put('tags.create.fromStore', true);
@@ -347,6 +350,9 @@ class TagController extends Controller
         if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
         }
+        if (count($this->attachmentsHelper->getErrors()->get('attachments')) > 0) {
+            $request->session()->flash('error', $this->attachmentsHelper->getErrors()->get('attachments'));
+        }
         $redirect = redirect($this->getPreviousUrl('tags.edit.url'));
         if (1 === (int)$request->get('return_to_edit')) {
             session()->put('tags.edit.fromUpdate', true);

app/Http/Controllers/Transaction/IndexController.php

@@ -69,7 +69,7 @@ class IndexController extends Controller
      *
      * @throws FireflyException
      */
-    public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
+    public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null)
     {
         if ('transfers' === $objectType) {
             $objectType = 'transfer';

app/Http/Middleware/SecureHeaders.php

@@ -50,12 +50,12 @@ class SecureHeaders
         $csp                = [
             "default-src 'none'",
             "object-src 'none'",
-            sprintf("script-src 'unsafe-eval' 'strict-dynamic' 'self' 'unsafe-inline' 'nonce-%1s' %2s", $nonce, $trackingScriptSrc),
+            sprintf("script-src 'unsafe-eval' 'strict-dynamic' 'nonce-%1s'", $nonce),
             "style-src 'unsafe-inline' 'self'",
             "base-uri 'self'",
             "font-src 'self' data:",
             sprintf("connect-src 'self' %s", $trackingScriptSrc),
-            sprintf("img-src data: 'strict-dynamic' 'self' *.tile.openstreetmap.org %s", $trackingScriptSrc),
+            sprintf("img-src 'self' 'nonce-%1s'", $nonce),
             "manifest-src 'self'",
         ];
 

app/Http/Middleware/TrustProxies.php

@@ -34,10 +34,10 @@ class TrustProxies extends Middleware
     // After...
     protected $headers
         = Request::HEADER_X_FORWARDED_FOR |
-          Request::HEADER_X_FORWARDED_HOST |
-          Request::HEADER_X_FORWARDED_PORT |
-          Request::HEADER_X_FORWARDED_PROTO |
-          Request::HEADER_X_FORWARDED_AWS_ELB;
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 
     /**
      * TrustProxies constructor.

app/Http/Requests/RuleFormRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Requests;
 
 use FireflyIII\Models\Rule;
+use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
@@ -147,7 +148,7 @@ class RuleFormRequest extends FormRequest
             'triggers.*.type'  => 'required|in:'.implode(',', $validTriggers),
             '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:1024|ruleActionValue', $contextActions),
+            'actions.*.value'  => [sprintf('required_if:actions.*.type,%s|min:0|max:1024', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
             'strict'           => 'in:0,1',
         ];
 

app/Jobs/WarnAboutBills.php

@@ -128,7 +128,7 @@ class WarnAboutBills implements ShouldQueue
         $today  = clone $this->date;
         $carbon = clone $bill->{$field};
 
-        return $today->diffInDays($carbon, false);
+        return (int) $today->diffInDays($carbon);
     }
 
     private function sendWarning(Bill $bill, string $field): void

app/Models/Account.php

@@ -122,13 +122,13 @@ class Account extends Model
 
     protected $casts
                                      = [
-                                         'created_at' => 'datetime',
-                                         'updated_at' => 'datetime',
-                                         'user_id'    => 'integer',
-                                         'deleted_at' => 'datetime',
-                                         'active'     => 'boolean',
-                                         'encrypted'  => 'boolean',
-                                     ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'user_id'    => 'integer',
+            'deleted_at' => 'datetime',
+            'active'     => 'boolean',
+            'encrypted'  => 'boolean',
+        ];
 
     protected $fillable              = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];
 
@@ -274,6 +274,13 @@ class Account extends Model
         );
     }
 
+    protected function iban(): Attribute
+    {
+        return Attribute::make(
+            get: static fn ($value) => null === $value ? null : trim(str_replace(' ', '', (string)$value)),
+        );
+    }
+
     protected function order(): Attribute
     {
         return Attribute::make(

app/Models/AccountMeta.php

@@ -59,9 +59,9 @@ class AccountMeta extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+        ];
 
     protected $fillable = ['account_id', 'name', 'data'];
 

app/Models/AccountType.php

@@ -72,9 +72,9 @@ class AccountType extends Model
 
     protected $casts
                                          = [
-                                             'created_at' => 'datetime',
-                                             'updated_at' => 'datetime',
-                                         ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+        ];
 
     protected $fillable                  = ['type'];
 

app/Models/Attachment.php

@@ -97,11 +97,11 @@ class Attachment extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'uploaded'   => 'boolean',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'uploaded'   => 'boolean',
+        ];
 
     protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded'];
 

app/Models/AvailableBudget.php

@@ -80,13 +80,13 @@ class AvailableBudget extends Model
 
     protected $casts
                         = [
-                            'created_at'              => 'datetime',
-                            'updated_at'              => 'datetime',
-                            'deleted_at'              => 'datetime',
-                            'start_date'              => 'date',
-                            'end_date'                => 'date',
-                            'transaction_currency_id' => 'int',
-                        ];
+            'created_at'              => 'datetime',
+            'updated_at'              => 'datetime',
+            'deleted_at'              => 'datetime',
+            'start_date'              => 'date',
+            'end_date'                => 'date',
+            'transaction_currency_id' => 'int',
+        ];
 
     protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date'];
 

app/Models/Bill.php

@@ -114,36 +114,36 @@ class Bill extends Model
 
     protected $casts
                       = [
-                          'created_at'      => 'datetime',
-                          'updated_at'      => 'datetime',
-                          'deleted_at'      => 'datetime',
-                          'date'            => 'date',
-                          'end_date'        => 'date',
-                          'extension_date'  => 'date',
-                          'skip'            => 'int',
-                          'automatch'       => 'boolean',
-                          'active'          => 'boolean',
-                          'name_encrypted'  => 'boolean',
-                          'match_encrypted' => 'boolean',
-                      ];
+            'created_at'      => 'datetime',
+            'updated_at'      => 'datetime',
+            'deleted_at'      => 'datetime',
+            'date'            => 'date',
+            'end_date'        => 'date',
+            'extension_date'  => 'date',
+            'skip'            => 'int',
+            'automatch'       => 'boolean',
+            'active'          => 'boolean',
+            'name_encrypted'  => 'boolean',
+            'match_encrypted' => 'boolean',
+        ];
 
     protected $fillable
                       = [
-                          'name',
-                          'match',
-                          'amount_min',
-                          'user_id',
-                          'user_group_id',
-                          'amount_max',
-                          'date',
-                          'repeat_freq',
-                          'skip',
-                          'automatch',
-                          'active',
-                          'transaction_currency_id',
-                          'end_date',
-                          'extension_date',
-                      ];
+            'name',
+            'match',
+            'amount_min',
+            'user_id',
+            'user_group_id',
+            'amount_max',
+            'date',
+            'repeat_freq',
+            'skip',
+            'automatch',
+            'active',
+            'transaction_currency_id',
+            'end_date',
+            'extension_date',
+        ];
 
     protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];
 

app/Models/Budget.php

@@ -97,12 +97,12 @@ class Budget extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'active'     => 'boolean',
-                            'encrypted'  => 'boolean',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'active'     => 'boolean',
+            'encrypted'  => 'boolean',
+        ];
 
     protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id'];
 

app/Models/BudgetLimit.php

@@ -74,18 +74,18 @@ class BudgetLimit extends Model
 
     protected $casts
                         = [
-                            'created_at'  => 'datetime',
-                            'updated_at'  => 'datetime',
-                            'start_date'  => 'date',
-                            'end_date'    => 'date',
-                            'auto_budget' => 'boolean',
-                        ];
+            'created_at'  => 'datetime',
+            'updated_at'  => 'datetime',
+            'start_date'  => 'date',
+            'end_date'    => 'date',
+            'auto_budget' => 'boolean',
+        ];
     protected $dispatchesEvents
                         = [
-                            'created' => Created::class,
-                            'updated' => Updated::class,
-                            'deleted' => Deleted::class,
-                        ];
+            'created' => Created::class,
+            'updated' => Updated::class,
+            'deleted' => Deleted::class,
+        ];
 
     protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
 

app/Models/Category.php

@@ -86,11 +86,11 @@ class Category extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'encrypted'  => 'boolean',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'encrypted'  => 'boolean',
+        ];
 
     protected $fillable = ['user_id', 'user_group_id', 'name'];
 

app/Models/Configuration.php

@@ -62,10 +62,10 @@ class Configuration extends Model
 
     protected $casts
                      = [
-                         'created_at' => 'datetime',
-                         'updated_at' => 'datetime',
-                         'deleted_at' => 'datetime',
-                     ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+        ];
 
     /** @var string The table to store the data in */
     protected $table = 'configuration';

app/Models/CurrencyExchangeRate.php

@@ -82,13 +82,13 @@ class CurrencyExchangeRate extends Model
 
     protected $casts
                         = [
-                            'created_at'       => 'datetime',
-                            'updated_at'       => 'datetime',
-                            'user_id'          => 'int',
-                            'from_currency_id' => 'int',
-                            'to_currency_id'   => 'int',
-                            'date'             => 'datetime',
-                        ];
+            'created_at'       => 'datetime',
+            'updated_at'       => 'datetime',
+            'user_id'          => 'int',
+            'from_currency_id' => 'int',
+            'to_currency_id'   => 'int',
+            'date'             => 'datetime',
+        ];
     protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate'];
 
     public function fromCurrency(): BelongsTo

app/Models/InvitedUser.php

@@ -70,9 +70,9 @@ class InvitedUser extends Model
 
     protected $casts
                         = [
-                            'expires'  => 'datetime',
-                            'redeemed' => 'boolean',
-                        ];
+            'expires'  => 'datetime',
+            'redeemed' => 'boolean',
+        ];
     protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed'];
 
     /**

app/Models/LinkType.php

@@ -72,11 +72,11 @@ class LinkType extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'editable'   => 'boolean',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'editable'   => 'boolean',
+        ];
 
     protected $fillable = ['name', 'inward', 'outward', 'editable'];
 

app/Models/Location.php

@@ -74,13 +74,13 @@ class Location extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'zoomLevel'  => 'int',
-                            'latitude'   => 'float',
-                            'longitude'  => 'float',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'zoomLevel'  => 'int',
+            'latitude'   => 'float',
+            'longitude'  => 'float',
+        ];
 
     protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level'];
 

app/Models/Note.php

@@ -69,10 +69,10 @@ class Note extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+        ];
 
     protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type'];
 

app/Models/ObjectGroup.php

@@ -79,11 +79,11 @@ class ObjectGroup extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'user_id'    => 'integer',
-                            'deleted_at' => 'datetime',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'user_id'    => 'integer',
+            'deleted_at' => 'datetime',
+        ];
     protected $fillable = ['title', 'order', 'user_id', 'user_group_id'];
 
     /**

app/Models/PiggyBank.php

@@ -92,15 +92,15 @@ class PiggyBank extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'startdate'  => 'date',
-                            'targetdate' => 'date',
-                            'order'      => 'int',
-                            'active'     => 'boolean',
-                            'encrypted'  => 'boolean',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'startdate'  => 'date',
+            'targetdate' => 'date',
+            'order'      => 'int',
+            'active'     => 'boolean',
+            'encrypted'  => 'boolean',
+        ];
 
     protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active'];
 

app/Models/PiggyBankEvent.php

@@ -63,10 +63,10 @@ class PiggyBankEvent extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'date'       => 'date',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'date'       => 'date',
+        ];
 
     protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
 

app/Models/PiggyBankRepetition.php

@@ -64,11 +64,11 @@ class PiggyBankRepetition extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'startdate'  => 'date',
-                            'targetdate' => 'date',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'startdate'  => 'date',
+            'targetdate' => 'date',
+        ];
 
     protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];
 

app/Models/Preference.php

@@ -63,10 +63,10 @@ class Preference extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'data'       => 'array',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'data'       => 'array',
+        ];
 
     protected $fillable = ['user_id', 'data', 'name'];
 

app/Models/Recurrence.php

@@ -104,19 +104,19 @@ class Recurrence extends Model
 
     protected $casts
                      = [
-                         'created_at'   => 'datetime',
-                         'updated_at'   => 'datetime',
-                         'deleted_at'   => 'datetime',
-                         'title'        => 'string',
-                         'id'           => 'int',
-                         'description'  => 'string',
-                         'first_date'   => 'date',
-                         'repeat_until' => 'date',
-                         'latest_date'  => 'date',
-                         'repetitions'  => 'int',
-                         'active'       => 'bool',
-                         'apply_rules'  => 'bool',
-                     ];
+            'created_at'   => 'datetime',
+            'updated_at'   => 'datetime',
+            'deleted_at'   => 'datetime',
+            'title'        => 'string',
+            'id'           => 'int',
+            'description'  => 'string',
+            'first_date'   => 'date',
+            'repeat_until' => 'date',
+            'latest_date'  => 'date',
+            'repetitions'  => 'int',
+            'active'       => 'bool',
+            'apply_rules'  => 'bool',
+        ];
 
     protected $fillable
                      = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];

app/Models/RecurrenceMeta.php

@@ -67,12 +67,12 @@ class RecurrenceMeta extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'name'       => 'string',
-                            'value'      => 'string',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'name'       => 'string',
+            'value'      => 'string',
+        ];
 
     protected $fillable = ['recurrence_id', 'name', 'value'];
 

app/Models/RecurrenceRepetition.php

@@ -76,14 +76,14 @@ class RecurrenceRepetition extends Model
 
     protected $casts
                                            = [
-                                               'created_at'        => 'datetime',
-                                               'updated_at'        => 'datetime',
-                                               'deleted_at'        => 'datetime',
-                                               'repetition_type'   => 'string',
-                                               'repetition_moment' => 'string',
-                                               'repetition_skip'   => 'int',
-                                               'weekend'           => 'int',
-                                           ];
+            'created_at'        => 'datetime',
+            'updated_at'        => 'datetime',
+            'deleted_at'        => 'datetime',
+            'repetition_type'   => 'string',
+            'repetition_moment' => 'string',
+            'repetition_skip'   => 'int',
+            'weekend'           => 'int',
+        ];
 
     protected $fillable                    = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip'];
 

app/Models/RecurrenceTransaction.php

@@ -91,25 +91,25 @@ class RecurrenceTransaction extends Model
 
     protected $casts
                      = [
-                         'created_at'     => 'datetime',
-                         'updated_at'     => 'datetime',
-                         'deleted_at'     => 'datetime',
-                         'amount'         => 'string',
-                         'foreign_amount' => 'string',
-                         'description'    => 'string',
-                     ];
+            'created_at'     => 'datetime',
+            'updated_at'     => 'datetime',
+            'deleted_at'     => 'datetime',
+            'amount'         => 'string',
+            'foreign_amount' => 'string',
+            'description'    => 'string',
+        ];
 
     protected $fillable
                      = [
-                         'recurrence_id',
-                         'transaction_currency_id',
-                         'foreign_currency_id',
-                         'source_id',
-                         'destination_id',
-                         'amount',
-                         'foreign_amount',
-                         'description',
-                     ];
+            'recurrence_id',
+            'transaction_currency_id',
+            'foreign_currency_id',
+            'source_id',
+            'destination_id',
+            'amount',
+            'foreign_amount',
+            'description',
+        ];
 
     /** @var string The table to store the data in */
     protected $table = 'recurrences_transactions';

app/Models/RecurrenceTransactionMeta.php

@@ -67,12 +67,12 @@ class RecurrenceTransactionMeta extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'name'       => 'string',
-                            'value'      => 'string',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'name'       => 'string',
+            'value'      => 'string',
+        ];
 
     protected $fillable = ['rt_id', 'name', 'value'];
 

app/Models/Role.php

@@ -62,9 +62,9 @@ class Role extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+        ];
 
     protected $fillable = ['name', 'display_name', 'description'];
 

app/Models/Rule.php

@@ -95,15 +95,15 @@ class Rule extends Model
 
     protected $casts
                         = [
-                            'created_at'      => 'datetime',
-                            'updated_at'      => 'datetime',
-                            'deleted_at'      => 'datetime',
-                            'active'          => 'boolean',
-                            'order'           => 'int',
-                            'stop_processing' => 'boolean',
-                            'id'              => 'int',
-                            'strict'          => 'boolean',
-                        ];
+            'created_at'      => 'datetime',
+            'updated_at'      => 'datetime',
+            'deleted_at'      => 'datetime',
+            'active'          => 'boolean',
+            'order'           => 'int',
+            'stop_processing' => 'boolean',
+            'id'              => 'int',
+            'strict'          => 'boolean',
+        ];
 
     protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict'];
 

app/Models/RuleAction.php

@@ -26,10 +26,13 @@ namespace FireflyIII\Models;
 use Carbon\Carbon;
 use Eloquent;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+use FireflyIII\TransactionRules\Expressions\ActionExpression;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\ExpressionLanguage\SyntaxError;
 
 /**
  * FireflyIII\Models\RuleAction
@@ -66,15 +69,39 @@ class RuleAction extends Model
 
     protected $casts
                         = [
-                            'created_at'      => 'datetime',
-                            'updated_at'      => 'datetime',
-                            'active'          => 'boolean',
-                            'order'           => 'int',
-                            'stop_processing' => 'boolean',
-                        ];
+            'created_at'      => 'datetime',
+            'updated_at'      => 'datetime',
+            'active'          => 'boolean',
+            'order'           => 'int',
+            'stop_processing' => 'boolean',
+        ];
 
     protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing'];
 
+    public function getValue(array $journal): string
+    {
+        if (false === config('firefly.feature_flags.expression_engine')) {
+            Log::debug('Expression engine is disabled, returning action value as string.');
+
+            return (string)$this->action_value;
+        }
+        if (true === config('firefly.feature_flags.expression_engine') && str_starts_with($this->action_value, '\=')) {
+            // return literal string.
+            return substr($this->action_value, 1);
+        }
+        $expr = new ActionExpression($this->action_value);
+
+        try {
+            $result = $expr->evaluate($journal);
+        } catch (SyntaxError $e) {
+            Log::error(sprintf('Expression engine failed to evaluate expression "%s" with error "%s".', $this->action_value, $e->getMessage()));
+            $result = (string)$this->action_value;
+        }
+        Log::debug(sprintf('Expression engine is enabled, result of expression "%s" is "%s".', $this->action_value, $result));
+
+        return $result;
+    }
+
     public function rule(): BelongsTo
     {
         return $this->belongsTo(Rule::class);

app/Models/RuleGroup.php

@@ -85,13 +85,13 @@ class RuleGroup extends Model
 
     protected $casts
                         = [
-                            'created_at'      => 'datetime',
-                            'updated_at'      => 'datetime',
-                            'deleted_at'      => 'datetime',
-                            'active'          => 'boolean',
-                            'stop_processing' => 'boolean',
-                            'order'           => 'int',
-                        ];
+            'created_at'      => 'datetime',
+            'updated_at'      => 'datetime',
+            'deleted_at'      => 'datetime',
+            'active'          => 'boolean',
+            'stop_processing' => 'boolean',
+            'order'           => 'int',
+        ];
 
     protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active'];
 

app/Models/RuleTrigger.php

@@ -66,12 +66,12 @@ class RuleTrigger extends Model
 
     protected $casts
                         = [
-                            'created_at'      => 'datetime',
-                            'updated_at'      => 'datetime',
-                            'active'          => 'boolean',
-                            'order'           => 'int',
-                            'stop_processing' => 'boolean',
-                        ];
+            'created_at'      => 'datetime',
+            'updated_at'      => 'datetime',
+            'active'          => 'boolean',
+            'order'           => 'int',
+            'stop_processing' => 'boolean',
+        ];
 
     protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing'];
 

app/Models/Tag.php

@@ -93,14 +93,14 @@ class Tag extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'date'       => 'date',
-                            'zoomLevel'  => 'int',
-                            'latitude'   => 'float',
-                            'longitude'  => 'float',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'date'       => 'date',
+            'zoomLevel'  => 'int',
+            'latitude'   => 'float',
+            'longitude'  => 'float',
+        ];
 
     protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode'];
 

app/Models/Transaction.php

@@ -99,28 +99,28 @@ class Transaction extends Model
 
     protected $casts
                       = [
-                          'created_at'          => 'datetime',
-                          'updated_at'          => 'datetime',
-                          'deleted_at'          => 'datetime',
-                          'identifier'          => 'int',
-                          'encrypted'           => 'boolean', // model does not have these fields though
-                          'bill_name_encrypted' => 'boolean',
-                          'reconciled'          => 'boolean',
-                          'date'                => 'datetime',
-                      ];
+            'created_at'          => 'datetime',
+            'updated_at'          => 'datetime',
+            'deleted_at'          => 'datetime',
+            'identifier'          => 'int',
+            'encrypted'           => 'boolean', // model does not have these fields though
+            'bill_name_encrypted' => 'boolean',
+            'reconciled'          => 'boolean',
+            'date'                => 'datetime',
+        ];
 
     protected $fillable
                       = [
-                          'account_id',
-                          'transaction_journal_id',
-                          'description',
-                          'amount',
-                          'identifier',
-                          'transaction_currency_id',
-                          'foreign_currency_id',
-                          'foreign_amount',
-                          'reconciled',
-                      ];
+            'account_id',
+            'transaction_journal_id',
+            'description',
+            'amount',
+            'identifier',
+            'transaction_currency_id',
+            'foreign_currency_id',
+            'foreign_amount',
+            'reconciled',
+        ];
 
     protected $hidden = ['encrypted'];
 

app/Models/TransactionCurrency.php

@@ -89,12 +89,12 @@ class TransactionCurrency extends Model
     public ?bool $userGroupEnabled;
     protected $casts
                         = [
-                            'created_at'     => 'datetime',
-                            'updated_at'     => 'datetime',
-                            'deleted_at'     => 'datetime',
-                            'decimal_places' => 'int',
-                            'enabled'        => 'bool',
-                        ];
+            'created_at'     => 'datetime',
+            'updated_at'     => 'datetime',
+            'deleted_at'     => 'datetime',
+            'decimal_places' => 'int',
+            'enabled'        => 'bool',
+        ];
 
     protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled'];
 

app/Models/TransactionGroup.php

@@ -78,13 +78,13 @@ class TransactionGroup extends Model
 
     protected $casts
                         = [
-                            'id'         => 'integer',
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                            'title'      => 'string',
-                            'date'       => 'datetime',
-                        ];
+            'id'         => 'integer',
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+            'title'      => 'string',
+            'date'       => 'datetime',
+        ];
 
     protected $fillable = ['user_id', 'user_group_id', 'title'];
 

app/Models/TransactionJournal.php

@@ -138,32 +138,32 @@ class TransactionJournal extends Model
 
     protected $casts
                       = [
-                          'created_at'    => 'datetime',
-                          'updated_at'    => 'datetime',
-                          'deleted_at'    => 'datetime',
-                          'date'          => 'datetime',
-                          'interest_date' => 'date',
-                          'book_date'     => 'date',
-                          'process_date'  => 'date',
-                          'order'         => 'int',
-                          'tag_count'     => 'int',
-                          'encrypted'     => 'boolean',
-                          'completed'     => 'boolean',
-                      ];
+            'created_at'    => 'datetime',
+            'updated_at'    => 'datetime',
+            'deleted_at'    => 'datetime',
+            'date'          => 'datetime',
+            'interest_date' => 'date',
+            'book_date'     => 'date',
+            'process_date'  => 'date',
+            'order'         => 'int',
+            'tag_count'     => 'int',
+            'encrypted'     => 'boolean',
+            'completed'     => 'boolean',
+        ];
 
     protected $fillable
                       = [
-                          'user_id',
-                          'user_group_id',
-                          'transaction_type_id',
-                          'bill_id',
-                          'tag_count',
-                          'transaction_currency_id',
-                          'description',
-                          'completed',
-                          'order',
-                          'date',
-                      ];
+            'user_id',
+            'user_group_id',
+            'transaction_type_id',
+            'bill_id',
+            'tag_count',
+            'transaction_currency_id',
+            'description',
+            'completed',
+            'order',
+            'date',
+        ];
 
     protected $hidden = ['encrypted'];
 

app/Models/TransactionJournalLink.php

@@ -71,9 +71,9 @@ class TransactionJournalLink extends Model
 
     protected $casts
                      = [
-                         'created_at' => 'datetime',
-                         'updated_at' => 'datetime',
-                     ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+        ];
 
     /** @var string The table to store the data in */
     protected $table = 'journal_links';

app/Models/TransactionJournalMeta.php

@@ -69,10 +69,10 @@ class TransactionJournalMeta extends Model
 
     protected $casts
                         = [
-                            'created_at' => 'datetime',
-                            'updated_at' => 'datetime',
-                            'deleted_at' => 'datetime',
-                        ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+        ];
 
     protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash'];
 

app/Models/TransactionType.php

@@ -73,10 +73,10 @@ class TransactionType extends Model
 
     protected $casts
                                          = [
-                                             'created_at' => 'datetime',
-                                             'updated_at' => 'datetime',
-                                             'deleted_at' => 'datetime',
-                                         ];
+            'created_at' => 'datetime',
+            'updated_at' => 'datetime',
+            'deleted_at' => 'datetime',
+        ];
     protected $fillable                  = ['type'];
 
     /**

app/Models/Webhook.php

@@ -93,11 +93,11 @@ class Webhook extends Model
 
     protected $casts
                         = [
-                            'active'   => 'boolean',
-                            'trigger'  => 'integer',
-                            'response' => 'integer',
-                            'delivery' => 'integer',
-                        ];
+            'active'   => 'boolean',
+            'trigger'  => 'integer',
+            'response' => 'integer',
+            'delivery' => 'integer',
+        ];
     protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];
 
     public static function getDeliveries(): array

app/Providers/AppServiceProvider.php

@@ -25,10 +25,9 @@ namespace FireflyIII\Providers;
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
-use Laravel\Passport\Passport;
-use Laravel\Sanctum\Sanctum;
 
 /**
  * Class AppServiceProvider
@@ -65,9 +64,14 @@ class AppServiceProvider extends ServiceProvider
 
             return '';
         });
-        Blade::if('partialroute', function (string $route) {
-            $name = \Route::getCurrentRoute()->getName() ?? '';
-            if (str_contains($name, $route)) {
+        Blade::if('partialroute', function (string $route, string $firstParam = '') {
+            $name       = Route::getCurrentRoute()->getName() ?? '';
+            if ('' === $firstParam && str_contains($name, $route)) {
+                return true;
+            }
+            $params     = Route::getCurrentRoute()->parameters() ?? [];
+            $objectType = $params['objectType'] ?? '';
+            if ($objectType === $firstParam && str_contains($name, $route)) {
                 return true;
             }
 
@@ -80,7 +84,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        Passport::ignoreMigrations();
-        Sanctum::ignoreMigrations();
+        //        Passport::ignoreMigrations();
+        //        Sanctum::ignoreMigrations();
     }
 }

app/Providers/FireflyServiceProvider.php

@@ -69,9 +69,11 @@ use FireflyIII\Support\Preferences;
 use FireflyIII\Support\Steam;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\TransactionRules\Engine\SearchRuleEngine;
+use FireflyIII\TransactionRules\Expressions\ActionExpressionLanguageProvider;
 use FireflyIII\Validation\FireflyValidator;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 /**
  * Class FireflyServiceProvider.
@@ -200,6 +202,17 @@ class FireflyServiceProvider extends ServiceProvider
             }
         );
 
+        // rule expression language
+        $this->app->singleton(
+            ExpressionLanguage::class,
+            static function () {
+                $expressionLanguage = new ExpressionLanguage();
+                $expressionLanguage->registerProvider(new ActionExpressionLanguageProvider());
+
+                return $expressionLanguage;
+            }
+        );
+
         $this->app->bind(
             RuleEngineInterface::class,
             static function (Application $app) {

app/Repositories/Budget/BudgetLimitRepository.php

@@ -122,7 +122,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         $budgetLimit->delete();
     }
 
-    public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection
+    public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection
     {
         return $this->getAllBudgetLimits($start, $end)->filter(
             static function (BudgetLimit $budgetLimit) use ($currency) {
@@ -131,7 +131,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         );
     }
 
-    public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection
+    public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection
     {
         // both are NULL:
         if (null === $start && null === $end) {
@@ -198,7 +198,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         ;
     }
 
-    public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection
+    public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection
     {
         if (null === $end && null === $start) {
             return $budget->budgetlimits()->with(['transactionCurrency'])->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']);

app/Repositories/Budget/BudgetLimitRepositoryInterface.php

@@ -57,11 +57,11 @@ interface BudgetLimitRepositoryInterface
     /**
      * TODO this method is not multi currency aware.
      */
-    public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection;
+    public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection;
 
-    public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection;
+    public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection;
 
-    public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection;
+    public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection;
 
     public function setUser(null|Authenticatable|User $user): void;
 

app/Repositories/Budget/BudgetRepository.php

@@ -132,7 +132,7 @@ class BudgetRepository implements BudgetRepositoryInterface
 
                     continue;
                 }
-                $total                               = $limit->start_date->diffInDays($limit->end_date) + 1; // include the day itself.
+                $total                               = $limit->start_date->diffInDays($limit->end_date, true) + 1; // include the day itself.
                 $days                                = $this->daysInOverlap($limit, $start, $end);
                 $amount                              = bcmul(bcdiv($limit->amount, (string)$total), (string)$days);
                 $return[$currencyCode]['sum']        = bcadd($return[$currencyCode]['sum'], $amount);
@@ -183,21 +183,21 @@ class BudgetRepository implements BudgetRepositoryInterface
         //    |-----------|
         //  |----------------|
         if ($start->gte($limit->start_date) && $end->lte($limit->end_date)) {
-            return $start->diffInDays($end) + 1; // add one day
+            return (int) $start->diffInDays($end, true) + 1; // add one day
         }
         // limit starts earlier and limit ends first:
         //    |-----------|
         // |-------|
         if ($limit->start_date->lte($start) && $limit->end_date->lte($end)) {
             // return days in the range $start-$limit_end
-            return $start->diffInDays($limit->end_date) + 1; // add one day, the day itself
+            return (int) $start->diffInDays($limit->end_date, true) + 1; // add one day, the day itself
         }
         // limit starts later and limit ends earlier
         //    |-----------|
         //           |-------|
         if ($limit->start_date->gte($start) && $limit->end_date->gte($end)) {
             // return days in the range $limit_start - $end
-            return $limit->start_date->diffInDays($end) + 1; // add one day, the day itself
+            return (int) $limit->start_date->diffInDays($end, true) + 1; // add one day, the day itself
         }
 
         return 0;
@@ -438,7 +438,7 @@ class BudgetRepository implements BudgetRepositoryInterface
      *
      * @param null|int $budgetId |null
      */
-    public function find(int $budgetId = null): ?Budget
+    public function find(?int $budgetId = null): ?Budget
     {
         return $this->user->budgets()->find($budgetId);
     }

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -61,7 +61,7 @@ interface BudgetRepositoryInterface
 
     public function destroyAutoBudget(Budget $budget): void;
 
-    public function find(int $budgetId = null): ?Budget;
+    public function find(?int $budgetId = null): ?Budget;
 
     public function findBudget(?int $budgetId, ?string $budgetName): ?Budget;