Merge pull request #11876 from firefly-iii/release-1772642273

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -43,6 +43,7 @@ return $config->setRules(
         // rule sets
         '@PHP8x3Migration'               => true,
         '@PHP8x4Migration'               => true,
+        '@PHP8x5Migration'               => true,
         '@PhpCsFixer'                   => true,
         '@PhpCsFixer:risky'             => true,
         '@PSR12'                        => true,

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

@@ -1,5 +1,6 @@
 {
     "require": {
+        "php": ">=8.5.0",
         "friendsofphp/php-cs-fixer": "^3.12"
     }
 }

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

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f1e0b38af4ded66da271a99d2bff5be8",
+    "content-hash": "35b5ad9b3c4e1ffe78ef9bec73987499",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -402,16 +402,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.93.1",
+            "version": "v3.94.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "b3546ab487c0762c39f308dc1ec0ea2c461fc21a"
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b3546ab487c0762c39f308dc1ec0ea2c461fc21a",
-                "reference": "b3546ab487c0762c39f308dc1ec0ea2c461fc21a",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7787ceff91365ba7d623ec410b8f429cdebb4f63",
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63",
                 "shasum": ""
             },
             "require": {
@@ -428,7 +428,7 @@
                 "react/event-loop": "^1.5",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
-                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0",
                 "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
@@ -442,18 +442,18 @@
                 "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.7",
-                "infection/infection": "^0.32",
-                "justinrainbow/json-schema": "^6.6",
+                "facile-it/paraunit": "^1.3.1 || ^2.7.1",
+                "infection/infection": "^0.32.3",
+                "justinrainbow/json-schema": "^6.6.4",
                 "keradus/cli-executor": "^2.3",
                 "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.9",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.31 || ^10.5.60 || ^11.5.48",
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.7",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.7",
+                "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.51",
                 "symfony/polyfill-php85": "^1.33",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.26 || ^7.4.0 || ^8.0",
-                "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0"
+                "symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.4",
+                "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.1"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -494,7 +494,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.93.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.2"
             },
             "funding": [
                 {
@@ -502,7 +502,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-01-28T23:50:50+00:00"
+            "time": "2026-02-20T16:13:53+00:00"
         },
         {
             "name": "psr/container",
@@ -1185,29 +1185,29 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "7.0.0",
+            "version": "8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
+                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
+                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.3"
+                "php": ">=8.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.0",
+                "phpunit/phpunit": "^13.0",
                 "symfony/process": "^7.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "7.0-dev"
+                    "dev-main": "8.0-dev"
                 }
             },
             "autoload": {
@@ -1240,28 +1240,40 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
+                "source": "https://github.com/sebastianbergmann/diff/tree/8.0.0"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-07T04:55:46+00:00"
+            "time": "2026-02-06T04:42:27+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v8.0.4",
+            "version": "v8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "ace03c4cf9805080ff40cbeec69fca180c339a3b"
+                "reference": "488285876e807a4777f074041d8bb508623419fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/ace03c4cf9805080ff40cbeec69fca180c339a3b",
-                "reference": "ace03c4cf9805080ff40cbeec69fca180c339a3b",
+                "url": "https://api.github.com/repos/symfony/console/zipball/488285876e807a4777f074041d8bb508623419fa",
+                "reference": "488285876e807a4777f074041d8bb508623419fa",
                 "shasum": ""
             },
             "require": {
@@ -1318,7 +1330,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v8.0.4"
+                "source": "https://github.com/symfony/console/tree/v8.0.6"
             },
             "funding": [
                 {
@@ -1338,7 +1350,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-13T13:06:50+00:00"
+            "time": "2026-02-25T16:59:43+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1570,16 +1582,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v8.0.1",
+            "version": "v8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d937d400b980523dc9ee946bb69972b5e619058d"
+                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d937d400b980523dc9ee946bb69972b5e619058d",
-                "reference": "d937d400b980523dc9ee946bb69972b5e619058d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7bf9162d7a0dff98d079b72948508fa48018a770",
+                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770",
                 "shasum": ""
             },
             "require": {
@@ -1616,7 +1628,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v8.0.1"
+                "source": "https://github.com/symfony/filesystem/tree/v8.0.6"
             },
             "funding": [
                 {
@@ -1636,20 +1648,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-01T09:13:36+00:00"
+            "time": "2026-02-25T16:59:43+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v8.0.5",
+            "version": "v8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8bd576e97c67d45941365bf824e18dc8538e6eb0"
+                "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8bd576e97c67d45941365bf824e18dc8538e6eb0",
-                "reference": "8bd576e97c67d45941365bf824e18dc8538e6eb0",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/441404f09a54de6d1bd6ad219e088cdf4c91f97c",
+                "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c",
                 "shasum": ""
             },
             "require": {
@@ -1684,7 +1696,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v8.0.5"
+                "source": "https://github.com/symfony/finder/tree/v8.0.6"
             },
             "funding": [
                 {
@@ -1704,7 +1716,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-26T15:08:38+00:00"
+            "time": "2026-01-29T09:41:02+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -2576,16 +2588,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v8.0.4",
+            "version": "v8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "758b372d6882506821ed666032e43020c4f57194"
+                "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/758b372d6882506821ed666032e43020c4f57194",
-                "reference": "758b372d6882506821ed666032e43020c4f57194",
+                "url": "https://api.github.com/repos/symfony/string/zipball/6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
+                "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
                 "shasum": ""
             },
             "require": {
@@ -2642,7 +2654,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v8.0.4"
+                "source": "https://github.com/symfony/string/tree/v8.0.6"
             },
             "funding": [
                 {
@@ -2662,7 +2674,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-12T12:37:40+00:00"
+            "time": "2026-02-09T10:14:57+00:00"
         }
     ],
     "packages-dev": [],
@@ -2671,7 +2683,9 @@
     "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": {},
+    "platform": {
+        "php": ">=8.5.0"
+    },
     "platform-dev": {},
     "plugin-api-version": "2.9.0"
 }

.ci/phpstan.neon

@@ -5,14 +5,60 @@ parameters:
     - ../routes
     - ../config
     - ../bootstrap/app.php
+    - ../bootstrap/providers.php
   universalObjectCratesClasses:
     - Illuminate\Database\Eloquent\Model
   reportUnmatchedIgnoredErrors: true
   ignoreErrors:
+    # these are actually interesting but not right now:
+    - identifier: notIdentical.alwaysTrue
+    - identifier: method.notFound
+    - identifier: nullsafe.neverNull
+    - identifier: identical.alwaysFalse
+    - identifier: if.condNotBoolean
+    # - identifier: booleanNot.exprNotBoolean
+    - identifier: method.nonObject
+    - identifier: function.impossibleType
+    - identifier: booleanNot.exprNotBoolean
+    - identifier: ternary.condNotBoolean
+    - identifier: booleanNot.alwaysFalse
+    - identifier: booleanAnd.alwaysFalse
+    - identifier: greater.alwaysTrue
+    - identifier: function.alreadyNarrowedType
+    - identifier: booleanNot.alwaysTrue
+    - identifier: property.phpDocType
+    - identifier: nullCoalesce.offset
+    - identifier: nullCoalesce.variable
+    - identifier: larastan.noUnnecessaryCollectionCall
+    - identifier: varTag.differentVariable
+    - identifier: identical.alwaysTrue
+    - identifier: clone.nonObject
+    - identifier: assign.propertyReadOnly
+    - identifier: property.nonObject
+    - identifier: varTag.nativeType
+    - identifier: booleanAnd.leftAlwaysFalse
+    - identifier: property.onlyWritten
+    - identifier: parameter.phpDocType
+    - identifier: property.dynamicName
+    - identifier: property.unusedType
+    - identifier: staticMethod.deprecated
+    - identifier: greater.invalid
+    - identifier: instanceof.alwaysTrue
+    # ignore everything but things that BREAK
+    - identifier: property.deprecated
+    - identifier: method.deprecated
+    - identifier: cast.useless
+    - identifier: parameter.deprecatedClass
+    - identifier: method.deprecatedClass
+    - identifier: argument.type
+    - identifier: return.type
+    - identifier: assign.propertyType
+    - identifier: return.unusedType
+    - identifier: return.phpDocType
     # all errors below I will never fix.
-    - '#expects view-string\|null, string given#'
-    - '#expects view-string, string given#'
-    - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
+    # - '#expects view-string\|null, string given#'
+    # - '#expects view-string, string given#'
+    # - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
     - identifier: missingType.generics # not interesting enough to fix.
     -
         identifier: larastan.noEnvCallsOutsideOfConfig
@@ -20,11 +66,11 @@ parameters:
     - identifier: missingType.iterableValue # not interesting enough to fix.
     - identifier: varTag.type # needs a custom extension for every repository, not gonna happen.
     - '#Dynamic call to static method Illuminate#'
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#' # is custom scope
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#' # is custom scope
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#' # is to allow soft delete
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#' # is a custom scope
-    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#' # is to allow soft delete
+    # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#' # is custom scope
+    # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#' # is custom scope
+    # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#' # is to allow soft delete
+    # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#' # is a custom scope
+    # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#' # is to allow soft delete
 
   # The level 8 is the highest level. original was 5
   # 7 is more than enough, higher just leaves NULL things.

.github/ISSUE_TEMPLATE/bug.yml

@@ -4,9 +4,9 @@ body:
   - type: checkboxes
     attributes:
       label: Support guidelines
-      description: Please read the support guidelines before proceeding.
+      description: Thank you for reading the support guidelines before proceeding.
       options:
-        - label: I've read the <!-- MZ2udTpin6FL --> [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
+        - label: I'm smart and I read the <!-- MZ2udTpin6FL --> [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
           required: true
 
   - type: checkboxes
@@ -29,7 +29,7 @@ body:
     attributes:
       label: Debug information
       description: Please provide the table from the /debug page. Do not add backticks or quotes.
-      placeholder: The output from the /debug page
+      placeholder: The output from the /debug page or "N/A"
     validations:
       required: true
 

.github/mergify.yml

@@ -1,11 +1,4 @@
 pull_request_rules:
-  - name: Make sure PR are up to date before merging
-    description: This automatically updates PRs when they are out-of-date with the
-      base branch to avoid semantic conflicts (next step is using a merge
-      queue).
-    conditions: []
-    actions:
-      update:
   - name: Close all on main
     conditions:
       - base=main

.github/pull_request_template.md

@@ -1,20 +1,22 @@
 <!--
-Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.
 
-- Please do not submit solutions for problems that are not already reported in an issue.
-- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
-- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
-- Pull requests for the MAIN branch will be closed.
-- DO NOT include translated strings in your PR.
-- PRs (or parts thereof) that only fix issues inside code comments will not be accepted.
+Please TALK TO ME FIRST before you open a PR.
 
-If it feels necessary to open an issue first, please do so, before you open a PR.
+1. If you fix a problem that has no ticket, talk to me FIRST.
+2. If you  introduce new financial solutions or concepts, talk to me FIRST.
+3. If your PR is more than 25 lines, talk to me FIRST.
+4. If you used AI to write your PR, talk to me FIRST.
+5. If you fix spelling or code comments, talk to me FIRST.
+
+Wanna talk to me? Open a GitHub Issue, Discussion, or send me an email: james@firefly-iii.org
 
 See also: https://docs.firefly-iii.org/explanation/support/#contributing-code
 
 -->
+
+@JC5 
     
-This PR fixes issue # (if relevant).
+This PR fixes issue # <!-- mandatory field! -->.
 
 Changes in this pull request:
 

.github/workflows/issues-reply-old-versions.yml

@@ -41,7 +41,7 @@ jobs:
           DDNOV="${DDNOV:1}"
 
           echo "Firefly III version is ${{ steps.ff3version.outputs.release }}, without v is $FFNOV"
-          echo "Data importer version is ${{ steps.ff3version.outputs.release }}, without v is $FFNOV"
+          echo "Data importer version is ${{ steps.ff3version.outputs.release }}, without v is $DDNOV"
 
           # user includes no debug info at all, and does not mention current version.
           # user includes no debug info at all, but does mention current version

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
       phpversion:
         description: 'PHP version'
         required: true
-        default: '8.4'
+        default: '8.5'
   schedule:
     - cron: '0 3 * * MON'
 
@@ -42,7 +42,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ github.event.inputs.phpversion || '8.4' }}
+          php-version: ${{ github.event.inputs.phpversion || '8.5' }}
           extensions: mbstring, intl, zip, bcmath
       - name: Switch and pull
         run: |
