Merge pull request #10525 from firefly-iii/release-1751254389

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-06-30
2026-01-05 01:51:23 +00:00 · 2025-06-30 05:33:15 +02:00 · 2025-06-30 05:33:09 +02:00 · 2025-06-29 16:44:18 +02:00 · 2025-06-29 16:44:10 +02:00 · 2025-06-29 06:46:40 +02:00
70 changed files with 856 additions and 622 deletions
--- a/.ci/php-cs-fixer/.php-cs-fixer.php
+++ b/.ci/php-cs-fixer/.php-cs-fixer.php
@@ -19,26 +19,24 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
-
 $current = __DIR__;

 $paths = [
    $current . '/../../app',
    $current . '/../../config',
-    $current . '/../../database',
    $current . '/../../routes',
    $current . '/../../tests',
-    $current . '/../../resources/lang/en_US',
 ];

 $finder = PhpCsFixer\Finder::create()
                           ->in($paths);


-$config = new PhpCsFixer\Config();
-$config->setParallelConfig(ParallelConfigFactory::detect());
+$config = (new PhpCsFixer\Config())
+        ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
+        ;
 return $config->setRules(
+
    [
        // rule sets
        '@PHP83Migration'               => true,
@@ -53,9 +51,6 @@ return $config->setRules(
        'statement_indentation'         => true,
        'void_return'                   => true,

-        // about importing statements
-        'global_namespace_import' => ['import_classes' => true, 'import_constants' => true, 'import_functions' => true],
-
        // disabled rules
        'native_function_invocation'    => false, // annoying
        'php_unit_data_provider_name'   => false, // bloody annoying long test names
@@ -64,9 +59,15 @@ return $config->setRules(
        'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
        'type_declaration_spaces'       => false,
        'cast_spaces'                   => false,
-        'phpdoc_to_comment'             => false, // do not overrule single line comment style, breaks phpstan.
+
+        // enabled rules
+        'global_namespace_import' => true, // matches with rector.

        // complex rules
+        'phpdoc_to_comment' => ['ignored_tags' => ['var']],
+        'php_unit_test_case_static_method_calls' => [
+            'call_type' => 'this',
+        ],
        'array_syntax'                  => ['syntax' => 'short'],
        'binary_operator_spaces'        => [
            'default'   => 'at_least_single_space',
@@ -76,5 +77,7 @@ return $config->setRules(
                '??=' => 'align_single_space_minimal_by_scope',
            ],
        ],
-    ])
+    ]
+
+)
              ->setFinder($finder);
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -1256,16 +1256,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
                "shasum": ""
            },
            "require": {
@@ -1330,7 +1330,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.1"
            },
            "funding": [
                {
@@ -1346,7 +1346,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
--- a/.ci/phpcs.sh
+++ b/.ci/phpcs.sh
@@ -28,7 +28,8 @@ composer update --quiet
 rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
    --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=txt -v \
+    --format=txt \
+    -v \
    --allow-risky=yes

 EXIT_CODE=$?
--- a/.ci/rector.php
+++ b/.ci/rector.php
@@ -25,6 +25,7 @@ declare(strict_types=1);

 use Rector\Config\RectorConfig;
 use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
+use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector;
 use Rector\Transform\Rector\String_\StringToClassConstantRector;
 use RectorLaravel\Set\LaravelLevelSetList;

@@ -32,6 +33,7 @@ use RectorLaravel\Set\LaravelLevelSetList;
 return RectorConfig::configure()
    ->withSkip([
        ChangeOrIfContinueToMultiContinueRector::class,
+        AddParamBasedOnParentClassMethodRector::class,
        StringToClassConstantRector::class => [
            __DIR__ . '/../app/Http/Controllers/Auth/LoginController.php',
        ],
--- a/.env.example
+++ b/.env.example
@@ -329,7 +329,7 @@ FIREFLY_III_LAYOUT=v1
 # Which Query Parser implementation to use for the search engine and rules
 # 'new' is experimental, 'legacy' is the classic one
 #
-QUERY_PARSER_IMPLEMENTATION=legacy
+QUERY_PARSER_IMPLEMENTATION=new

 #
 # Please make sure this URL matches the external URL of your Firefly III installation.
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: Bug report
 description: Report a bug in Firefly III (or associated tools)
 body:
  - type: checkboxes
@@ -12,7 +12,7 @@ body:
  - type: checkboxes
    attributes:
      label: I've found a bug and checked that ...
-      description: Make sure that your request fulfills all of the following requirements. If one requirement cannot be satisfied, explain in detail why.
+      description: Make sure that your request fulfills all of the following requirements. If one requirement cannot be satisfied, please explain why.
      options:
        - label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
        - label: ... there are no open or closed issues that are related to my problem
@@ -33,13 +33,6 @@ body:
    validations:
      required: true

-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description: Please describe precisely what you'd expect to happen. Be specific.
-    validations:
-      required: false
-
  - type: textarea
    attributes:
      label: Steps to reproduce
@@ -54,4 +47,4 @@ body:
  - type: textarea
    attributes:
      label: Additional info
-      description: Please provide any additional information that seem useful.
+      description: Please provide any additional information that seems useful.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,3 +3,6 @@ contact_links:
  - name: Ask a question
    url: https://github.com/firefly-iii/firefly-iii/discussions
    about: Please ask and answer questions here.
+  - name: I need support! 
+    url: https://github.com/firefly-iii/firefly-iii/discussions
+    about: I think I broke something...
--- a/.github/ISSUE_TEMPLATE/fr.yml
+++ b/.github/ISSUE_TEMPLATE/fr.yml
@@ -1,4 +1,4 @@
-name: Feature Request
+name: Feature request
 description: Request a feature or enhancement in Firefly III (or associated tools)
 body:
  - type: checkboxes
@@ -31,11 +31,6 @@ body:
    validations:
      required: true

-  - type: textarea
-    attributes:
-      label: What are alternatives?
-      description: Please describe what alternatives currently exist.
-
  - type: textarea
    attributes:
      label: Additional context
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -259,6 +259,12 @@ jobs:
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
            echo "" >> output.txt
            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+
+            # donations!
+            echo '' >> output.txt
+            echo '### Support Firefly III' >> output.txt
+            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
+            echo '' >> output.txt
          fi
          # describe a branch release
          if [[ "$version" == branch* ]]; then
@@ -279,16 +285,31 @@ jobs:
          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
            echo 'Describe the latest release'
            sudo chown -R runner:docker output.txt
+
+            # the changelog is in output.txt
+            mv output.txt output2.txt
+
            touch output.txt
            echo '' >> output.txt
            echo "Welcome to release $version of Firefly III. It contains the the latest fixes, translations and features. Docker users can find this release under the \`latest\` tag." >> output.txt
            echo '' >> output.txt
+
+            # add changelog to file.
+            cat output2.txt >> output.txt
+            echo '' >> output.txt
+            rm -f output2.txt
+
            echo '### Instructions' >> output.txt
            echo '' >> output.txt
            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt

+            # donations!
+            echo '' >> output.txt
+            echo '### Support Firefly III' >> output.txt
+            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
+            echo '' >> output.txt
          fi

          # describe alpha release
--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Deprecated;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionCurrency;
@@ -83,9 +84,8 @@ class CurrencyController extends Controller
    /**
     * Documentation for this endpoint is at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesCodeAC
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
    {
        $data       = $request->getData();
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -162,7 +162,7 @@ class AccountController extends Controller
        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();

        /** @var Preference $frontpage */
-        Preferences::get('frontpageAccounts', $defaultSet);
+        $frontpage  = Preferences::get('frontpageAccounts', $defaultSet);

        if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
            $frontpage->data = $defaultSet;
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -237,9 +237,7 @@ class BudgetController extends Controller
        /** @var array $entry */
        // only spent the entry where the entry's currency matches the budget limit's currency
        // so $filtered will only have 1 or 0 entries
-        $filtered        = array_filter($spent, function ($entry) use ($limitCurrencyId) {
-            return $entry['currency_id'] === $limitCurrencyId;
-        });
+        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
        if (1 === count($result)) {
            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -58,11 +58,13 @@ use function Safe\parse_url;
 */
 class Handler extends ExceptionHandler
 {
+    public static ?Throwable $lastError = null;
+
    /**
     * @var array<int, class-string<Throwable>>
     */
    protected $dontReport
-        = [
+                                        = [
            AuthenticationException::class,
            LaravelValidationException::class,
            NotFoundHttpException::class,
@@ -123,7 +125,7 @@ class Handler extends ExceptionHandler
            // somehow Laravel handler does not catch this:
            app('log')->debug('Return JSON unauthenticated error.');

-            return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401);
+            return response()->json(['message' => $e->getMessage(), 'exception' => 'AuthenticationException'], 401);
        }

        if ($e instanceof OAuthServerException && $expectsJson) {
@@ -215,13 +217,14 @@ class Handler extends ExceptionHandler
    #[Override]
    public function report(Throwable $e): void
    {
-        $doMailError = (bool) config('firefly.send_error_message');
+        self::$lastError = $e;
+        $doMailError     = (bool) config('firefly.send_error_message');
        if ($this->shouldntReportLocal($e) || !$doMailError) {
            parent::report($e);

            return;
        }
-        $userData    = [
+        $userData        = [
            'id'    => 0,
            'email' => 'unknown@example.com',
        ];
@@ -230,9 +233,9 @@ class Handler extends ExceptionHandler
            $userData['email'] = auth()->user()->email;
        }

-        $headers     = request()->headers->all();
+        $headers         = request()->headers->all();

-        $data        = [
+        $data            = [
            'class'        => $e::class,
            'errorMessage' => $e->getMessage(),
            'time'         => Carbon::now()->format('r'),
@@ -250,8 +253,8 @@ class Handler extends ExceptionHandler
        ];

        // create job that will mail.
-        $ipAddress   = request()->ip() ?? '0.0.0.0';
-        $job         = new MailError($userData, (string) config('firefly.site_owner'), $ipAddress, $data);
+        $ipAddress       = request()->ip() ?? '0.0.0.0';
+        $job             = new MailError($userData, (string) config('firefly.site_owner'), $ipAddress, $data);
        dispatch($job);

        parent::report($e);
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Handlers\Events;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
@@ -42,9 +43,8 @@ class VersionCheckEventHandler
     * Checks with GitHub to see if there is a new version.
     *
     * @throws FireflyException
-     *
-     * @deprecated ?
     */
+    #[Deprecated(message: '?')]
    public function checkForUpdates(RequestedVersionCheckStatus $event): void
    {
        Log::debug('Now in checkForUpdates()');
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -1094,6 +1094,10 @@ class GroupCollector implements GroupCollectorInterface
            ->whereNull('transaction_groups.deleted_at')
            ->whereNull('transaction_journals.deleted_at')
            ->whereNull('source.deleted_at')
+
+            // #10507 ignore opening balance.
+            ->where('transaction_types.type', '!=', TransactionTypeEnum::OPENING_BALANCE->value)
+
            ->whereNotNull('transaction_groups.id')
            ->whereNull('destination.deleted_at')
            ->orderBy('transaction_journals.date', 'DESC')
--- a/app/Helpers/Report/NetWorth.php
+++ b/app/Helpers/Report/NetWorth.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Helpers\Report;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -81,7 +82,7 @@ class NetWorth implements NetWorthInterface

        /** @var Account $account */
        foreach ($accounts as $account) {
-            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
+            //            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
            $currency                           = $this->accountRepository->getAccountCurrency($account) ?? $default;
            $useNative                          = $convertToNative && $default->id !== $currency->id;
            $currency                           = $useNative ? $default : $currency;
@@ -92,12 +93,12 @@ class NetWorth implements NetWorthInterface
                $balance       = $balances[$account->id]['balance'] ?? '0';
                $nativeBalance = $balances[$account->id]['native_balance'] ?? '0';
            }
-            Log::debug(sprintf('Balance is %s, native balance is %s', $balance, $nativeBalance));
+            //            Log::debug(sprintf('Balance is %s, native balance is %s', $balance, $nativeBalance));
            // always subtract virtual balance again.
            $balance                            = '' !== (string) $account->virtual_balance ? bcsub($balance, (string) $account->virtual_balance) : $balance;
            $nativeBalance                      = '' !== (string) $account->native_virtual_balance ? bcsub($nativeBalance, (string) $account->native_virtual_balance) : $nativeBalance;
            $amountToUse                        = $useNative ? $nativeBalance : $balance;
-            Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));
+            //            Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));

            $netWorth[$currencyCode] ??= [
                'balance'                 => '0',
@@ -134,9 +135,7 @@ class NetWorth implements NetWorthInterface
        $this->currencyRepos->setUserGroup($this->userGroup);
    }

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function sumNetWorthByCurrency(Carbon $date): array
    {
        /**
--- a/app/Helpers/Report/NetWorthInterface.php
+++ b/app/Helpers/Report/NetWorthInterface.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Helpers\Report;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
@@ -53,8 +54,7 @@ interface NetWorthInterface
     * TODO move to repository
     *
     * Same as above but cleaner function with less dependencies.
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function sumNetWorthByCurrency(Carbon $date): array;
 }
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -91,7 +91,7 @@ class IndexController extends Controller
    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')));
+        Log::debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));

        // collect some basic vars:
        $range            = app('navigation')->getViewRange(true);
@@ -199,12 +199,12 @@ class IndexController extends Controller
        // get all budgets, and paginate them into $budgets.
        $collection = $this->repository->getActiveBudgets();
        $budgets    = [];
-        app('log')->debug(sprintf('7) Start is "%s", end is "%s"', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('(getAllBudgets) Start is "%s", end is "%s"', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));

        // complement budget with budget limits in range, and expenses in currency X in range.
        /** @var Budget $current */
        foreach ($collection as $current) {
-            app('log')->debug(sprintf('Working on budget #%d ("%s")', $current->id, $current->name));
+            Log::debug(sprintf('Working on budget #%d ("%s")', $current->id, $current->name));
            $array                = $current->toArray();
            $array['spent']       = [];
            $array['spent_total'] = [];
@@ -215,7 +215,7 @@ class IndexController extends Controller

            /** @var BudgetLimit $limit */
            foreach ($budgetLimits as $limit) {
-                app('log')->debug(sprintf('Working on budget limit #%d', $limit->id));
+                Log::debug(sprintf('Working on budget limit #%d', $limit->id));
                $currency            = $limit->transactionCurrency ?? $defaultCurrency;
                $amount              = app('steam')->bcround($limit->amount, $currency->decimal_places);
                $array['budgeted'][] = [
@@ -231,9 +231,11 @@ class IndexController extends Controller
                    'currency_name'           => $currency->name,
                    'currency_decimal_places' => $currency->decimal_places,
                ];
-                app('log')->debug(sprintf('The amount budgeted for budget limit #%d is %s %s', $limit->id, $currency->code, $amount));
+                Log::debug(sprintf('The amount budgeted for budget limit #%d is %s %s', $limit->id, $currency->code, $amount));
            }

+            // #10463
+
            /** @var TransactionCurrency $currency */
            foreach ($currencies as $currency) {
                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency, false);
@@ -260,6 +262,8 @@ class IndexController extends Controller

        /** @var array $budget */
        foreach ($budgets as $budget) {
+            Log::debug(sprintf('Now working on budget #%d ("%s")', $budget['id'], $budget['name']));
+
            /** @var array $spent */
            foreach ($budget['spent'] as $spent) {
                $currencyId                           = $spent['currency_id'];
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Json;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -46,9 +47,8 @@ class BoxController extends Controller

    /**
     * Deprecated method, no longer in use.
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function available(): JsonResponse
    {
        return response()->json([]);
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -26,10 +26,12 @@ namespace FireflyIII\Http\Middleware;

 use Closure;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Exceptions\Handler;
 use FireflyIII\User;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Http\Request;
+use League\OAuth2\Server\Exception\OAuthServerException;

 /**
 * Class Authenticate
@@ -84,6 +86,7 @@ class Authenticate
            if ($this->auth->check()) {
                // do an extra check on user object.
                /** @noinspection PhpUndefinedMethodInspection */
+
                /** @var User $user */
                $user = $this->auth->authenticate();
                $this->validateBlockedUser($user, $guards);
@@ -94,9 +97,6 @@ class Authenticate
        }

        foreach ($guards as $guard) {
-            if ('api' !== $guard) {
-                $this->auth->guard($guard)->authenticate();
-            }
            $result = $this->auth->guard($guard)->check();
            if ($result) {
                $user = $this->auth->guard($guard)->user();
@@ -107,7 +107,14 @@ class Authenticate
            }
        }

-        throw new AuthenticationException('Unauthenticated.', $guards);
+        // this is a massive hack, but if the hander has the oauth exception
+        // at this point we can report its error instead of a generic one.
+        $message = 'Unauthenticated.';
+        if (Handler::$lastError instanceof OAuthServerException) {
+            $message = Handler::$lastError->getHint();
+        }
+
+        throw new AuthenticationException($message, $guards);
    }

    /**
--- a/app/Repositories/Budget/AvailableBudgetRepository.php
+++ b/app/Repositories/Budget/AvailableBudgetRepository.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Repositories\Budget;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\TransactionCurrency;
@@ -205,9 +206,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
        ;
    }

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget
    {
        /** @var null|AvailableBudget */
--- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Repositories\Budget;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\AvailableBudget;
@@ -66,9 +67,7 @@ interface AvailableBudgetRepositoryInterface
     */
    public function get(?Carbon $start = null, ?Carbon $end = null): Collection;

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function getAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end): string;

    public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array;
@@ -90,9 +89,7 @@ interface AvailableBudgetRepositoryInterface
     */
    public function getByCurrencyDate(Carbon $start, Carbon $end, TransactionCurrency $currency): ?AvailableBudget;

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget;

    public function store(array $data): ?AvailableBudget;
--- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Repositories\Budget;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionCurrency;
@@ -44,9 +45,7 @@ use Illuminate\Support\Collection;
 */
 interface NoBudgetRepositoryInterface
 {
-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array;

    public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array;
--- a/app/Repositories/Budget/OperationsRepository.php
+++ b/app/Repositories/Budget/OperationsRepository.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Repositories\Budget;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -74,9 +75,8 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
    /**
     * This method is being used to generate the budget overview in the year/multi-year report. Its used
     * in both the year/multi-year budget overview AND in the accompanying chart.
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function getBudgetPeriodReport(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array
    {
        $carbonFormat = app('navigation')->preferredCarbonFormat($start, $end);
@@ -204,7 +204,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        ?TransactionCurrency $currency = null,
        bool                 $convertToNative = false
    ): array {
-        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", "%s").', __METHOD__, $currency?->code, var_export($convertToNative, true)));
+        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", %s).', __METHOD__, $currency?->code, var_export($convertToNative, true)));
        // this collector excludes all transfers TO liabilities (which are also withdrawals)
        // because those expenses only become expenses once they move from the liability to the friend.
        // 2024-12-24 disable the exclusion for now.
--- a/app/Repositories/Budget/OperationsRepositoryInterface.php
+++ b/app/Repositories/Budget/OperationsRepositoryInterface.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Repositories\Budget;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Budget;
@@ -51,9 +52,7 @@ interface OperationsRepositoryInterface
     */
    public function budgetedPerDay(Budget $budget): string;

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function getBudgetPeriodReport(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array;

    /**
@@ -71,6 +70,7 @@ interface OperationsRepositoryInterface
        Carbon               $end,
        ?Collection          $accounts = null,
        ?Collection          $budgets = null,
-        ?TransactionCurrency $currency = null
+        ?TransactionCurrency $currency = null,
+        bool                 $convertToNative = false
    ): array;
 }
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -444,7 +444,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte
    {
        $piggyBank->piggyBankEvents()->delete();
        foreach ($piggyBank->accounts as $account) {
-            if (0 !== bccomp('0', $account->pivot->current_amount)) {
+            if (0 !== bccomp('0', (string) $account->pivot->current_amount)) {
                event(new ChangedAmount($piggyBank, $account->pivot->current_amount, null, null));
            }
        }
--- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php
+++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php
@@ -440,10 +440,12 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,

        /** @var TransactionJournal $journal */
        foreach ($group->transactionJournals as $journal) {
+            $names = sprintf('%s%s', $names, $journal->date->format('Y-m-d-H:i:s'));
+
            /** @var Transaction $transaction */
            foreach ($journal->transactions as $transaction) {
                if (-1 === bccomp('0', (string)$transaction->amount)) {
-                    $sum   = bcadd($sum, $transaction->amount);
+                    $sum   = bcadd($sum, (string) $transaction->amount);
                    $names = sprintf('%s%s', $names, $transaction->account->name);
                }
            }
--- a/app/Services/Internal/Support/AccountServiceTrait.php
+++ b/app/Services/Internal/Support/AccountServiceTrait.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Services\Internal\Support;

+use Deprecated;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\DuplicateTransactionException;
@@ -193,8 +194,8 @@ trait AccountServiceTrait
    /**
     * @throws FireflyException
     *                          *
-     * @deprecated
     */
+    #[Deprecated]
    protected function createOBGroup(Account $account, array $data): TransactionGroup
    {
        app('log')->debug('Now going to create an OB group.');
--- a/app/Services/Internal/Update/JournalUpdateService.php
+++ b/app/Services/Internal/Update/JournalUpdateService.php
@@ -825,7 +825,13 @@ class JournalUpdateService
    public function isCompareHashChanged(): bool
    {
        Log::debug(sprintf('Now in %s', __METHOD__));
-        $compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionGroup);
+        $compareHash = hash('sha256', sprintf('%s', Carbon::now()->getTimestamp()));
+        if (!$this->transactionGroup instanceof TransactionGroup) {
+            $compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionJournal->transactionGroup);
+        }
+        if ($this->transactionGroup instanceof TransactionGroup) {
+            $this->transactionGroupRepository->getCompareHash($this->transactionGroup);
+        }
        Log::debug(sprintf('Compare hash is       "%s".', $compareHash));
        Log::debug(sprintf('Start compare hash is "%s".', $this->startCompareHash));

--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Support;

+use Deprecated;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
@@ -195,25 +196,19 @@ class Amount
        return $user->currencies()->orderBy('code', 'ASC')->get();
    }

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function getDefaultCurrency(): TransactionCurrency
    {
        return $this->getNativeCurrency();
    }

-    /**
-     * @deprecated use getDefaultCurrencyByUserGroup instead
-     */
+    #[Deprecated(message: 'use getDefaultCurrencyByUserGroup instead')]
    public function getDefaultCurrencyByUser(User $user): TransactionCurrency
    {
        return $this->getDefaultCurrencyByUserGroup($user->userGroup);
    }

-    /**
-     * @deprecated
-     */
+    #[Deprecated]
    public function getDefaultCurrencyByUserGroup(UserGroup $userGroup): TransactionCurrency
    {
        return $this->getNativeCurrencyByUserGroup($userGroup);
--- a/app/Support/Cronjobs/AutoBudgetCronjob.php
+++ b/app/Support/Cronjobs/AutoBudgetCronjob.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Cronjobs;
 use Carbon\Carbon;
 use FireflyIII\Jobs\CreateAutoBudgetLimits;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;

 /**
 * Class AutoBudgetCronjob
@@ -36,7 +37,7 @@ class AutoBudgetCronjob extends AbstractCronjob
    public function fire(): void
    {
        /** @var Configuration $config */
-        $config        = app('fireflyconfig')->get('last_ab_job', 0);
+        $config        = FireflyConfig::get('last_ab_job', 0);
        $lastTime      = (int) $config->data;
        $diff          = Carbon::now()->getTimestamp() - $lastTime;
        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
@@ -78,7 +79,7 @@ class AutoBudgetCronjob extends AbstractCronjob
        $this->jobSucceeded = true;
        $this->message      = 'Auto-budget cron job fired successfully.';

-        app('fireflyconfig')->set('last_ab_job', (int) $this->date->format('U'));
+        FireflyConfig::set('last_ab_job', (int) $this->date->format('U'));
        app('log')->info('Done with auto budget cron job task.');
    }
 }
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -106,7 +106,7 @@ trait AugumentData
    {
        /** @var AccountRepositoryInterface $repository */
        $repository = app(AccountRepositoryInterface::class);
-        $accounts   = $repository->getAccountsByType([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);
+        $accounts   = $repository->getAccountsByType([AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);
        $grouped    = $accounts->groupBy('id')->toArray();
        $return     = [];
        foreach ($accountIds as $combinedId) {
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -70,7 +70,7 @@ trait PeriodOverview
    protected JournalRepositoryInterface $journalRepos;

    /**
-     * This method returns "period entries", so nov-2015, dec-2015, etc etc (this depends on the users session range)
+     * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
     * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
     * performance reasons.
     *
@@ -97,18 +97,26 @@ trait PeriodOverview
        /** @var array $dates */
        $dates                   = app('navigation')->blockPeriods($start, $end, $range);
        $entries                 = [];
+        $spent                   = [];
+        $earned                  = [];
+        $transferredAway         = [];
+        $transferredIn           = [];

        // run a custom query because doing this with the collector is MEGA slow.
        $transactions            = $this->accountRepository->periodCollection($account, $start, $end);

        // loop dates
        Log::debug(sprintf('Count of loops: %d', count($dates)));
+        $loops                   = 0;
+        // stop after 10 loops for memory reasons.
        foreach ($dates as $currentDate) {
            $title                            = app('navigation')->periodShow($currentDate['start'], $currentDate['period']);
-            [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
+            if ($loops < 10) {
+                [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
+            }
            $entries[]
                                              = [
                                                  'title'              => $title,
@@ -119,6 +127,7 @@ trait PeriodOverview
                                                  'transferred_away'   => $this->groupByCurrency($transferredAway),
                                                  'transferred_in'     => $this->groupByCurrency($transferredIn),
                                              ];
+            ++$loops;
        }
        $cache->store($entries);
        Timer::stop('account-period-total');
@@ -548,27 +557,29 @@ trait PeriodOverview
        /** @var array $dates */
        $dates         = app('navigation')->blockPeriods($start, $end, $range);
        $entries       = [];
-
+        $spent         = [];
+        $earned        = [];
+        $transferred   = [];
        // collect all journals in this period (regardless of type)
        $collector     = app(GroupCollectorInterface::class);
        $collector->setTypes($types)->setRange($start, $end);
        $genericSet    = $collector->getExtractedJournals();
+        $loops         = 0;

        foreach ($dates as $currentDate) {
-            $spent       = [];
-            $earned      = [];
-            $transferred = [];
            $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);

-            // set to correct array
-            if ('expenses' === $transactionType || 'withdrawal' === $transactionType) {
-                $spent = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-            }
-            if ('revenue' === $transactionType || 'deposit' === $transactionType) {
-                $earned = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-            }
-            if ('transfer' === $transactionType || 'transfers' === $transactionType) {
-                $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+            if ($loops < 10) {
+                // set to correct array
+                if ('expenses' === $transactionType || 'withdrawal' === $transactionType) {
+                    $spent = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
+                if ('revenue' === $transactionType || 'deposit' === $transactionType) {
+                    $earned = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
+                if ('transfer' === $transactionType || 'transfers' === $transactionType) {
+                    $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
            }
            $entries[]
                         = [
@@ -579,6 +590,7 @@ trait PeriodOverview
                             'earned'             => $this->groupByCurrency($earned),
                             'transferred'        => $this->groupByCurrency($transferred),
                         ];
+            ++$loops;
        }

        return $entries;
--- a/app/Support/Http/Controllers/RequestInformation.php
+++ b/app/Support/Http/Controllers/RequestInformation.php
@@ -34,7 +34,7 @@ use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Route as RouteFacade;
-use Hash;
+use Illuminate\Support\Facades\Hash;

 use function Safe\parse_url;

--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
@@ -54,7 +54,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface
    private array          $notes; // @phpstan-ignore-line
    private array          $tags;
    private User           $user;
-    private TransactionCurrency $nativeCurrency;
+    private readonly TransactionCurrency $nativeCurrency;
    private UserGroup      $userGroup;

    public function __construct()
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -582,7 +582,7 @@ class Navigation
     */
    public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
    {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
            return 'endOfMonth';
        }

@@ -599,7 +599,7 @@ class Navigation
     */
    public function preferredRangeFormat(Carbon $start, Carbon $end): string
    {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
            return '1M';
        }

@@ -616,7 +616,7 @@ class Navigation
     */
    public function preferredSqlFormat(Carbon $start, Carbon $end): string
    {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
            return '%Y-%m';
        }

--- a/app/Support/Report/Summarizer/TransactionSummarizer.php
+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php
@@ -51,7 +51,7 @@ class TransactionSummarizer

    public function groupByCurrencyId(array $journals, string $method = 'negative', bool $includeForeign = true): array
    {
-        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s")', count($journals), $method));
+        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));
        $array = [];
        foreach ($journals as $journal) {
            $field                        = 'amount';
@@ -71,12 +71,12 @@ class TransactionSummarizer
            $foreignCurrencyDecimalPlaces = null;

            if ($this->convertToNative) {
-                Log::debug('convertToNative is true.');
+                //                Log::debug('convertToNative is true.');
                // if convert to native, use the native amount yes or no?
                $useNative  = $this->default->id !== (int) $journal['currency_id'];
                $useForeign = $this->default->id === (int) $journal['foreign_currency_id'];
                if ($useNative) {
-                    Log::debug(sprintf('Journal #%d switches to native amount (original is %s)', $journal['transaction_journal_id'], $journal['currency_code']));
+                    //                    Log::debug(sprintf('Journal #%d switches to native amount (original is %s)', $journal['transaction_journal_id'], $journal['currency_code']));
                    $field                 = 'native_amount';
                    $currencyId            = $this->default->id;
                    $currencyName          = $this->default->name;
@@ -85,7 +85,7 @@ class TransactionSummarizer
                    $currencyDecimalPlaces = $this->default->decimal_places;
                }
                if ($useForeign) {
-                    Log::debug(sprintf('Journal #%d switches to foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
+                    //                    Log::debug(sprintf('Journal #%d switches to foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
                    $field                 = 'foreign_amount';
                    $currencyId            = (int) $journal['foreign_currency_id'];
                    $currencyName          = $journal['foreign_currency_name'];
@@ -95,7 +95,7 @@ class TransactionSummarizer
                }
            }
            if (!$this->convertToNative) {
-                Log::debug('convertToNative is false.');
+                //                Log::debug('convertToNative is false.');
                // use foreign amount?
                $foreignCurrencyId = (int) $journal['foreign_currency_id'];
                if (0 !== $foreignCurrencyId) {
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -342,7 +342,7 @@ class Steam

            return $cache->get();
        }
-        Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
+        // Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
        if (null === $convertToNative) {
            $convertToNative = Amount::convertToNative($account->user);
        }
@@ -401,7 +401,7 @@ class Steam
            // Log::debug(sprintf('Virtual balance makes the (native) total %s', $return['balance']));
        }
        $final             = array_merge($return, $others);
-        Log::debug('Final balance is', $final);
+        // Log::debug('Final balance is', $final);
        $cache->store($final);

        return $final;
--- a/app/User.php
+++ b/app/User.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII;

+use Deprecated;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Exceptions\FireflyException;
@@ -188,9 +189,8 @@ class User extends Authenticatable
     * Get the models LDAP domain.
     *
     * @return string
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function getLdapDomain()
    {
        return $this->{$this->getLdapDomainColumn()};
@@ -200,9 +200,8 @@ class User extends Authenticatable
     * Get the database column name of the domain.
     *
     * @return string
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function getLdapDomainColumn()
    {
        return 'domain';
@@ -212,9 +211,8 @@ class User extends Authenticatable
     * Get the models LDAP GUID.
     *
     * @return string
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function getLdapGuid()
    {
        return $this->{$this->getLdapGuidColumn()};
@@ -224,9 +222,8 @@ class User extends Authenticatable
     * Get the models LDAP GUID database column name.
     *
     * @return string
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function getLdapGuidColumn()
    {
        return 'objectguid';
@@ -468,9 +465,8 @@ class User extends Authenticatable
     * Set the models LDAP domain.
     *
     * @param string $domain
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function setLdapDomain($domain): void
    {
        $this->{$this->getLdapDomainColumn()} = $domain;
@@ -480,9 +476,8 @@ class User extends Authenticatable
     * Set the models LDAP GUID.
     *
     * @param string $guid
-     *
-     * @deprecated
     */
+    #[Deprecated]
    public function setLdapGuid($guid): void
    {
        $this->{$this->getLdapGuidColumn()} = $guid;
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.2.19 - 2025-06-29
+
+### Changed
+
+- Currency seeder adds "CNY" again, because it turns out "RMB" is not the official, ISO 4217 code for the Chinese Yuan.
+- The "period overview" next to the transaction lists (withdrawals, deposits and transfers) is limited to 10 entries because it uses a lot of memory. I still have to fix this.
+
+### Removed
+
+- Support for ntfy, since the underlying library is no longer maintained. Will be replaced in the future.
+
+### Fixed
+
+- Running balance calculation also triggers on edit.
+- [Issue 10489](https://github.com/firefly-iii/firefly-iii/issues/10489) (Cannot create personal access token if using remote guard auth in latest version) reported by @Palomox
+- [Issue 10493](https://github.com/firefly-iii/firefly-iii/issues/10493) (Reports First Graph Wrong) reported by @nicolopozzato
+- [Issue 10499](https://github.com/firefly-iii/firefly-iii/issues/10499) (Password change results in error 500 (Class "Hash" not found)) reported by @willermo
+- [Issue 10507](https://github.com/firefly-iii/firefly-iii/issues/10507) (Opening balance transactions includes in `has_no_category` filter) reported by @lompi
+- [Issue 10510](https://github.com/firefly-iii/firefly-iii/issues/10510) (Liability accounts show as 'no name' on budget transaction report pie chart.) reported by @slackspace-io
+
+## 6.2.18 - 2025-06-20
+
+### Changed
+
+- Give more details about OAuth errors.
+- Currency seeder adds "RMB" instead of "CNY" for Chinese Yuan.
+
+### Fixed
+
+- [Issue 10454](https://github.com/firefly-iii/firefly-iii/issues/10454) (Bulk edit individually give an error) reported by @Rick45
+- [Issue 10470](https://github.com/firefly-iii/firefly-iii/issues/10470) (API endpoint `/api/v1/chart/account/overview` throws error) reported by @dreautall
+- Remove some leftover debug info
+
 ## 6.2.17 - 2025-06-12

 ### Changed
--- a/composer.lock
+++ b/composer.lock
@@ -939,16 +939,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.18.1",
+            "version": "2.18.3",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26"
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",
-                "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
                "shasum": ""
            },
            "require": {
@@ -998,7 +998,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.1"
+                "source": "https://github.com/filp/whoops/tree/2.18.3"
            },
            "funding": [
                {
@@ -1006,7 +1006,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-03T18:56:14+00:00"
+            "time": "2025-06-16T00:02:10+00:00"
        },
        {
            "name": "firebase/php-jwt",
@@ -1879,16 +1879,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.18.0",
+            "version": "v12.19.3",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "7d264a0dad2bfc5c154240b38e8ce9b2c4cdd14d"
+                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/7d264a0dad2bfc5c154240b38e8ce9b2c4cdd14d",
-                "reference": "7d264a0dad2bfc5c154240b38e8ce9b2c4cdd14d",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
+                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
                "shasum": ""
            },
            "require": {
@@ -2090,7 +2090,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-06-10T14:48:34+00:00"
+            "time": "2025-06-18T12:56:23+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2808,16 +2808,16 @@
        },
        {
            "name": "league/csv",
-            "version": "9.23.0",
+            "version": "9.24.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/csv.git",
-                "reference": "774008ad8a634448e4f8e288905e070e8b317ff3"
+                "reference": "e0221a3f16aa2a823047d59fab5809d552e29bc8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/774008ad8a634448e4f8e288905e070e8b317ff3",
-                "reference": "774008ad8a634448e4f8e288905e070e8b317ff3",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/e0221a3f16aa2a823047d59fab5809d552e29bc8",
+                "reference": "e0221a3f16aa2a823047d59fab5809d552e29bc8",
                "shasum": ""
            },
            "require": {
@@ -2827,14 +2827,14 @@
            "require-dev": {
                "ext-dom": "*",
                "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^3.69.0",
-                "phpbench/phpbench": "^1.4.0",
-                "phpstan/phpstan": "^1.12.18",
+                "friendsofphp/php-cs-fixer": "^3.75.0",
+                "phpbench/phpbench": "^1.4.1",
+                "phpstan/phpstan": "^1.12.27",
                "phpstan/phpstan-deprecation-rules": "^1.2.1",
                "phpstan/phpstan-phpunit": "^1.4.2",
                "phpstan/phpstan-strict-rules": "^1.6.2",
-                "phpunit/phpunit": "^10.5.16 || ^11.5.7",
-                "symfony/var-dumper": "^6.4.8 || ^7.2.3"
+                "phpunit/phpunit": "^10.5.16 || ^11.5.22",
+                "symfony/var-dumper": "^6.4.8 || ^7.3.0"
            },
            "suggest": {
                "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
@@ -2895,7 +2895,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-03-28T06:52:04+00:00"
+            "time": "2025-06-25T14:53:51+00:00"
        },
        {
            "name": "league/event",
@@ -2953,16 +2953,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "3.29.1",
+            "version": "3.30.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
                "shasum": ""
            },
            "require": {
@@ -2986,13 +2986,13 @@
                "composer/semver": "^3.0",
                "ext-fileinfo": "*",
                "ext-ftp": "*",
-                "ext-mongodb": "^1.3",
+                "ext-mongodb": "^1.3|^2",
                "ext-zip": "*",
                "friendsofphp/php-cs-fixer": "^3.5",
                "google/cloud-storage": "^1.23",
                "guzzlehttp/psr7": "^2.6",
                "microsoft/azure-storage-blob": "^1.1",
-                "mongodb/mongodb": "^1.2",
+                "mongodb/mongodb": "^1.2|^2",
                "phpseclib/phpseclib": "^3.0.36",
                "phpstan/phpstan": "^1.10",
                "phpunit/phpunit": "^9.5.11|^10.0",
@@ -3030,22 +3030,22 @@
            ],
            "support": {
                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
            },
-            "time": "2024-10-08T08:58:34+00:00"
+            "time": "2025-06-25T13:29:59+00:00"
        },
        {
            "name": "league/flysystem-local",
-            "version": "3.29.0",
+            "version": "3.30.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
                "shasum": ""
            },
            "require": {
@@ -3079,9 +3079,9 @@
                "local"
            ],
            "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
            },
-            "time": "2024-08-09T21:24:39+00:00"
+            "time": "2025-05-21T10:34:19+00:00"
        },
        {
            "name": "league/fractal",
@@ -3711,16 +3711,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "3.9.1",
+            "version": "3.10.1",
            "source": {
                "type": "git",
                "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d"
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
                "shasum": ""
            },
            "require": {
@@ -3728,9 +3728,9 @@
                "ext-json": "*",
                "php": "^8.1",
                "psr/clock": "^1.0",
-                "symfony/clock": "^6.3 || ^7.0",
+                "symfony/clock": "^6.3.12 || ^7.0",
                "symfony/polyfill-mbstring": "^1.0",
-                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
            },
            "provide": {
                "psr/clock-implementation": "1.0"
@@ -3738,14 +3738,13 @@
            "require-dev": {
                "doctrine/dbal": "^3.6.3 || ^4.0",
                "doctrine/orm": "^2.15.2 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "friendsofphp/php-cs-fixer": "^3.75.0",
                "kylekatarnls/multi-tester": "^2.5.3",
-                "ondrejmirtes/better-reflection": "^6.25.0.4",
                "phpmd/phpmd": "^2.15.0",
-                "phpstan/extension-installer": "^1.3.1",
-                "phpstan/phpstan": "^1.11.2",
-                "phpunit/phpunit": "^10.5.20",
-                "squizlabs/php_codesniffer": "^3.9.0"
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.17",
+                "phpunit/phpunit": "^10.5.46",
+                "squizlabs/php_codesniffer": "^3.13.0"
            },
            "bin": [
                "bin/carbon"
@@ -3813,7 +3812,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-01T19:51:51+00:00"
+            "time": "2025-06-21T15:19:35+00:00"
        },
        {
            "name": "nette/schema",
@@ -3965,16 +3964,16 @@
        },
        {
            "name": "nunomaduro/collision",
-            "version": "v8.8.1",
+            "version": "v8.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5"
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
                "shasum": ""
            },
            "require": {
@@ -4060,7 +4059,7 @@
                    "type": "patreon"
                }
            ],
-            "time": "2025-06-11T01:04:21+00:00"
+            "time": "2025-06-25T02:12:12+00:00"
        },
        {
            "name": "nunomaduro/termwind",
@@ -4806,16 +4805,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.43",
+            "version": "3.0.46",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
                "shasum": ""
            },
            "require": {
@@ -4896,7 +4895,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46"
            },
            "funding": [
                {
@@ -4912,7 +4911,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-12-14T21:12:59+00:00"
+            "time": "2025-06-26T16:29:55+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -5746,21 +5745,20 @@
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.8.1",
+            "version": "4.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
                "shasum": ""
            },
            "require": {
                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
-                "ext-json": "*",
                "php": "^8.0",
                "ramsey/collection": "^1.2 || ^2.0"
            },
@@ -5819,9 +5817,9 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
            },
-            "time": "2025-06-01T06:28:46+00:00"
+            "time": "2025-06-25T14:20:11+00:00"
        },
        {
            "name": "rcrowe/twigbridge",
@@ -6409,16 +6407,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "c4b217b578c11ec764867aa0c73e602c602965de"
+                "reference": "a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/c4b217b578c11ec764867aa0c73e602c602965de",
-                "reference": "c4b217b578c11ec764867aa0c73e602c602965de",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e",
+                "reference": "a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e",
                "shasum": ""
            },
            "require": {
@@ -6487,7 +6485,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.3.0"
+                "source": "https://github.com/symfony/cache/tree/v7.3.1"
            },
            "funding": [
                {
@@ -6503,7 +6501,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-06T19:00:13+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/cache-contracts",
@@ -6657,16 +6655,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
                "shasum": ""
            },
            "require": {
@@ -6731,7 +6729,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.1"
            },
            "funding": [
                {
@@ -6747,7 +6745,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -6883,16 +6881,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83"
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf68d225bc43629de4ff54778029aee6dc191b83",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/35b55b166f6752d6aaf21aa042fc5ed280fce235",
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235",
                "shasum": ""
            },
            "require": {
@@ -6940,7 +6938,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.3.0"
+                "source": "https://github.com/symfony/error-handler/tree/v7.3.1"
            },
            "funding": [
                {
@@ -6956,7 +6954,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-13T07:48:40+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -7244,16 +7242,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9"
+                "reference": "4403d87a2c16f33345dca93407a8714ee8c05a64"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/57e4fb86314015a695a750ace358d07a7e37b8a9",
-                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/4403d87a2c16f33345dca93407a8714ee8c05a64",
+                "reference": "4403d87a2c16f33345dca93407a8714ee8c05a64",
                "shasum": ""
            },
            "require": {
@@ -7265,6 +7263,7 @@
            },
            "conflict": {
                "amphp/amp": "<2.5",
+                "amphp/socket": "<1.1",
                "php-http/discovery": "<1.15",
                "symfony/http-foundation": "<6.4"
            },
@@ -7277,7 +7276,6 @@
            "require-dev": {
                "amphp/http-client": "^4.2.1|^5.0",
                "amphp/http-tunnel": "^1.0|^2.0",
-                "amphp/socket": "^1.1",
                "guzzlehttp/promises": "^1.4|^2.0",
                "nyholm/psr7": "^1.0",
                "php-http/httplug": "^1.0|^2.0",
@@ -7319,7 +7317,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-client/tree/v7.3.1"
            },
            "funding": [
                {
@@ -7335,7 +7333,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-02T08:23:16+00:00"
+            "time": "2025-06-28T07:58:39+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -7417,16 +7415,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "4236baf01609667d53b20371486228231eb135fd"
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4236baf01609667d53b20371486228231eb135fd",
-                "reference": "4236baf01609667d53b20371486228231eb135fd",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/23dd60256610c86a3414575b70c596e5deff6ed9",
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9",
                "shasum": ""
            },
            "require": {
@@ -7476,7 +7474,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.1"
            },
            "funding": [
                {
@@ -7492,20 +7490,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-12T14:48:23+00:00"
+            "time": "2025-06-23T15:07:14+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f"
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ac7b8e163e8c83dce3abcc055a502d4486051a9f",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1644879a66e4aa29c36fe33dfa6c54b450ce1831",
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831",
                "shasum": ""
            },
            "require": {
@@ -7590,7 +7588,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.1"
            },
            "funding": [
                {
@@ -7606,20 +7604,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-29T07:47:32+00:00"
+            "time": "2025-06-28T08:24:55+00:00"
        },
        {
            "name": "symfony/mailer",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c"
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/0f375bbbde96ae8c78e4aa3e63aabd486e33364c",
-                "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368",
                "shasum": ""
            },
            "require": {
@@ -7670,7 +7668,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.0"
+                "source": "https://github.com/symfony/mailer/tree/v7.3.1"
            },
            "funding": [
                {
@@ -7686,20 +7684,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-04T09:51:09+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/mailgun-mailer",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "3c1dfd9ff0a487a4116baec42d11ae21a061e3f1"
+                "reference": "8c18f2bff4e70ed5669ab8228302edd2fecd689b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/3c1dfd9ff0a487a4116baec42d11ae21a061e3f1",
-                "reference": "3c1dfd9ff0a487a4116baec42d11ae21a061e3f1",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/8c18f2bff4e70ed5669ab8228302edd2fecd689b",
+                "reference": "8c18f2bff4e70ed5669ab8228302edd2fecd689b",
                "shasum": ""
            },
            "require": {
@@ -7739,7 +7737,7 @@
            "description": "Symfony Mailgun Mailer Bridge",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.3.0"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.3.1"
            },
            "funding": [
                {
@@ -7755,7 +7753,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-28T08:24:38+00:00"
+            "time": "2025-06-20T16:15:52+00:00"
        },
        {
            "name": "symfony/mime",
@@ -8942,16 +8940,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/241d5ac4910d256660238a7ecf250deba4c73063",
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063",
                "shasum": ""
            },
            "require": {
@@ -9018,7 +9016,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.0"
+                "source": "https://github.com/symfony/translation/tree/v7.3.1"
            },
            "funding": [
                {
@@ -9034,7 +9032,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -9116,16 +9114,16 @@
        },
        {
            "name": "symfony/uid",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/uid.git",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3"
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/a69f69f3159b852651a6bf45a9fdd149520525bb",
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb",
                "shasum": ""
            },
            "require": {
@@ -9170,7 +9168,7 @@
                "uuid"
            ],
            "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.3.0"
+                "source": "https://github.com/symfony/uid/tree/v7.3.1"
            },
            "funding": [
                {
@@ -9186,20 +9184,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-24T14:28:13+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e"
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/548f6760c54197b1084e1e5c71f6d9d523f2f78e",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
                "shasum": ""
            },
            "require": {
@@ -9254,7 +9252,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.0"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.1"
            },
            "funding": [
                {
@@ -9270,7 +9268,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-27T18:39:23+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
        },
        {
            "name": "symfony/var-exporter",
@@ -10473,16 +10471,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404"
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/36706736a0c51d3337478fab9c919d78d2e03404",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/e8ccd73008487ba91da9877b373f8c447743f1ce",
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce",
                "shasum": ""
            },
            "require": {
@@ -10550,7 +10548,7 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.4.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.5.0"
            },
            "funding": [
                {
@@ -10558,7 +10556,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-10T09:34:58+00:00"
+            "time": "2025-06-19T22:41:50+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -11217,16 +11215,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "12.3.0",
+            "version": "12.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9075a8efc66e11bc55c319062e147bdb06777267"
+                "reference": "ddec29dfc128eba9c204389960f2063f3b7fa170"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9075a8efc66e11bc55c319062e147bdb06777267",
-                "reference": "9075a8efc66e11bc55c319062e147bdb06777267",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ddec29dfc128eba9c204389960f2063f3b7fa170",
+                "reference": "ddec29dfc128eba9c204389960f2063f3b7fa170",
                "shasum": ""
            },
            "require": {
@@ -11282,7 +11280,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.0"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.1"
            },
            "funding": [
                {
@@ -11302,7 +11300,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-23T15:49:03+00:00"
+            "time": "2025-06-18T08:58:13+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -11551,16 +11549,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.2.1",
+            "version": "12.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3"
+                "reference": "b71849b29f7a8d7574e4401873cb8b539896613f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f09fda04e7caea93cff50b4e90319184f3e6ee3",
-                "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b71849b29f7a8d7574e4401873cb8b539896613f",
+                "reference": "b71849b29f7a8d7574e4401873cb8b539896613f",
                "shasum": ""
            },
            "require": {
@@ -11574,13 +11572,13 @@
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.0",
+                "phpunit/php-code-coverage": "^12.3.1",
                "phpunit/php-file-iterator": "^6.0.0",
                "phpunit/php-invoker": "^6.0.0",
                "phpunit/php-text-template": "^5.0.0",
                "phpunit/php-timer": "^8.0.0",
                "sebastian/cli-parser": "^4.0.0",
-                "sebastian/comparator": "^7.0.1",
+                "sebastian/comparator": "^7.1.0",
                "sebastian/diff": "^7.0.0",
                "sebastian/environment": "^8.0.2",
                "sebastian/exporter": "^7.0.0",
@@ -11628,7 +11626,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.5"
            },
            "funding": [
                {
@@ -11652,20 +11650,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-06-07T05:17:47+00:00"
+            "time": "2025-06-27T04:37:55+00:00"
        },
        {
            "name": "rector/rector",
-            "version": "2.0.18",
+            "version": "2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "be3a452085b524a04056e3dfe72d861948711062"
+                "reference": "d513dea45a94394b660e15c155d1fa27826f8e30"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/be3a452085b524a04056e3dfe72d861948711062",
-                "reference": "be3a452085b524a04056e3dfe72d861948711062",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d513dea45a94394b660e15c155d1fa27826f8e30",
+                "reference": "d513dea45a94394b660e15c155d1fa27826f8e30",
                "shasum": ""
            },
            "require": {
@@ -11695,6 +11693,7 @@
                "MIT"
            ],
            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "homepage": "https://getrector.com/",
            "keywords": [
                "automation",
                "dev",
@@ -11703,7 +11702,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.0.18"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.0"
            },
            "funding": [
                {
@@ -11711,7 +11710,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-11T11:19:37+00:00"
+            "time": "2025-06-24T20:26:57+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -11772,16 +11771,16 @@
        },
        {
            "name": "sebastian/comparator",
-            "version": "7.0.1",
+            "version": "7.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "b478f34614f934e0291598d0c08cbaba9644bee5"
+                "reference": "03d905327dccc0851c9a08d6a979dfc683826b6f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b478f34614f934e0291598d0c08cbaba9644bee5",
-                "reference": "b478f34614f934e0291598d0c08cbaba9644bee5",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/03d905327dccc0851c9a08d6a979dfc683826b6f",
+                "reference": "03d905327dccc0851c9a08d6a979dfc683826b6f",
                "shasum": ""
            },
            "require": {
@@ -11792,7 +11791,7 @@
                "sebastian/exporter": "^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^12.0"
+                "phpunit/phpunit": "^12.2"
            },
            "suggest": {
                "ext-bcmath": "For comparing BcMath\\Number objects"
@@ -11800,7 +11799,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "7.0-dev"
+                    "dev-main": "7.1-dev"
                }
            },
            "autoload": {
@@ -11840,15 +11839,27 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/comparator/issues",
                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/7.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.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/comparator",
+                    "type": "tidelift"
                }
            ],
-            "time": "2025-03-07T07:00:32+00:00"
+            "time": "2025-06-17T07:41:58+00:00"
        },
        {
            "name": "sebastian/complexity",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,7 +78,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-06-11',
+    'version'                      => 'develop/2025-06-30',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/config/notifications.php
+++ b/config/notifications.php
@@ -26,7 +26,7 @@ return [
    'channels'      => [
        'email'    => ['enabled' => true, 'ui_configurable' => 0],
        'slack'    => ['enabled' => true, 'ui_configurable' => 1],
-        'ntfy'     => ['enabled' => false, 'ui_configurable' => 1],
+        // 'ntfy'     => ['enabled' => false, 'ui_configurable' => 1],
        'pushover' => ['enabled' => true, 'ui_configurable' => 1],
        //        'gotify'     => ['enabled' => false, 'ui_configurable' => 0],
        //        'pushbullet' => ['enabled' => false, 'ui_configurable' => 0],
--- a/config/search.php
+++ b/config/search.php
@@ -260,8 +260,6 @@ return [
        'destination_balance_lt'                                  => ['alias' => false, 'needs_context' => true],
        'destination_balance_is'                                  => ['alias' => false, 'needs_context' => true],
    ],
-    /**
-     * Which query parser to use - 'new' or 'legacy'
-     */
+    // Which query parser to use - 'new' or 'legacy'
    'query_parser'     => env('QUERY_PARSER_IMPLEMENTATION', 'legacy'),
 ];
--- a/database/seeders/TransactionCurrencySeeder.php
+++ b/database/seeders/TransactionCurrencySeeder.php
@@ -67,6 +67,7 @@ class TransactionCurrencySeeder extends Seeder
        // asian currencies
        $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 0];
        $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
+        //        $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
        $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2];
        $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2];

--- a/package-lock.json
+++ b/package-lock.json
--- a/resources/assets/v1/src/locales/ca.json
+++ b/resources/assets/v1/src/locales/ca.json
@@ -1,11 +1,11 @@
 {
    "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
-        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
+        "administrations_page_title": "Administracions financeres",
+        "administrations_index_menu": "Administracions financeres",
+        "expires_at": "Caduca a les",
+        "temp_administrations_introduction": "Firefly III aviat podr\u00e0 gestionar diverses administracions financeres. Ara mateix, nom\u00e9s en teniu una. Podeu definir el t\u00edtol d'aquesta administraci\u00f3 i la seva moneda nativa. Aix\u00f2 substitueix la configuraci\u00f3 anterior on definiu la vostra \"moneda predeterminada\". Aquesta configuraci\u00f3 ara est\u00e0 vinculada a l'administraci\u00f3 financera i pot ser diferent per a cada administraci\u00f3.",
        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_edit_sub_title_js": "Edita l'administraci\u00f3 financera \"{title}\"",
        "table": "Taula",
        "welcome_back": "Qu\u00e8 est\u00e0 passant?",
        "flash_error": "Error!",
@@ -20,7 +20,7 @@
        "split": "Dividir",
        "single_split": "Divisi\u00f3",
        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies_enabled": "Si tens nom\u00e9s una divisa habilitada, no cal afegir tipus de canvi.",
        "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">Transacci\u00f3 #{ID} (\"{title}\")<\/a> s'ha desat.",
        "webhook_stored_link": "S'ha desat <a href=\"webhooks\/show\/{ID}\">el Webook #{ID} (\"{title}\")<\/a> correctament.",
        "webhook_updated_link": "S'ha actualitzat el <a href=\"webhooks\/show\/{ID}\">Webook #{ID}<\/a> (\"{title}\").",
@@ -31,7 +31,7 @@
        "apply_rules_checkbox": "Aplicar regles",
        "fire_webhooks_checkbox": "Disparar webhooks",
        "no_budget_pointer": "Sembla que encara no tens cap pressupost. N'hauries de crear alguns a la p\u00e0gina de <a href=\"budgets\">pressuposts<\/a>. Els pressupostos et poden ajudar a fer el seguiment de les teves despeses.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Sembla que encara no tens cap subscripci\u00f3. N'hauries de crear alguns a la p\u00e0gina de <a href=\"subscriptions\">subscripcions<\/a>. Les subscripcions et poden ajudar a fer el seguiment de les teves despeses.",
        "source_account": "Compte d'origen",
        "hidden_fields_preferences": "Pots habilitar m\u00e9s opcions de transacci\u00f3 a la <a href=\"preferences\">configuraci\u00f3<\/a>.",
        "destination_account": "Compte de dest\u00ed",
@@ -46,7 +46,7 @@
        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
        "tags": "Etiquetes",
        "no_budget": "(cap pressupost)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(cap subscripci\u00f3)",
        "category": "Categoria",
        "attachments": "Adjunts",
        "notes": "Notes",
@@ -62,7 +62,7 @@
        "destination_account_reconciliation": "No pots editar el compte de dest\u00ed d'una transacci\u00f3 de reconciliaci\u00f3.",
        "source_account_reconciliation": "No pots editar el compte d'origen d'una transacci\u00f3 de consolidaci\u00f3.",
        "budget": "Pressupost",
-        "bill": "Subscription",
+        "bill": "Subscripci\u00f3",
        "you_create_withdrawal": "Est\u00e0s creant una retirada.",
        "you_create_transfer": "Est\u00e0s creant una transfer\u00e8ncia.",
        "you_create_deposit": "Est\u00e0s creant un ingr\u00e9s.",
@@ -140,21 +140,21 @@
        "response": "Resposta",
        "visit_webhook_url": "Visitar l'URL del webhook",
        "reset_webhook_secret": "Reiniciar el secret del webhook",
-        "header_exchange_rates": "Exchange rates",
+        "header_exchange_rates": "Tipus de canvi",
        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+        "exchange_rates_from_to": "Entre {from} i {to} (i a la inversa)",
        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates_rates": "Tipus de canvi",
+        "header_exchange_rates_table": "Taula amb els tipus de canvi",
+        "help_rate_form": "El dia d'avui, quants {to} obtindr\u00e0s amb un {from}?",
+        "add_new_rate": "Afegeix un nou tipus de canvi",
+        "save_new_rate": "Desa nou tipus"
    },
    "form": {
        "url": "URL",
        "active": "Actiu",
        "interest_date": "Data d'inter\u00e8s",
-        "administration_currency": "Native currency",
+        "administration_currency": "Moneda nativa",
        "title": "T\u00edtol",
        "date": "Data",
        "book_date": "Data de registre",
@@ -169,12 +169,12 @@
        "webhook_delivery": "Lliurament",
        "from_currency_to_currency": "{from} &rarr; {to}",
        "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Taxa"
    },
    "list": {
        "title": "T\u00edtol",
        "active": "Est\u00e0 actiu?",
-        "native_currency": "Native currency",
+        "native_currency": "Moneda nativa",
        "trigger": "Activador",
        "response": "Resposta",
        "delivery": "Lliurament",
--- a/resources/assets/v1/src/locales/tr.json
+++ b/resources/assets/v1/src/locales/tr.json
@@ -31,7 +31,7 @@
        "apply_rules_checkbox": "Apply rules",
        "fire_webhooks_checkbox": "Fire webhooks",
        "no_budget_pointer": "Hen\u00fcz b\u00fct\u00e7eniz yok gibi g\u00f6r\u00fcn\u00fcyor. <a href=\"budgets\">b\u00fct\u00e7eler<\/a> sayfas\u0131nda biraz olu\u015fturmal\u0131s\u0131n\u0131z. B\u00fct\u00e7eler, giderleri takip etmenize yard\u0131mc\u0131 olabilir.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Hen\u00fcz aboneli\u011finiz yok gibi g\u00f6r\u00fcn\u00fcyor. <a href=\"subscriptions\">Abonelik<\/a> sayfas\u0131nda bir abonelik olu\u015fturmal\u0131s\u0131n\u0131z. Abonelikler, harcamalar\u0131n\u0131z\u0131 takip etmenize yard\u0131mc\u0131 olabilir.",
        "source_account": "Kaynak hesap",
        "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
        "destination_account": "Hedef hesap",
--- a/resources/assets/v1/src/locales/zh-cn.json
+++ b/resources/assets/v1/src/locales/zh-cn.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "\u8d22\u52a1\u7ba1\u7406",
        "administrations_index_menu": "\u8d22\u52a1\u7ba1\u7406",
-        "expires_at": "Expires at",
+        "expires_at": "\u8fc7\u671f\u4e8e",
        "temp_administrations_introduction": "Firefly III \u4e0d\u4e45\u5c06\u80fd\u591f\u7ba1\u7406\u591a\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002 \u73b0\u5728\uff0c\u4f60\u53ea\u80fd\u6709\u4e00\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002\u4f60\u53ef\u4ee5\u8bbe\u7f6e\u8fd9\u4e2a\u8d22\u52a1\u7ba1\u7406\u7684\u6807\u9898\u53ca\u5176\u5f53\u5730\u8d27\u5e01\u3002 \u8fd9\u5c06\u53d6\u4ee3\u60a8\u5148\u524d\u8bbe\u7f6e\u7684\u201c\u9ed8\u8ba4\u8d27\u5e01\u201d\u3002 \u8fd9\u79cd\u8bbe\u7f6e\u73b0\u5728\u4e0e\u8d22\u52a1\u7ba1\u7406\u6302\u94a9\uff0c\u6bcf\u4e2a\u7ba1\u7406\u53ef\u4ee5\u6709\u4e0d\u540c\u7684\u8bbe\u7f6e\u3002",
        "administration_currency_form_help": "\u5982\u679c\u60a8\u66f4\u6539\u672c\u5730\u8d27\u5e01\uff0c\u9875\u9762\u52a0\u8f7d\u53ef\u80fd\u9700\u8981\u5f88\u957f\u65f6\u95f4\uff0c\u56e0\u4e3a\u4ea4\u6613\u53ef\u80fd\u9700\u8981\u8f6c\u6362\u4e3a\u60a8\u7684(\u65b0)\u672c\u5730\u8d27\u5e01\u3002",
        "administrations_page_edit_sub_title_js": "\u7f16\u8f91\u8d22\u52a1\u7ba1\u7406{title}",
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -133,7 +133,7 @@ return [
    'expenses_by_budget'                                                        => 'Expenses by budget',
    'income_by_category'                                                        => 'Income by category',
    'expenses_by_asset_account'                                                 => 'Expenses by asset account',
-    'expenses_by_expense_account'                                               => 'Expenses by expense account',
+    'expenses_by_expense_account'                                               => 'Expenses by destination account',
    'cannot_redirect_to_account'                                                => 'Firefly III cannot redirect you to the correct page. Apologies.',
    'sum_of_expenses'                                                           => 'Sum of expenses',
    'sum_of_income'                                                             => 'Sum of income',
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -369,9 +369,7 @@
                                            {% endif %}
                                        {% endfor %}
                                        {% for budgetLimit in budget.budgeted %}
-                                            D
                                            {% if null == budget.spent[budgetLimit.currency_id] %}
-                                                E
                                                <span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
                                                      data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
                                                {{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
--- a/tests/integration/Api/Autocomplete/AccountControllerTest.php
+++ b/tests/integration/Api/Autocomplete/AccountControllerTest.php
@@ -44,6 +44,6 @@ final class AccountControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.accounts'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }
 }
--- a/tests/integration/Api/Autocomplete/BillControllerTest.php
+++ b/tests/integration/Api/Autocomplete/BillControllerTest.php
@@ -84,7 +84,7 @@ final class BillControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.bills'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }

    public function testGivenAuthenticatedRequestWhenCallingTheBillsEndpointThenReturns200HttpCode(): void
--- a/tests/integration/Api/Autocomplete/BudgetControllerTest.php
+++ b/tests/integration/Api/Autocomplete/BudgetControllerTest.php
@@ -78,7 +78,7 @@ final class BudgetControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.budgets'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }

    public function testGivenAuthenticatedRequestWhenCallingTheBudgetsEndpointThenReturns200HttpCode(): void
--- a/tests/integration/Api/Autocomplete/CategoryControllerTest.php
+++ b/tests/integration/Api/Autocomplete/CategoryControllerTest.php
@@ -77,7 +77,7 @@ final class CategoryControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.categories'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }

    public function testGivenAuthenticatedRequestWhenCallingTheCategoriesEndpointThenReturns200HttpCode(): void
--- a/tests/integration/Api/Autocomplete/CurrencyControllerTest.php
+++ b/tests/integration/Api/Autocomplete/CurrencyControllerTest.php
@@ -80,7 +80,7 @@ final class CurrencyControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.currencies'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }

    public function testGivenAuthenticatedRequestWhenCallingTheCurrenciesEndpointThenReturns200HttpCode(): void
--- a/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php
+++ b/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php
@@ -78,7 +78,7 @@ final class ObjectGroupControllerTest extends TestCase
        $response = $this->get(route('api.v1.autocomplete.object-groups'), ['Accept' => 'application/json']);
        $response->assertStatus(401);
        $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
    }

    public function testGivenAuthenticatedRequestWhenCallingTheObjectGroupsEndpointThenReturns200HttpCode(): void
--- a/tests/integration/Support/Models/BillDateCalculatorTest.php
+++ b/tests/integration/Support/Models/BillDateCalculatorTest.php
@@ -56,7 +56,7 @@ final class BillDateCalculatorTest extends TestCase
    public function testGivenSomeDataItWorks(Carbon $earliest, Carbon $latest, Carbon $billStart, string $period, int $skip, ?Carbon $lastPaid, array $expected): void
    {
        $result = $this->calculator->getPayDates($earliest, $latest, $billStart, $period, $skip, $lastPaid);
-        self::assertSame($expected, $result);
+        $this->assertSame($expected, $result);
    }

    public static function provideDates(): Iterator
--- a/tests/integration/Support/NavigationCustomEndOfPeriodTest.php
+++ b/tests/integration/Support/NavigationCustomEndOfPeriodTest.php
@@ -45,6 +45,6 @@ final class NavigationCustomEndOfPeriodTest extends TestCase
        $navigation = new Navigation();

        $period     = $navigation->endOfPeriod($from, 'custom');
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }
 }
--- a/tests/unit/Support/Calendar/CalculatorTest.php
+++ b/tests/unit/Support/Calendar/CalculatorTest.php
@@ -73,7 +73,7 @@ final class CalculatorTest extends TestCase
    {
        $calculator = new Calculator();
        $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity);
-        self::assertSame($provider->expected()->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected()->toDateString(), $period->toDateString());
    }

    public static function provideAllPeriodicity(): iterable
@@ -102,7 +102,7 @@ final class CalculatorTest extends TestCase
    {
        $calculator = new Calculator();
        $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity, $provider->skip);
-        self::assertSame($provider->expected()->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected()->toDateString(), $period->toDateString());
    }

    public static function provideSkippedIntervals(): iterable
--- a/tests/unit/Support/Calendar/Periodicity/IntervalTestCase.php
+++ b/tests/unit/Support/Calendar/Periodicity/IntervalTestCase.php
@@ -36,7 +36,7 @@ abstract class IntervalTestCase extends TestCase
    public function testGivenAnEpochWhenCallTheNextDateThenReturnsTheExpectedDateSuccessful(IntervalProvider $provider): void
    {
        $period = static::factory()->nextDate($provider->epoch);
-        self::assertSame($provider->expected->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected->toDateString(), $period->toDateString());
    }

    public static function provider(): iterable
--- a/tests/unit/Support/NavigationAddPeriodTest.php
+++ b/tests/unit/Support/NavigationAddPeriodTest.php
@@ -56,7 +56,7 @@ final class NavigationAddPeriodTest extends TestCase
    public function testGivenAFrequencyAndSkipIntervalWhenCalculateTheDateThenReturnsTheSkippedDateSuccessful(int $skip, string $frequency, Carbon $from, Carbon $expected): void
    {
        $period = $this->navigation->addPeriod($from, $frequency, $skip);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function providePeriodsWithSkippingParam(): iterable
@@ -108,7 +108,7 @@ final class NavigationAddPeriodTest extends TestCase
    public function testGivenAFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
    {
        $period = $this->navigation->addPeriod($from, $frequency, 0);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function providePeriods(): Iterator
@@ -158,7 +158,7 @@ final class NavigationAddPeriodTest extends TestCase
    public function testGivenAIntervalWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(Periodicity $periodicity, Carbon $from, Carbon $expected): void
    {
        $period = $this->navigation->nextDateByInterval($from, $periodicity);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function provideFrequencies(): Iterator
@@ -212,7 +212,7 @@ final class NavigationAddPeriodTest extends TestCase
    public function testGivenAMonthFrequencyWhenCalculateTheDateThenReturnsTheLastDayOfMonthSuccessful(string $frequency, Carbon $from, Carbon $expected): void
    {
        $period = $this->navigation->addPeriod($from, $frequency, 0);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function provideMonthPeriods(): Iterator
--- a/tests/unit/Support/NavigationEndOfPeriodTest.php
+++ b/tests/unit/Support/NavigationEndOfPeriodTest.php
@@ -55,7 +55,7 @@ final class NavigationEndOfPeriodTest extends TestCase
    public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
    {
        $period = clone $this->navigation->endOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function provideDates(): Iterator
@@ -116,7 +116,7 @@ final class NavigationEndOfPeriodTest extends TestCase
        Log::spy();

        $period          = $this->navigation->endOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
        $expectedMessage = sprintf('Cannot do endOfPeriod for $repeat_freq "%s"', $frequency);

        Log::shouldHaveReceived('error', [$expectedMessage]);
--- a/tests/unit/Support/NavigationPreferredCarbonFormatByPeriodTest.php
+++ b/tests/unit/Support/NavigationPreferredCarbonFormatByPeriodTest.php
@@ -54,7 +54,7 @@ final class NavigationPreferredCarbonFormatByPeriodTest extends TestCase
    public function testGivenAPeriodWhenCallPreferredCarbonFormatByPeriodThenReturnsExpectedFormat(string $period, string $expected): void
    {
        $formatPeriod = $this->navigation->preferredCarbonFormatByPeriod($period);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
    }

    public static function providePeriods(): Iterator
--- a/tests/unit/Support/NavigationPreferredCarbonFormatTest.php
+++ b/tests/unit/Support/NavigationPreferredCarbonFormatTest.php
@@ -55,7 +55,7 @@ final class NavigationPreferredCarbonFormatTest extends TestCase
    public function testGivenStartAndEndDatesWhenCallPreferredCarbonFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
    {
        $carbonFormat = $this->navigation->preferredCarbonFormat($start, $end);
-        self::assertSame($expected, $carbonFormat);
+        $this->assertSame($expected, $carbonFormat);
    }

    public static function providePeriods(): Iterator
--- a/tests/unit/Support/NavigationPreferredEndOfPeriodTest.php
+++ b/tests/unit/Support/NavigationPreferredEndOfPeriodTest.php
@@ -55,7 +55,7 @@ final class NavigationPreferredEndOfPeriodTest extends TestCase
    public function testGivenStartAndEndDatesWhenCallPreferredEndOfPeriodThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
    {
        $formatPeriod = $this->navigation->preferredEndOfPeriod($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
    }

    public static function providePeriods(): Iterator
--- a/tests/unit/Support/NavigationPreferredRangeFormatTest.php
+++ b/tests/unit/Support/NavigationPreferredRangeFormatTest.php
@@ -55,7 +55,7 @@ final class NavigationPreferredRangeFormatTest extends TestCase
    public function testGivenStartAndEndDatesWhenCallPreferredRangeFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
    {
        $formatPeriod = $this->navigation->preferredRangeFormat($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
    }

    public static function providePeriods(): Iterator
--- a/tests/unit/Support/NavigationPreferredSqlFormatTest.php
+++ b/tests/unit/Support/NavigationPreferredSqlFormatTest.php
@@ -55,7 +55,7 @@ final class NavigationPreferredSqlFormatTest extends TestCase
    public function testGivenStartAndEndDatesWhenCallPreferredSqlFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
    {
        $formatPeriod = $this->navigation->preferredSqlFormat($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
    }

    public static function provideDates(): Iterator
--- a/tests/unit/Support/NavigationStartOfPeriodTest.php
+++ b/tests/unit/Support/NavigationStartOfPeriodTest.php
@@ -56,7 +56,7 @@ final class NavigationStartOfPeriodTest extends TestCase
    public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
    {
        $period = $this->navigation->startOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function provideDates(): Iterator
@@ -121,7 +121,7 @@ final class NavigationStartOfPeriodTest extends TestCase
        ;

        $period = $this->navigation->startOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
    }

    public static function provideUnknownFrequencies(): Iterator
--- a/tests/unit/Support/Search/QueryParser/AbstractQueryParserInterfaceParseQueryTester.php
+++ b/tests/unit/Support/Search/QueryParser/AbstractQueryParserInterfaceParseQueryTester.php
@@ -26,7 +26,7 @@ abstract class AbstractQueryParserInterfaceParseQueryTester extends TestCase
    {
        $actual = $this->createParser()->parse($query);

-        self::assertObjectEquals($expected, $actual);
+        $this->assertObjectEquals($expected, $actual);

    }
Author	SHA1	Message	Date
github-actions[bot]	1d02ed6a56	Merge pull request #10525 from firefly-iii/release-1751254389 🤖 Automatically merge the PR into the develop branch.	2025-06-30 05:33:15 +02:00
JC5	cca53cb0e8	🤖 Auto commit for release 'develop' on 2025-06-30	2025-06-30 05:33:09 +02:00
github-actions[bot]	ab33aee4b1	Merge pull request #10521 from firefly-iii/release-1751208250 🤖 Automatically merge the PR into the develop branch.	2025-06-29 16:44:18 +02:00
JC5	41d4fab071	🤖 Auto commit for release 'develop' on 2025-06-29	2025-06-29 16:44:10 +02:00
James Cole	f0a1913dc6	Enable new query parser by default.	2025-06-29 06:46:40 +02:00
github-actions[bot]	b956b463c2	Merge pull request #10515 from firefly-iii/release-1751095523 🤖 Automatically merge the PR into the develop branch.	2025-06-28 09:25:30 +02:00
JC5	43603c4990	🤖 Auto commit for release 'develop' on 2025-06-28	2025-06-28 09:25:23 +02:00
github-actions[bot]	196e738f60	Merge pull request #10514 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-06-28 08:53:36 +02:00
github-actions[bot]	59e2ea357a	Merge pull request #10513 from firefly-iii/release-1751093606 🤖 Automatically merge the PR into the develop branch.	2025-06-28 08:53:32 +02:00
JC5	5e9d942069	🤖 Auto commit for release 'v6.2.19' on 2025-06-28	2025-06-28 08:53:26 +02:00
James Cole	53d5bedd85	Update changelog and config.	2025-06-28 08:48:53 +02:00
James Cole	49c68af07b	Fix #10510	2025-06-27 20:59:47 +02:00
James Cole	c84c8e1aef	Fix #10507	2025-06-27 11:10:41 +02:00
James Cole	a8d43d7174	Add donation text.	2025-06-26 17:32:06 +02:00
James Cole	1087278890	Make sure phpcs and rector agree on styles.	2025-06-26 11:57:15 +02:00
James Cole	ae5912ab52	Remove some logs.	2025-06-26 11:45:31 +02:00
github-actions[bot]	035bd96ae5	Merge pull request #10501 from firefly-iii/release-1750913017 🤖 Automatically merge the PR into the develop branch.	2025-06-26 06:43:46 +02:00
JC5	7283c616a0	🤖 Auto commit for release 'develop' on 2025-06-26	2025-06-26 06:43:37 +02:00
James Cole	5706666bb6	Fewer loops.	2025-06-26 06:40:00 +02:00
James Cole	4607466fb6	Remove some debug logging.	2025-06-26 06:36:15 +02:00
James Cole	34bcfcfe9b	Fix #10499	2025-06-25 21:35:52 +02:00
github-actions[bot]	05986cb6a6	Merge pull request #10495 from firefly-iii/release-1750873643 🤖 Automatically merge the PR into the develop branch.	2025-06-25 19:47:30 +02:00
JC5	0c4ee9f043	🤖 Auto commit for release 'develop' on 2025-06-25	2025-06-25 19:47:23 +02:00
James Cole	ff222795cf	Add date to compare hash.	2025-06-25 19:43:03 +02:00
James Cole	e0c76695ee	Fix tests	2025-06-24 13:25:03 +02:00
James Cole	ae126e8322	Fix #10493	2025-06-24 13:14:31 +02:00
James Cole	8f9c35fbe8	Experimental fix for #10489	2025-06-23 20:45:00 +02:00
github-actions[bot]	84efd6e2ee	Merge pull request #10487 from firefly-iii/release-1750649637 🤖 Automatically merge the PR into the develop branch.	2025-06-23 05:34:05 +02:00
JC5	b1fbe4e909	🤖 Auto commit for release 'develop' on 2025-06-23	2025-06-23 05:33:57 +02:00
James Cole	8576877072	Reverse currency change.	2025-06-20 07:45:41 +02:00
github-actions[bot]	c298aced01	Merge pull request #10479 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-06-20 06:45:28 +02:00
github-actions[bot]	ac61a78d8d	Merge pull request #10478 from firefly-iii/release-1750394715 🤖 Automatically merge the PR into the develop branch.	2025-06-20 06:45:22 +02:00
JC5	fce90a94c4	🤖 Auto commit for release 'v6.2.18' on 2025-06-20	2025-06-20 06:45:15 +02:00
github-actions[bot]	023a4f178d	Merge pull request #10477 from firefly-iii/release-1750393987 🤖 Automatically merge the PR into the develop branch.	2025-06-20 06:33:14 +02:00
JC5	ef254995ad	🤖 Auto commit for release 'develop' on 2025-06-20	2025-06-20 06:33:07 +02:00
James Cole	faeb74634b	Merge branch 'main' into develop	2025-06-20 06:28:53 +02:00
James Cole	b5baae373f	Move changelog.	2025-06-20 06:28:42 +02:00
James Cole	63de711cda	Update changelog.	2025-06-20 06:24:19 +02:00
James Cole	bd28d116cb	Fix currency seeder, add some debug logs.	2025-06-20 05:59:44 +02:00
github-actions[bot]	7efc2861bc	Merge pull request #10468 from firefly-iii/release-1750044727 🤖 Automatically merge the PR into the develop branch.	2025-06-16 05:32:16 +02:00
JC5	5c689a2ca2	🤖 Auto commit for release 'develop' on 2025-06-16	2025-06-16 05:32:08 +02:00
github-actions[bot]	d5d65df76f	Merge pull request #10459 from firefly-iii/release-1749897382 🤖 Automatically merge the PR into the develop branch.	2025-06-14 12:36:32 +02:00
JC5	df7d4f700c	🤖 Auto commit for release 'develop' on 2025-06-14	2025-06-14 12:36:22 +02:00
James Cole	efebe3cb41	Remove debug letters.	2025-06-14 12:31:54 +02:00
James Cole	2ba5b6ae49	Fix #10454	2025-06-14 10:18:58 +02:00
github-actions[bot]	31d93efab2	Merge pull request #10451 from firefly-iii/release-1749735701 🤖 Automatically merge the PR into the develop branch.	2025-06-12 15:41:49 +02:00
JC5	657b95485c	🤖 Auto commit for release 'develop' on 2025-06-12	2025-06-12 15:41:41 +02:00
Sander Dorigo	3bfc12f93b	Try to be more clear about OAuth errors	2025-06-12 15:36:38 +02:00
James Cole	ccfd2f2ac3	Update fr.yml Signed-off-by: James Cole <james@firefly-iii.org>	2025-06-12 13:12:50 +02:00
James Cole	fb3fe0d87b	Update bug.yml Signed-off-by: James Cole <james@firefly-iii.org>	2025-06-12 13:11:55 +02:00
James Cole	c80c6d52fe	Update config.yml Signed-off-by: James Cole <james@firefly-iii.org>	2025-06-12 13:02:14 +02:00
Sander Dorigo	0fb3c0c7bf	Add missing variable name	2025-06-11 15:51:39 +02:00
github-actions[bot]	43c625bee2	Merge pull request #10444 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-06-11 14:07:28 +02:00
github-actions[bot]	967a5dd256	Merge pull request #10443 from firefly-iii/release-1749643634 🤖 Automatically merge the PR into the develop branch.	2025-06-11 14:07:22 +02:00
JC5	3c9d1bcaa1	🤖 Auto commit for release 'v6.2.17' on 2025-06-11	2025-06-11 14:07:14 +02:00