Auto commit for release 'develop' on 2024-07-08

Fix https://github.com/firefly-iii/firefly-iii/issues/8844
Fix https://github.com/firefly-iii/firefly-iii/issues/9021
2026-03-11 06:48:13 +00:00 · 2024-07-08 05:07:00 +02:00 · 2024-07-06 18:50:33 +02:00 · 2024-07-06 15:50:20 +02:00 · 2024-07-06 15:43:27 +02:00 · 2024-07-06 15:42:50 +02:00
10 changed files with 313 additions and 261 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -1184,16 +1184,16 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "6.0.1",
+            "version": "6.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "ab83243ecc233de5655b76f577711de9f842e712"
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ab83243ecc233de5655b76f577711de9f842e712",
-                "reference": "ab83243ecc233de5655b76f577711de9f842e712",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
                "shasum": ""
            },
            "require": {
@@ -1239,7 +1239,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
            },
            "funding": [
                {
@@ -1247,20 +1247,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T07:30:33+00:00"
+            "time": "2024-07-03T04:53:05+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3"
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
-                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae",
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae",
                "shasum": ""
            },
            "require": {
@@ -1324,7 +1324,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.1"
+                "source": "https://github.com/symfony/console/tree/v7.1.2"
            },
            "funding": [
                {
@@ -1340,7 +1340,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1567,16 +1567,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2"
+                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2",
-                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c",
+                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c",
                "shasum": ""
            },
            "require": {
@@ -1613,7 +1613,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.1"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.2"
            },
            "funding": [
                {
@@ -1629,7 +1629,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
        },
        {
            "name": "symfony/finder",
@@ -2444,16 +2444,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2"
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2",
-                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2",
+                "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
                "shasum": ""
            },
            "require": {
@@ -2511,7 +2511,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.1"
+                "source": "https://github.com/symfony/string/tree/v7.1.2"
            },
            "funding": [
                {
@@ -2527,7 +2527,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-04T06:40:14+00:00"
+            "time": "2024-06-28T09:27:18+00:00"
        }
    ],
    "packages-dev": [],
--- a/app/Http/Controllers/Json/RecurrenceController.php
+++ b/app/Http/Controllers/Json/RecurrenceController.php
@@ -81,7 +81,12 @@ class RecurrenceController extends Controller
        $skip                          = $skip < 0 || $skip > 31 ? 0 : $skip;
        $weekend                       = $weekend < 1 || $weekend > 4 ? 1 : $weekend;

-        if (null === $start || null === $end || null === $firstDate || null === $endDate) {
+        if (null === $endDate) {
+            // safety catch:
+            $endDate = now()->addYear();
+        }
+
+        if (null === $start || null === $end || null === $firstDate) {
            return response()->json();
        }

--- a/app/Http/Controllers/Recurring/ShowController.php
+++ b/app/Http/Controllers/Recurring/ShowController.php
@@ -84,6 +84,7 @@ class ShowController extends Controller
        $transformer->setParameters(new ParameterBag());

        $array                 = $transformer->transform($recurrence);
+
        $groups                = $this->recurring->getTransactions($recurrence);
        $today                 = today(config('app.timezone'));
        $array['repeat_until'] = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null;
--- a/app/Jobs/CreateRecurringTransactions.php
+++ b/app/Jobs/CreateRecurringTransactions.php
@@ -361,11 +361,17 @@ class CreateRecurringTransactions implements ShouldQueue
        // create transaction array and send to factory.
        $groupTitle              = null;
        $count                   = $recurrence->recurrenceTransactions->count();
-        if ($count > 1) {
+        // #8844, if there is one recurrence transaction, use the first title as the title.
+        if (1 === $count) {
            /** @var RecurrenceTransaction $first */
            $first      = $recurrence->recurrenceTransactions()->first();
            $groupTitle = $first->description;
        }
+        // #8844, if there are more, use the recurrence transaction itself.
+        if ($count > 1) {
+            $groupTitle = $recurrence->title;
+        }
+
        if (0 === $count) {
            app('log')->error('No transactions to be created in this recurrence. Cannot continue.');

@@ -411,12 +417,12 @@ class CreateRecurringTransactions implements ShouldQueue
        /** @var RecurrenceTransaction $transaction */
        foreach ($transactions as $index => $transaction) {
            $single   = [
-                'type'                  => null === $first->transactionType ? strtolower($recurrence->transactionType->type) : strtolower($first->transactionType->type),
+                'type'                  => null === $transaction?->transactionType?->type ? strtolower($recurrence->transactionType->type) : strtolower($transaction->transactionType->type),
                'date'                  => $date,
                'user'                  => $recurrence->user_id,
                'currency_id'           => $transaction->transaction_currency_id,
                'currency_code'         => null,
-                'description'           => $first->description,
+                'description'           => $transaction->description,
                'amount'                => $transaction->amount,
                'budget_id'             => $this->repository->getBudget($transaction),
                'budget_name'           => null,
--- a/app/Repositories/Recurring/RecurringRepository.php
+++ b/app/Repositories/Recurring/RecurringRepository.php
@@ -408,10 +408,16 @@ class RecurringRepository implements RecurringRepositoryInterface

    private function filterMaxDate(?Carbon $max, array $occurrences): array
    {
-        if (null === $max) {
-            return $occurrences;
-        }
        $filtered = [];
+        if (null === $max) {
+            foreach ($occurrences as $date) {
+                if ($date->gt(today())) {
+                    $filtered[] = $date;
+                }
+            }
+
+            return $filtered;
+        }
        foreach ($occurrences as $date) {
            if ($date->lte($max) && $date->gt(today())) {
                $filtered[] = $date;
--- a/app/Support/Http/Api/ExchangeRateConverter.php
+++ b/app/Support/Http/Api/ExchangeRateConverter.php
@@ -29,6 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;

 /**
@@ -48,7 +49,11 @@ class ExchangeRateConverter
     */
    public function convert(TransactionCurrency $from, TransactionCurrency $to, Carbon $date, string $amount): string
    {
-        Log::debug('convert()');
+        if (false === config('cer.enabled')) {
+            Log::debug('ExchangeRateConverter: disabled, return amount as is.');
+
+            return $amount;
+        }
        $rate = $this->getCurrencyRate($from, $to, $date);

        return bcmul($amount, $rate);
@@ -59,7 +64,11 @@ class ExchangeRateConverter
     */
    public function getCurrencyRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
    {
-        Log::debug('getCurrencyRate()');
+        if (false === config('cer.enabled')) {
+            Log::debug('ExchangeRateConverter: disabled, return "1".');
+
+            return '1';
+        }
        $rate = $this->getRate($from, $to, $date);

        return '0' === $rate ? '1' : $rate;
@@ -70,25 +79,36 @@ class ExchangeRateConverter
     */
    private function getRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
    {
-        Log::debug('getRate()');
-        if ($this->isPrepared && $this->noPreparedRates) {
-            $fallback = $this->fallback[$from->id][$to->id] ?? '0';
-            Log::debug(sprintf('Return fallback rate from #%d to #%d on %s: %s', $from->id, $to->id, $date->format('Y-m-d'), $fallback));
+        $key    = $this->getCacheKey($from, $to, $date);
+        $res    = Cache::get($key, null);

-            return $fallback;
+        // find in cache
+        if (null !== $res) {
+            Log::debug(sprintf('ExchangeRateConverter: Return cached rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+
+            return $res;
        }
-        // first attempt:
+
+        // find in database
        $rate   = $this->getFromDB($from->id, $to->id, $date->format('Y-m-d'));
        if (null !== $rate) {
+            Cache::forever($key, $rate);
+            Log::debug(sprintf('ExchangeRateConverter: Return DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+
            return $rate;
        }
-        // no result. perhaps the other way around?
+
+        // find reverse in database
        $rate   = $this->getFromDB($to->id, $from->id, $date->format('Y-m-d'));
        if (null !== $rate) {
-            return bcdiv('1', $rate);
+            $rate = bcdiv('1', $rate);
+            Cache::forever($key, $rate);
+            Log::debug(sprintf('ExchangeRateConverter: Return DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+
+            return $rate;
        }

-        // if nothing in place, fall back on the rate for $from to EUR
+        // fallback scenario.
        $first  = $this->getEuroRate($from, $date);
        $second = $this->getEuroRate($to, $date);

@@ -96,17 +116,19 @@ class ExchangeRateConverter
        if (0 === bccomp('0', $first) || 0 === bccomp('0', $second)) {
            Log::warning(sprintf('$first is "%s" and $second is "%s"', $first, $second));

-            return '0';
+            return '1';
        }

        $second = bcdiv('1', $second);
+        $rate   = bcmul($first, $second);
+        Log::debug(sprintf('ExchangeRateConverter: Return DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+        Cache::forever($key, $rate);

-        return bcmul($first, $second);
+        return $rate;
    }

    private function getFromDB(int $from, int $to, string $date): ?string
    {
-        Log::debug('getFromDB()');
        if ($from === $to) {
            return '1';
        }
@@ -115,7 +137,7 @@ class ExchangeRateConverter
        // perhaps the rate has been cached during this particular run
        $preparedRate = $this->prepared[$date][$from][$to] ?? null;
        if (null !== $preparedRate && 0 !== bccomp('0', $preparedRate)) {
-            Log::debug(sprintf('Found prepared rate from #%d to #%d on %s.', $from, $to, $date));
+            Log::debug(sprintf('ExchangeRateConverter: Found prepared rate from #%d to #%d on %s.', $from, $to, $date));

            return $preparedRate;
        }
@@ -127,7 +149,7 @@ class ExchangeRateConverter
            if ('' === $rate) {
                return null;
            }
-            Log::debug(sprintf('Found cached rate from #%d to #%d on %s.', $from, $to, $date));
+            Log::debug(sprintf('ExchangeRateConverter: Found !cached! rate from #%d to #%d on %s.', $from, $to, $date));

            return $rate;
        }
@@ -142,19 +164,19 @@ class ExchangeRateConverter
            ->first()
        ;
        ++$this->queryCount;
-        $rate         = (string)$result?->rate;
+        $rate         = (string) $result?->rate;

        if ('' === $rate) {
-            app('log')->debug(sprintf('Found no rate for #%d->#%d (%s) in the DB.', $from, $to, $date));
+            app('log')->debug(sprintf('ExchangeRateConverter: Found no rate for #%d->#%d (%s) in the DB.', $from, $to, $date));

            return null;
        }
        if (0 === bccomp('0', $rate)) {
-            app('log')->debug(sprintf('Found rate for #%d->#%d (%s) in the DB, but it\'s zero.', $from, $to, $date));
+            app('log')->debug(sprintf('ExchangeRateConverter: Found rate for #%d->#%d (%s) in the DB, but it\'s zero.', $from, $to, $date));

            return null;
        }
-        app('log')->debug(sprintf('Found rate for #%d->#%d (%s) in the DB: %s.', $from, $to, $date, $rate));
+        app('log')->debug(sprintf('ExchangeRateConverter: Found rate for #%d->#%d (%s) in the DB: %s.', $from, $to, $date, $rate));
        $cache->store($rate);

        // if the rate has not been cached during this particular run, save it
@@ -178,7 +200,6 @@ class ExchangeRateConverter
     */
    private function getEuroRate(TransactionCurrency $currency, Carbon $date): string
    {
-        Log::debug('getEuroRate()');
        $euroId = $this->getEuroId();
        if ($euroId === $currency->id) {
            return '1';
@@ -198,7 +219,7 @@ class ExchangeRateConverter
        // grab backup values from config file:
        $backup = config(sprintf('cer.rates.%s', $currency->code));
        if (null !== $backup) {
-            return bcdiv('1', (string)$backup);
+            return bcdiv('1', (string) $backup);
            // app('log')->debug(sprintf('Backup rate for %s to EUR is %s.', $currency->code, $backup));
            // return $backup;
        }
@@ -216,7 +237,7 @@ class ExchangeRateConverter
        $cache = new CacheProperties();
        $cache->addProperty('cer-euro-id');
        if ($cache->has()) {
-            return (int)$cache->get();
+            return (int) $cache->get();
        }
        $euro  = TransactionCurrency::whereCode('EUR')->first();
        ++$this->queryCount;
@@ -233,6 +254,9 @@ class ExchangeRateConverter
     */
    public function prepare(TransactionCurrency $from, TransactionCurrency $to, Carbon $start, Carbon $end): void
    {
+        if (false === config('cer.enabled')) {
+            return;
+        }
        Log::debug('prepare()');
        $start->startOfDay();
        $end->endOfDay();
@@ -305,6 +329,14 @@ class ExchangeRateConverter

    public function summarize(): void
    {
+        if (false === config('cer.enabled')) {
+            return;
+        }
        Log::debug(sprintf('ExchangeRateConverter ran %d queries.', $this->queryCount));
    }
+
+    private function getCacheKey(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
+    {
+        return sprintf('cer-%d-%d-%s', $from->id, $to->id, $date->format('Y-m-d'));
+    }
 }
--- a/app/Transformers/RecurrenceTransformer.php
+++ b/app/Transformers/RecurrenceTransformer.php
@@ -128,7 +128,8 @@ class RecurrenceTransformer extends AbstractTransformer
            ];

            // get the (future) occurrences for this specific type of repetition:
-            $occurrences     = $this->repository->getXOccurrencesSince($repetition, $fromDate, new Carbon(), 5);
+            $amount          = 'daily' === $repetition->repetition_type ? 9 : 5;
+            $occurrences     = $this->repository->getXOccurrencesSince($repetition, $fromDate, now(), $amount);

            /** @var Carbon $carbon */
            foreach ($occurrences as $carbon) {
--- a/composer.lock
+++ b/composer.lock
@@ -1675,16 +1675,16 @@
        },
        {
            "name": "laravel-json-api/core",
-            "version": "v4.0.0",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel-json-api/core.git",
-                "reference": "5dbf042c69ce02dc0699676d6f3fe1fe9c82ad49"
+                "reference": "5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-json-api/core/zipball/5dbf042c69ce02dc0699676d6f3fe1fe9c82ad49",
-                "reference": "5dbf042c69ce02dc0699676d6f3fe1fe9c82ad49",
+                "url": "https://api.github.com/repos/laravel-json-api/core/zipball/5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa",
+                "reference": "5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa",
                "shasum": ""
            },
            "require": {
@@ -1733,22 +1733,22 @@
            ],
            "support": {
                "issues": "https://github.com/laravel-json-api/core/issues",
-                "source": "https://github.com/laravel-json-api/core/tree/v4.0.0"
+                "source": "https://github.com/laravel-json-api/core/tree/v4.1.0"
            },
-            "time": "2024-03-12T18:36:10+00:00"
+            "time": "2024-06-26T19:32:04+00:00"
        },
        {
            "name": "laravel-json-api/eloquent",
-            "version": "v4.0.0",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel-json-api/eloquent.git",
-                "reference": "3794011500b045d076c0ec33aff0c470e200ab3d"
+                "reference": "c4f86c734bba9f6e487403fa5f0345046fc15e12"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-json-api/eloquent/zipball/3794011500b045d076c0ec33aff0c470e200ab3d",
-                "reference": "3794011500b045d076c0ec33aff0c470e200ab3d",
+                "url": "https://api.github.com/repos/laravel-json-api/eloquent/zipball/c4f86c734bba9f6e487403fa5f0345046fc15e12",
+                "reference": "c4f86c734bba9f6e487403fa5f0345046fc15e12",
                "shasum": ""
            },
            "require": {
@@ -1797,9 +1797,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel-json-api/eloquent/issues",
-                "source": "https://github.com/laravel-json-api/eloquent/tree/v4.0.0"
+                "source": "https://github.com/laravel-json-api/eloquent/tree/v4.1.0"
            },
-            "time": "2024-03-12T21:05:33+00:00"
+            "time": "2024-06-26T18:45:17+00:00"
        },
        {
            "name": "laravel-json-api/encoder-neomerx",
@@ -1938,22 +1938,22 @@
        },
        {
            "name": "laravel-json-api/laravel",
-            "version": "v4.0.0",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel-json-api/laravel.git",
-                "reference": "013380ff3cadecb75b4adaaf27685b83473615af"
+                "reference": "0aef20a13de21d44fbe0b2e43354e1969ae607bf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-json-api/laravel/zipball/013380ff3cadecb75b4adaaf27685b83473615af",
-                "reference": "013380ff3cadecb75b4adaaf27685b83473615af",
+                "url": "https://api.github.com/repos/laravel-json-api/laravel/zipball/0aef20a13de21d44fbe0b2e43354e1969ae607bf",
+                "reference": "0aef20a13de21d44fbe0b2e43354e1969ae607bf",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "laravel-json-api/core": "^4.0",
-                "laravel-json-api/eloquent": "^4.0",
+                "laravel-json-api/core": "^4.1",
+                "laravel-json-api/eloquent": "^4.1",
                "laravel-json-api/encoder-neomerx": "^4.0",
                "laravel-json-api/exceptions": "^3.0",
                "laravel-json-api/spec": "^3.0",
@@ -2010,9 +2010,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel-json-api/laravel/issues",
-                "source": "https://github.com/laravel-json-api/laravel/tree/v4.0.0"
+                "source": "https://github.com/laravel-json-api/laravel/tree/v4.1.0"
            },
-            "time": "2024-03-14T18:09:33+00:00"
+            "time": "2024-06-26T19:47:07+00:00"
        },
        {
            "name": "laravel-json-api/neomerx-json-api",
@@ -2286,16 +2286,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.11.1",
+            "version": "v11.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f"
+                "reference": "657e8464e13147d56bc3a399115c8c26f38d4821"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c9b52e84bd18f155e5ba59b948c7da3e7f37e87f",
-                "reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/657e8464e13147d56bc3a399115c8c26f38d4821",
+                "reference": "657e8464e13147d56bc3a399115c8c26f38d4821",
                "shasum": ""
            },
            "require": {
@@ -2348,6 +2348,7 @@
            },
            "provide": {
                "psr/container-implementation": "1.1|2.0",
+                "psr/log-implementation": "1.0|2.0|3.0",
                "psr/simple-cache-implementation": "1.0|2.0|3.0"
            },
            "replace": {
@@ -2487,7 +2488,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-06-20T10:54:53+00:00"
+            "time": "2024-07-02T17:23:58+00:00"
        },
        {
            "name": "laravel/passport",
@@ -3864,16 +3865,16 @@
        },
        {
            "name": "monolog/monolog",
-            "version": "3.6.0",
+            "version": "3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8",
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8",
                "shasum": ""
            },
            "require": {
@@ -3949,7 +3950,7 @@
            ],
            "support": {
                "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.7.0"
            },
            "funding": [
                {
@@ -3961,7 +3962,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-12T21:02:21+00:00"
+            "time": "2024-06-28T09:40:51+00:00"
        },
        {
            "name": "nesbot/carbon",
@@ -4674,16 +4675,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.38",
+            "version": "3.0.39",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "b18b8788e51156c4dd97b7f220a31149a0052067"
+                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b18b8788e51156c4dd97b7f220a31149a0052067",
-                "reference": "b18b8788e51156c4dd97b7f220a31149a0052067",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
+                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
                "shasum": ""
            },
            "require": {
@@ -4764,7 +4765,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.38"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
            },
            "funding": [
                {
@@ -4780,7 +4781,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-17T10:11:32+00:00"
+            "time": "2024-06-24T06:27:33+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -5847,16 +5848,16 @@
        },
        {
            "name": "spatie/error-solutions",
-            "version": "1.0.1",
+            "version": "1.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "d60d4d2ef4b7701c86134ded959667cac6215233"
+                "reference": "264a7eef892aceb2fd65e206127ad3af4f3a2d6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/d60d4d2ef4b7701c86134ded959667cac6215233",
-                "reference": "d60d4d2ef4b7701c86134ded959667cac6215233",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/264a7eef892aceb2fd65e206127ad3af4f3a2d6b",
+                "reference": "264a7eef892aceb2fd65e206127ad3af4f3a2d6b",
                "shasum": ""
            },
            "require": {
@@ -5909,7 +5910,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.0.1"
+                "source": "https://github.com/spatie/error-solutions/tree/1.0.4"
            },
            "funding": [
                {
@@ -5917,7 +5918,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-06-21T10:09:00+00:00"
+            "time": "2024-06-28T13:33:04+00:00"
        },
        {
            "name": "spatie/flare-client-php",
@@ -6073,16 +6074,16 @@
        },
        {
            "name": "spatie/laravel-html",
-            "version": "3.9.0",
+            "version": "3.10.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b"
+                "reference": "865680c6164f2e76f5d0b1ff9c2f8603778bdfc0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/35802bd9b276ce08e1d9d15584b17fdef965063b",
-                "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/865680c6164f2e76f5d0b1ff9c2f8603778bdfc0",
+                "reference": "865680c6164f2e76f5d0b1ff9c2f8603778bdfc0",
                "shasum": ""
            },
            "require": {
@@ -6139,7 +6140,7 @@
                "spatie"
            ],
            "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.9.0"
+                "source": "https://github.com/spatie/laravel-html/tree/3.10.0"
            },
            "funding": [
                {
@@ -6147,7 +6148,7 @@
                    "type": "custom"
                }
            ],
-            "time": "2024-04-25T08:07:39+00:00"
+            "time": "2024-07-03T08:46:46+00:00"
        },
        {
            "name": "spatie/laravel-ignition",
@@ -6296,16 +6297,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "760294dc7158372699dccd077965c16c328f8719"
+                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/760294dc7158372699dccd077965c16c328f8719",
-                "reference": "760294dc7158372699dccd077965c16c328f8719",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e933e1d947ffb88efcdd34a2bd51561cab7deaae",
+                "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae",
                "shasum": ""
            },
            "require": {
@@ -6373,7 +6374,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.1.1"
+                "source": "https://github.com/symfony/cache/tree/v7.1.2"
            },
            "funding": [
                {
@@ -6389,7 +6390,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-11T13:32:38+00:00"
        },
        {
            "name": "symfony/cache-contracts",
@@ -6543,16 +6544,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3"
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
-                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae",
+                "reference": "0aa29ca177f432ab68533432db0de059f39c92ae",
                "shasum": ""
            },
            "require": {
@@ -6616,7 +6617,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.1"
+                "source": "https://github.com/symfony/console/tree/v7.1.2"
            },
            "funding": [
                {
@@ -6632,7 +6633,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -6768,16 +6769,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd"
+                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/e9b8bbce0b4f322939332ab7b6b81d8c11da27dd",
-                "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
+                "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
                "shasum": ""
            },
            "require": {
@@ -6823,7 +6824,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.1.1"
+                "source": "https://github.com/symfony/error-handler/tree/v7.1.2"
            },
            "funding": [
                {
@@ -6839,7 +6840,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-25T19:55:06+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -7127,16 +7128,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "1ec24a54d1885b11e862d6ddab31bd6749720d20"
+                "reference": "90ace27d17ccc9afc6f7ec0081e8529fb0e29425"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/1ec24a54d1885b11e862d6ddab31bd6749720d20",
-                "reference": "1ec24a54d1885b11e862d6ddab31bd6749720d20",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/90ace27d17ccc9afc6f7ec0081e8529fb0e29425",
+                "reference": "90ace27d17ccc9afc6f7ec0081e8529fb0e29425",
                "shasum": ""
            },
            "require": {
@@ -7201,7 +7202,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.1.1"
+                "source": "https://github.com/symfony/http-client/tree/v7.1.2"
            },
            "funding": [
                {
@@ -7217,7 +7218,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -7376,16 +7377,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f"
+                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fa8d1c75b5f33b1302afccf81811f93976c6e26f",
-                "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
+                "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
                "shasum": ""
            },
            "require": {
@@ -7470,7 +7471,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.1.1"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.2"
            },
            "funding": [
                {
@@ -7486,20 +7487,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-04T06:52:15+00:00"
+            "time": "2024-06-28T13:13:31+00:00"
        },
        {
            "name": "symfony/mailer",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "2eaad2e167cae930f25a3d731fec8b2ded5e751e"
+                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/2eaad2e167cae930f25a3d731fec8b2ded5e751e",
-                "reference": "2eaad2e167cae930f25a3d731fec8b2ded5e751e",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee",
+                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee",
                "shasum": ""
            },
            "require": {
@@ -7550,7 +7551,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.1.1"
+                "source": "https://github.com/symfony/mailer/tree/v7.1.2"
            },
            "funding": [
                {
@@ -7566,20 +7567,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
        },
        {
            "name": "symfony/mailgun-mailer",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "08d9b1fe18db2ea3b3a69c8c280b3f85479efdaa"
+                "reference": "d5dcf1cbbc29cf43c979b9ed8a7ff509c903c64f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/08d9b1fe18db2ea3b3a69c8c280b3f85479efdaa",
-                "reference": "08d9b1fe18db2ea3b3a69c8c280b3f85479efdaa",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/d5dcf1cbbc29cf43c979b9ed8a7ff509c903c64f",
+                "reference": "d5dcf1cbbc29cf43c979b9ed8a7ff509c903c64f",
                "shasum": ""
            },
            "require": {
@@ -7619,7 +7620,7 @@
            "description": "Symfony Mailgun Mailer Bridge",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.1.1"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.1.2"
            },
            "funding": [
                {
@@ -7635,20 +7636,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df"
+                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/21027eaacc1a8a20f5e616c25c3580f5dd3a15df",
-                "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
+                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
                "shasum": ""
            },
            "require": {
@@ -7703,7 +7704,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.1"
+                "source": "https://github.com/symfony/mime/tree/v7.1.2"
            },
            "funding": [
                {
@@ -7719,7 +7720,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-04T06:40:14+00:00"
+            "time": "2024-06-28T10:03:55+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -8741,16 +8742,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2"
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2",
-                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2",
+                "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
+                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
                "shasum": ""
            },
            "require": {
@@ -8808,7 +8809,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.1"
+                "source": "https://github.com/symfony/string/tree/v7.1.2"
            },
            "funding": [
                {
@@ -8824,7 +8825,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-04T06:40:14+00:00"
+            "time": "2024-06-28T09:27:18+00:00"
        },
        {
            "name": "symfony/translation",
@@ -9074,16 +9075,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293"
+                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/deb2c2b506ff6fdbb340e00b34e9901e1605f293",
-                "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5857c57c6b4b86524c08cf4f4bc95327270a816d",
+                "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d",
                "shasum": ""
            },
            "require": {
@@ -9137,7 +9138,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.1"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.2"
            },
            "funding": [
                {
@@ -9153,20 +9154,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v7.1.1",
+            "version": "v7.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "db82c2b73b88734557cfc30e3270d83fa651b712"
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db82c2b73b88734557cfc30e3270d83fa651b712",
-                "reference": "db82c2b73b88734557cfc30e3270d83fa651b712",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c",
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c",
                "shasum": ""
            },
            "require": {
@@ -9213,7 +9214,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.1.1"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.1.2"
            },
            "funding": [
                {
@@ -9229,7 +9230,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-06-28T08:00:31+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
@@ -10248,16 +10249,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v2.9.7",
+            "version": "v2.9.8",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb"
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/5c805f636095cc2e0b659e3954775cf8f1dad1bb",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7",
                "shasum": ""
            },
            "require": {
@@ -10271,7 +10272,7 @@
                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                "php": "^8.0.2",
                "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.11.1"
+                "phpstan/phpstan": "^1.11.2"
            },
            "require-dev": {
                "doctrine/coding-standard": "^12.0",
@@ -10326,7 +10327,7 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.7"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.8"
            },
            "funding": [
                {
@@ -10346,7 +10347,7 @@
                    "type": "patreon"
                }
            ],
-            "time": "2024-05-27T18:33:26+00:00"
+            "time": "2024-07-06T17:46:02+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -10626,16 +10627,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.0.2",
+            "version": "v5.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
                "shasum": ""
            },
            "require": {
@@ -10646,7 +10647,7 @@
            },
            "require-dev": {
                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
            },
            "bin": [
                "bin/php-parse"
@@ -10678,9 +10679,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
            },
-            "time": "2024-03-05T20:51:40+00:00"
+            "time": "2024-07-01T20:03:41+00:00"
        },
        {
            "name": "phar-io/manifest",
@@ -11092,16 +11093,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.11.5",
+            "version": "1.11.7",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "490f0ae1c92b082f154681d7849aee776a7c1443"
+                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443",
-                "reference": "490f0ae1c92b082f154681d7849aee776a7c1443",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d",
+                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d",
                "shasum": ""
            },
            "require": {
@@ -11146,7 +11147,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-06-17T15:10:54+00:00"
+            "time": "2024-07-06T11:17:41+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@@ -11246,16 +11247,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "10.1.15",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
                "shasum": ""
            },
            "require": {
@@ -11312,7 +11313,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/10.1.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
            },
            "funding": [
                {
@@ -11320,7 +11321,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2024-06-29T08:25:15+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -11567,16 +11568,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.24",
+            "version": "10.5.25",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5f124e3e3e561006047b532fd0431bf5bb6b9015"
+                "reference": "831bf82312be6037e811833ddbea0b8de60ea314"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f124e3e3e561006047b532fd0431bf5bb6b9015",
-                "reference": "5f124e3e3e561006047b532fd0431bf5bb6b9015",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/831bf82312be6037e811833ddbea0b8de60ea314",
+                "reference": "831bf82312be6037e811833ddbea0b8de60ea314",
                "shasum": ""
            },
            "require": {
@@ -11648,7 +11649,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.24"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.25"
            },
            "funding": [
                {
@@ -11664,7 +11665,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-20T13:09:54+00:00"
+            "time": "2024-07-03T05:49:17+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -117,7 +117,7 @@ return [
        'expression_engine' => false,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-06-24',
+    'version'                      => 'develop/2024-07-08',
    'api_version'                  => '2.1.0',
    'db_version'                   => 24,

--- a/package-lock.json
+++ b/package-lock.json
@@ -2855,9 +2855,9 @@
            "dev": true
        },
        "node_modules/@types/node": {
-            "version": "20.14.8",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.8.tgz",
-            "integrity": "sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==",
+            "version": "20.14.10",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+            "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
            "dev": true,
            "dependencies": {
                "undici-types": "~5.26.4"
@@ -2951,39 +2951,39 @@
            }
        },
        "node_modules/@vue/compiler-core": {
-            "version": "3.4.30",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.30.tgz",
-            "integrity": "sha512-ZL8y4Xxdh8O6PSwfdZ1IpQ24PjTAieOz3jXb/MDTfDtANcKBMxg1KLm6OX2jofsaQGYfIVzd3BAG22i56/cF1w==",
+            "version": "3.4.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
+            "integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.24.7",
-                "@vue/shared": "3.4.30",
+                "@vue/shared": "3.4.31",
                "entities": "^4.5.0",
                "estree-walker": "^2.0.2",
                "source-map-js": "^1.2.0"
            }
        },
        "node_modules/@vue/compiler-dom": {
-            "version": "3.4.30",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.30.tgz",
-            "integrity": "sha512-+16Sd8lYr5j/owCbr9dowcNfrHd+pz+w2/b5Lt26Oz/kB90C9yNbxQ3bYOvt7rI2bxk0nqda39hVcwDFw85c2Q==",
+            "version": "3.4.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz",
+            "integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-core": "3.4.30",
-                "@vue/shared": "3.4.30"
+                "@vue/compiler-core": "3.4.31",
+                "@vue/shared": "3.4.31"
            }
        },
        "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.30",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.30.tgz",
-            "integrity": "sha512-8vElKklHn/UY8+FgUFlQrYAPbtiSB2zcgeRKW7HkpSRn/JjMRmZvuOtwDx036D1aqKNSTtXkWRfqx53Qb+HmMg==",
+            "version": "3.4.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz",
+            "integrity": "sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.24.7",
-                "@vue/compiler-core": "3.4.30",
-                "@vue/compiler-dom": "3.4.30",
-                "@vue/compiler-ssr": "3.4.30",
-                "@vue/shared": "3.4.30",
+                "@vue/compiler-core": "3.4.31",
+                "@vue/compiler-dom": "3.4.31",
+                "@vue/compiler-ssr": "3.4.31",
+                "@vue/shared": "3.4.31",
                "estree-walker": "^2.0.2",
                "magic-string": "^0.30.10",
                "postcss": "^8.4.38",
@@ -2991,13 +2991,13 @@
            }
        },
        "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.30",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.30.tgz",
-            "integrity": "sha512-ZJ56YZGXJDd6jky4mmM0rNaNP6kIbQu9LTKZDhcpddGe/3QIalB1WHHmZ6iZfFNyj5mSypTa4+qDJa5VIuxMSg==",
+            "version": "3.4.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz",
+            "integrity": "sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-dom": "3.4.30",
-                "@vue/shared": "3.4.30"
+                "@vue/compiler-dom": "3.4.31",
+                "@vue/shared": "3.4.31"
            }
        },
        "node_modules/@vue/component-compiler-utils": {
@@ -3072,9 +3072,9 @@
            "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
        },
        "node_modules/@vue/shared": {
-            "version": "3.4.30",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.30.tgz",
-            "integrity": "sha512-CLg+f8RQCHQnKvuHY9adMsMaQOcqclh6Z5V9TaoMgy0ut0tz848joZ7/CYFFyF/yZ5i2yaw7Fn498C+CNZVHIg==",
+            "version": "3.4.31",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
+            "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==",
            "dev": true
        },
        "node_modules/@webassemblyjs/ast": {
@@ -3291,9 +3291,9 @@
            }
        },
        "node_modules/acorn": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
-            "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
+            "version": "8.12.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+            "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
            "dev": true,
            "bin": {
                "acorn": "bin/acorn"
@@ -3793,9 +3793,9 @@
            "dev": true
        },
        "node_modules/bootstrap5-autocomplete": {
-            "version": "1.1.27",
-            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.27.tgz",
-            "integrity": "sha512-oHIZUGCcvhJ4sSdHdCmPW1pUMhAhzdBM0NgsFN3bG65BOIyty3q0fX00gE9QPEG9Y4Qn3du7qKHtwAZsGuulcA=="
+            "version": "1.1.28",
+            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.28.tgz",
+            "integrity": "sha512-9oBGvXilL+/1tH5uVPo8rFlUbQP05n9hdj85YFvGAwjH1NP/bRSYhHcywkBe8aFFmkQHr3oi0Creh5ooz9T4Ag=="
        },
        "node_modules/bootstrap5-tags": {
            "version": "1.7.2",
@@ -4028,9 +4028,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001636",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
-            "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
+            "version": "1.0.30001640",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+            "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
            "dev": true,
            "funding": [
                {
@@ -5103,9 +5103,9 @@
            "dev": true
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.4.810",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz",
-            "integrity": "sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==",
+            "version": "1.4.818",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.818.tgz",
+            "integrity": "sha512-eGvIk2V0dGImV9gWLq8fDfTTsCAeMDwZqEPMr+jMInxZdnp9Us8UpovYpRCf9NQ7VOFgrN2doNSgvISbsbNpxA==",
            "dev": true
        },
        "node_modules/elliptic": {
@@ -5221,9 +5221,9 @@
            }
        },
        "node_modules/es-module-lexer": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
-            "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
+            "version": "1.5.4",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+            "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
            "dev": true
        },
        "node_modules/esbuild": {
@@ -7995,9 +7995,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.4.38",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "version": "8.4.39",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+            "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
            "dev": true,
            "funding": [
                {
@@ -8015,7 +8015,7 @@
            ],
            "dependencies": {
                "nanoid": "^3.3.7",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.0.1",
                "source-map-js": "^1.2.0"
            },
            "engines": {
@@ -8657,9 +8657,9 @@
            "dev": true
        },
        "node_modules/qs": {
-            "version": "6.12.1",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
-            "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
+            "version": "6.12.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.2.tgz",
+            "integrity": "sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==",
            "dev": true,
            "dependencies": {
                "side-channel": "^1.0.6"
@@ -9981,9 +9981,9 @@
            }
        },
        "node_modules/update-browserslist-db": {
-            "version": "1.0.16",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
-            "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
            "dev": true,
            "funding": [
                {
@@ -10094,13 +10094,13 @@
            }
        },
        "node_modules/vite": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz",
-            "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==",
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
+            "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
            "dev": true,
            "dependencies": {
                "esbuild": "^0.21.3",
-                "postcss": "^8.4.38",
+                "postcss": "^8.4.39",
                "rollup": "^4.13.0"
            },
            "bin": {
@@ -10825,9 +10825,9 @@
            "dev": true
        },
        "node_modules/ws": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+            "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
            "dev": true,
            "engines": {
                "node": ">=10.0.0"
Author	SHA1	Message	Date
github-actions	c2269fc9a4	Auto commit for release 'develop' on 2024-07-08	2024-07-08 05:07:00 +02:00
James Cole	84a1a876e1	Fix https://github.com/firefly-iii/firefly-iii/issues/8844	2024-07-06 18:50:33 +02:00
James Cole	dc675707f9	Fix https://github.com/firefly-iii/firefly-iii/issues/9021	2024-07-06 15:50:20 +02:00
James Cole	d5667c7ef6	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # app/Support/Http/Api/ExchangeRateConverter.php	2024-07-06 15:43:27 +02:00
James Cole	cba1213dd1	Better cache	2024-07-06 15:42:50 +02:00
James Cole	7219c90957	Fix https://github.com/firefly-iii/firefly-iii/issues/9022	2024-07-06 15:42:33 +02:00
github-actions	af13bd991e	Auto commit for release 'develop' on 2024-07-01	2024-07-01 05:06:49 +02:00
James Cole	48e548eb52	Better disable thing.	2024-06-30 18:20:52 +02:00