@@ -174,12 +174,24 @@ jobs:
         uses: nhedger/setup-mago@v1
       - name: Run CI
         run: |
+          cp .env.example .env
+          # install all packages etc.
           rm -rf vendor composer.lock
-          composer update --no-scripts --no-plugins -q
-          mago format || true
-          mago analyze --reporting-format=github || true
+          composer update --no-scripts -q
+
+          # format code.
+          echo "Will now run Mago Format"
+          mago format
           sudo chown -R runner:docker resources/lang
-          .ci/phpcs.sh || true
+          echo "Will now run PHPCS"
+          .ci/phpcs.sh
+
+          # lint and check
+          echo "Will now run Mago Lint"
+          mago lint
+          echo "Will now run PHPstan"
+          .ci/phpstan.sh
+          rm .env
       - name: Calculate variables
         run: |
 

THANKS.md

@@ -4,6 +4,11 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2026
+- Matthew Grove
+- Cinnamon Pyro
+- R1DEN
+- RiDEN
+- Khoa Nguyen
 - Nick Huang
 - mateuszkulapl
 - Gianluca Martino

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -41,7 +41,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class AccountController
  */
-class AccountController extends Controller
+final class AccountController extends Controller
 {
     use AccountFilter;
 

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class BillController
  */
-class BillController extends Controller
+final class BillController extends Controller
 {
     private BillRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_SUBSCRIPTIONS];

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class BudgetController
  */
-class BudgetController extends Controller
+final class BudgetController extends Controller
 {
     private BudgetRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_BUDGETS];

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class CategoryController
  */
-class CategoryController extends Controller
+final class CategoryController extends Controller
 {
     private CategoryRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -37,7 +37,7 @@ use Illuminate\Http\Request;
 /**
  * Class CurrencyController
  */
-class CurrencyController extends Controller
+final class CurrencyController extends Controller
 {
     private CurrencyRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class ObjectGroupController
  */
-class ObjectGroupController extends Controller
+final class ObjectGroupController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -38,7 +38,7 @@ use Illuminate\Http\Request;
 /**
  * Class PiggyBankController
  */
-class PiggyBankController extends Controller
+final class PiggyBankController extends Controller
 {
     private AccountRepositoryInterface $accountRepository;
     private PiggyBankRepositoryInterface $piggyRepository;

app/Api/V1/Controllers/Autocomplete/RecurrenceController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class RecurrenceController
  */
-class RecurrenceController extends Controller
+final class RecurrenceController extends Controller
 {
     private RecurringRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_RECURRING];

app/Api/V1/Controllers/Autocomplete/RuleController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class RuleController
  */
-class RuleController extends Controller
+final class RuleController extends Controller
 {
     private RuleRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_RULES];

app/Api/V1/Controllers/Autocomplete/RuleGroupController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class RuleGroupController
  */
-class RuleGroupController extends Controller
+final class RuleGroupController extends Controller
 {
     private RuleGroupRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_RULES];

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class TagController
  */
-class TagController extends Controller
+final class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -39,7 +39,7 @@ use Illuminate\Support\Collection;
 /**
  * Class TransactionController
  */
-class TransactionController extends Controller
+final class TransactionController extends Controller
 {
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
     private TransactionGroupRepositoryInterface $groupRepository;

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
 /**
  * Class TransactionTypeController
  */
-class TransactionTypeController extends Controller
+final class TransactionTypeController extends Controller
 {
     private TransactionTypeRepositoryInterface $repository;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Chart/AccountController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Chart;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -43,7 +44,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class AccountController
  */
-class AccountController extends Controller
+final class AccountController extends Controller
 {
     use ApiSupport;
     use CleansChartData;
@@ -142,23 +143,29 @@ class AccountController extends Controller
         }
         // create array of values to collect.
 
+        $rangeDates        = array_map(static fn (string $d): Carbon => Carbon::createFromFormat('Y-m-d', $d)->startOfDay(), array_keys($range));
+        $rangeVals         = array_values($range);
+        $rangeIdx          = 0;
+        $rangeCount        = count($rangeDates);
+
         while ($currentStart <= $params['end']) {
-            $format                        = $currentStart->format('Y-m-d');
             $label                         = $currentStart->toAtomString();
-            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
-            $previous                      = $balance;
-            $currentSet['entries'][$label] = $balance;
 
-            // do the same for the primary currency balance, if relevant:
-            $pcBalance                     = null;
-            if ($this->convertToPrimary) {
-                $pcBalance                        = array_key_exists($format, $range) ? $range[$format]['pc_balance'] : $pcPrevious;
-                $pcPrevious                       = $pcBalance;
-                $currentSet['pc_entries'][$label] = $pcBalance;
+            // Advance through all range entries up to current chart date
+            while ($rangeIdx < $rangeCount && $rangeDates[$rangeIdx] <= $currentStart) {
+                $previous = $rangeVals[$rangeIdx]['balance'];
+                if ($this->convertToPrimary) {
+                    $pcPrevious = $rangeVals[$rangeIdx]['pc_balance'];
+                }
+                ++$rangeIdx;
             }
-            $currentStart                  = Navigation::addPeriod($currentStart, $period);
 
-            // $currentStart->addDay();
+            $currentSet['entries'][$label] = $previous;
+            if ($this->convertToPrimary) {
+                $currentSet['pc_entries'][$label] = $pcPrevious;
+            }
+
+            $currentStart                  = Navigation::addPeriod($currentStart, $period);
         }
         $this->chartData[] = $currentSet;
     }

app/Api/V1/Controllers/Chart/BalanceController.php

@@ -40,7 +40,7 @@ use Illuminate\Http\Request;
 /**
  * Class BalanceController
  */
-class BalanceController extends Controller
+final class BalanceController extends Controller
 {
     use CleansChartData;
     use CollectsAccountsFromFilter;

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -47,7 +47,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class BudgetController
  */
-class BudgetController extends Controller
+final class BudgetController extends Controller
 {
     use CleansChartData;
     use ValidatesUserGroupTrait;

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -45,7 +45,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class BudgetController
  */
-class CategoryController extends Controller
+final class CategoryController extends Controller
 {
     use CleansChartData;
     use ValidatesUserGroupTrait;

app/Api/V1/Controllers/Data/Bulk/TransactionController.php

@@ -42,7 +42,7 @@ use Illuminate\Http\Request;
  * Because this is a security nightmare waiting to happen validation
  * is pretty strict.
  */
-class TransactionController extends Controller
+final class TransactionController extends Controller
 {
     private AccountRepositoryInterface $repository;
 

app/Api/V1/Controllers/Data/DestroyController.php

@@ -54,7 +54,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private bool $unused;
 

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -38,7 +38,7 @@ use function Safe\date;
 /**
  * Class ExportController
  */
-class ExportController extends Controller
+final class ExportController extends Controller
 {
     private ExportDataGenerator $exporter;
     protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];

app/Api/V1/Controllers/Data/PurgeController.php

@@ -44,7 +44,7 @@ use Illuminate\Http\Request;
 /**
  * Class PurgeController
  */
-class PurgeController extends Controller
+final class PurgeController extends Controller
 {
     protected array $acceptedRoles = [UserRoleEnum::FULL];
 

app/Api/V1/Controllers/Insight/Expense/AccountController.php

@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
  * Shows expense information grouped or limited by date.
  * I.e. all expenses grouped by account + currency.
  */
-class AccountController extends Controller
+final class AccountController extends Controller
 {
     use ApiSupport;
 

app/Api/V1/Controllers/Insight/Expense/BillController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class BillController
  */
-class BillController extends Controller
+final class BillController extends Controller
 {
     private BillRepositoryInterface $repository;
 

app/Api/V1/Controllers/Insight/Expense/BudgetController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
 /**
  * Class BudgetController
  */
-class BudgetController extends Controller
+final class BudgetController extends Controller
 {
     private NoBudgetRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;

app/Api/V1/Controllers/Insight/Expense/CategoryController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
 /**
  * Class CategoryController
  */
-class CategoryController extends Controller
+final class CategoryController extends Controller
 {
     private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;

app/Api/V1/Controllers/Insight/Expense/PeriodController.php

@@ -35,7 +35,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class PeriodController
  */
-class PeriodController extends Controller
+final class PeriodController extends Controller
 {
     public function total(GenericRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class TagController
  */
-class TagController extends Controller
+final class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
 

app/Api/V1/Controllers/Insight/Income/AccountController.php

@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
  * Shows income information grouped or limited by date.
  * I.e. all income grouped by account + currency.
  */
-class AccountController extends Controller
+final class AccountController extends Controller
 {
     use ApiSupport;
 

app/Api/V1/Controllers/Insight/Income/CategoryController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
 /**
  * Class CategoryController
  */
-class CategoryController extends Controller
+final class CategoryController extends Controller
 {
     private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class PeriodController
  */
-class PeriodController extends Controller
+final class PeriodController extends Controller
 {
     public function total(GenericRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class TagController
  */
-class TagController extends Controller
+final class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
 

app/Api/V1/Controllers/Insight/Transfer/AccountController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class AccountController
  */
-class AccountController extends Controller
+final class AccountController extends Controller
 {
     use ApiSupport;
 

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
 /**
  * Class CategoryController
  */
-class CategoryController extends Controller
+final class CategoryController extends Controller
 {
     private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class PeriodController
  */
-class PeriodController extends Controller
+final class PeriodController extends Controller
 {
     public function total(GenericRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class TagController
  */
-class TagController extends Controller
+final class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Account/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     public const string RESOURCE_KEY = 'accounts';
 

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -46,7 +46,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 
@@ -128,15 +128,16 @@ class ListController extends Controller
      */
     public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse
     {
-        ['limit' => $limit, 'page'  => $page, 'start' => $start, 'end'   => $end, 'types' => $types] = $request->attributes->all();
-        $manager                                                                                     = $this->getManager();
+        ['limit' => $limit, 'page'  => $page, 'start' => $start, 'end'   => $end, 'type'  => $type] = $request->attributes->all();
+        $types                                                                                      = $this->mapTransactionTypes($type ?? 'default');
+        $manager                                                                                    = $this->getManager();
 
         /** @var User $admin */
-        $admin                                                                                       = auth()->user();
+        $admin                                                                                      = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector                                                                                   = app(GroupCollectorInterface::class);
+        $collector                                                                                  = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setAccounts(new Collection()->push($account))->withAPIInformation()->setLimit($limit)->setPage($page)->setTypes($types);
         if (null !== $start) {
             $collector->setStart($start);
@@ -145,18 +146,18 @@ class ListController extends Controller
             $collector->setEnd($end);
         }
 
-        $paginator                                                                                   = $collector->getPaginatedGroups();
+        $paginator                                                                                  = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
 
         // enrich
-        $enrichment                                                                                  = new TransactionGroupEnrichment();
+        $enrichment                                                                                 = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
-        $transactions                                                                                = $enrichment->enrich($paginator->getCollection());
+        $transactions                                                                               = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer                                                                                 = app(TransactionGroupTransformer::class);
+        $transformer                                                                                = app(TransactionGroupTransformer::class);
 
-        $resource                                                                                    = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource                                                                                   = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

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

@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     use AccountFilter;
 

app/Api/V1/Controllers/Models/Account/StoreController.php

@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     public const string RESOURCE_KEY = 'accounts';
 

app/Api/V1/Controllers/Models/Account/UpdateController.php

@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     public const string RESOURCE_KEY = 'accounts';
 

app/Api/V1/Controllers/Models/Attachment/DestroyController.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 

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

@@ -44,7 +44,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Attachment/StoreController.php

@@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Attachment/UpdateController.php

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 

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

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private AvailableBudgetRepositoryInterface $abRepository;
 

app/Api/V1/Controllers/Models/Bill/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private BillRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Bill/ListController.php

@@ -44,7 +44,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 

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

@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private BillRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Bill/StoreController.php

@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     use TransactionFilter;
 

app/Api/V1/Controllers/Models/Bill/UpdateController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private BillRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Budget/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private BudgetRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Budget/ListController.php

@@ -44,7 +44,7 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 
 // Class ListController
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 

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

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
     private BudgetRepositoryInterface $repository;

app/Api/V1/Controllers/Models/Budget/StoreController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private BudgetRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Budget/UpdateController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private BudgetRepositoryInterface $repository;
 

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

@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 

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

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 

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

@@ -44,7 +44,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
     private BudgetRepositoryInterface $repository;

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

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 

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

@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 

app/Api/V1/Controllers/Models/Category/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Category/ListController.php

@@ -42,7 +42,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 

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

@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Category/StoreController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Category/UpdateController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php

@@ -36,7 +36,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     use ValidatesUserGroupTrait;
 

app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php

@@ -36,7 +36,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 /**
  * Class ShowController
  */
-class IndexController extends Controller
+final class IndexController extends Controller
 {
     use ValidatesUserGroupTrait;
 

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

@@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     use ValidatesUserGroupTrait;
 

app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php

@@ -41,7 +41,7 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     use ValidatesUserGroupTrait;
 

app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php

@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     use ValidatesUserGroupTrait;
 

app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php

@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/ObjectGroup/ListController.php

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 

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

@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php

@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private PiggyBankRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/PiggyBank/ListController.php

@@ -41,7 +41,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     private PiggyBankRepositoryInterface $repository;
 

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

@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private PiggyBankRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/PiggyBank/StoreController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private PiggyBankRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private PiggyBankRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Recurrence/DestroyController.php

@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Recurrence/ListController.php

@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
 /**
  * Class ListController
  */
-class ListController extends Controller
+final class ListController extends Controller
 {
     use TransactionFilter;
 

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

@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Recurrence/StoreController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class StoreController
  */
-class StoreController extends Controller
+final class StoreController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Recurrence/TriggerController.php

@@ -41,7 +41,7 @@ use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 
-class TriggerController extends Controller
+final class TriggerController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 

app/Api/V1/Controllers/Models/Recurrence/UpdateController.php

@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class UpdateController
  */
-class UpdateController extends Controller
+final class UpdateController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 

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

@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class DestroyController
  */
-class DestroyController extends Controller
+final class DestroyController extends Controller
 {
     private RuleRepositoryInterface $ruleRepository;
 

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

@@ -31,7 +31,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class ExpressionController
  */
-class ExpressionController extends Controller
+final class ExpressionController extends Controller
 {
     /**
      * This endpoint is documented at:

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

@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
 /**
  * Class ShowController
  */
-class ShowController extends Controller
+final class ShowController extends Controller
 {
     private RuleRepositoryInterface $ruleRepository;