diff --git a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
index 94a6d2e022..ba53793505 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
@@ -68,10 +68,6 @@ class UpdateController extends Controller
$data = $request->getAll();
$piggyBank = $this->repository->update($piggyBank, $data);
- if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {
- $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
- }
-
// enrich
/** @var User $admin */
$admin = auth()->user();
diff --git a/app/Api/V1/Requests/Data/DateRequest.php b/app/Api/V1/Requests/Data/DateRequest.php
index 7ba1861086..05125a8868 100644
--- a/app/Api/V1/Requests/Data/DateRequest.php
+++ b/app/Api/V1/Requests/Data/DateRequest.php
@@ -46,6 +46,16 @@ class DateRequest extends FormRequest
{
$start = $this->getCarbonDate('start');
$end = $this->getCarbonDate('end');
+ if(null === $start) {
+ $start = now()->startOfMonth();
+ }
+ if(null === $end) {
+ $end = now()->endOfMonth();
+ }
+ // sanity check on dates:
+ [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
+
+
$start->startOfDay();
$end->endOfDay();
if ($start->diffInYears($end, true) > 5) {
diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
index 7a2d0a7be4..023a48169e 100644
--- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
@@ -64,7 +64,7 @@ class UpdateRequest extends FormRequest
*/
public function getAll(): array
{
- app('log')->debug(sprintf('Now in %s', __METHOD__));
+ Log::debug(sprintf('Now in %s', __METHOD__));
$this->integerFields = ['order', 'currency_id', 'foreign_currency_id', 'transaction_journal_id', 'source_id', 'destination_id', 'budget_id', 'category_id', 'bill_id', 'recurrence_id'];
$this->dateFields = ['date', 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
$this->textareaFields = ['notes'];
@@ -97,7 +97,7 @@ class UpdateRequest extends FormRequest
*/
private function getTransactionData(): array
{
- app('log')->debug(sprintf('Now in %s', __METHOD__));
+ Log::debug(sprintf('Now in %s', __METHOD__));
$return = [];
/** @var null|array $transactions */
@@ -181,7 +181,7 @@ class UpdateRequest extends FormRequest
private function getDateData(array $current, array $transaction): array
{
foreach ($this->dateFields as $fieldName) {
- app('log')->debug(sprintf('Now at date field %s', $fieldName));
+ Log::debug(sprintf('Now at date field %s', $fieldName));
if (array_key_exists($fieldName, $transaction)) {
Log::debug(sprintf('New value: "%s"', $transaction[$fieldName]));
$current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
@@ -247,7 +247,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
- app('log')->debug(sprintf('Now in %s', __METHOD__));
+ Log::debug(sprintf('Now in %s', __METHOD__));
$validProtocols = config('firefly.valid_url_protocols');
return [
@@ -330,7 +330,7 @@ class UpdateRequest extends FormRequest
*/
public function withValidator(Validator $validator): void
{
- app('log')->debug('Now in withValidator');
+ Log::debug('Now in withValidator');
/** @var TransactionGroup $transactionGroup */
$transactionGroup = $this->route()->parameter('transactionGroup');
diff --git a/app/Console/Commands/System/OutputsInstructions.php b/app/Console/Commands/System/OutputsInstructions.php
index fb99e99692..877576e4a4 100644
--- a/app/Console/Commands/System/OutputsInstructions.php
+++ b/app/Console/Commands/System/OutputsInstructions.php
@@ -26,12 +26,14 @@ namespace FireflyIII\Console\Commands\System;
use Carbon\Carbon;
use FireflyIII\Support\System\GeneratesInstallationId;
+use FireflyIII\Support\System\IsOldVersion;
use Illuminate\Console\Command;
use Random\RandomException;
class OutputsInstructions extends Command
{
use GeneratesInstallationId;
+ use IsOldVersion;
protected $description = 'Instructions in case of upgrade trouble.';
@@ -58,7 +60,7 @@ class OutputsInstructions extends Command
*/
private function updateInstructions(): void
{
- $version = (string) config('firefly.version');
+ $version = (string)config('firefly.version');
/** @var array $config */
$config = config('upgrade.text.upgrade');
@@ -68,12 +70,12 @@ class OutputsInstructions extends Command
foreach (array_keys($config) as $compare) {
// if string starts with:
if (str_starts_with($version, $compare)) {
- $text = (string) $config[$compare];
+ $text = (string)$config[$compare];
}
}
// validate some settings.
- if ('' === $text && 'local' === (string) config('app.env')) {
+ if ('' === $text && 'local' === (string)config('app.env')) {
$text = 'Please set APP_ENV=production for a safer environment.';
}
@@ -191,7 +193,7 @@ class OutputsInstructions extends Command
*/
private function installInstructions(): void
{
- $version = (string) config('firefly.version');
+ $version = (string)config('firefly.version');
/** @var array $config */
$config = config('upgrade.text.install');
@@ -201,12 +203,12 @@ class OutputsInstructions extends Command
foreach (array_keys($config) as $compare) {
// if string starts with:
if (str_starts_with($version, $compare)) {
- $text = (string) $config[$compare];
+ $text = (string)$config[$compare];
}
}
// validate some settings.
- if ('' === $text && 'local' === (string) config('app.env')) {
+ if ('' === $text && 'local' === (string)config('app.env')) {
$text = 'Please set APP_ENV=production for a safer environment.';
}
@@ -242,14 +244,15 @@ class OutputsInstructions extends Command
private function someQuote(): void
{
- $lines = [
- 'Forgive yourself for not being at peace.',
- 'Doesn\'t look like anything to me.',
- 'Be proud of what you make.',
- 'Be there or forever wonder.',
- 'A year from now you will wish you had started today.',
+ $lines = [
+ '"Forgive yourself for not being at peace."',
+ '"Doesn\'t look like anything to me."',
+ '"Be proud of what you make."',
+ '"Be there or forever wonder."',
+ '"A year from now you will wish you had started today."',
+ '🇺🇦 Слава Україні!',
+ '🇺🇦 Slava Ukraini!',
];
- $addQuotes = true;
// fuck the Russian aggression in Ukraine.
@@ -260,8 +263,7 @@ class OutputsInstructions extends Command
// going on, to allow that to happen.
if ('ru_RU' === config('firefly.default_language')) {
- $addQuotes = false;
- $lines = [
+ $lines = [
'🇺🇦 Слава Україні!',
'🇺🇦 Slava Ukraini!',
];
@@ -272,11 +274,6 @@ class OutputsInstructions extends Command
} catch (RandomException) {
$random = 0;
}
- if ($addQuotes) {
- $this->line(sprintf(' "%s"', $lines[$random]));
-
- return;
- }
$this->line(sprintf(' %s', $lines[$random]));
}
diff --git a/app/Console/Commands/System/SetsLatestVersion.php b/app/Console/Commands/System/SetsLatestVersion.php
index f6207ee15a..3c6f6b5244 100644
--- a/app/Console/Commands/System/SetsLatestVersion.php
+++ b/app/Console/Commands/System/SetsLatestVersion.php
@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\System;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Console\Command;
class SetsLatestVersion extends Command
@@ -45,8 +46,7 @@ class SetsLatestVersion extends Command
return 0;
}
- app('fireflyconfig')->set('db_version', config('firefly.db_version'));
- app('fireflyconfig')->set('ff3_version', config('firefly.version'));
+ FireflyConfig::set('ff3_version', config('firefly.version'));
$this->friendlyInfo('Updated version.');
return 0;
diff --git a/app/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.php
index 92429a9a36..c2f6912b5a 100644
--- a/app/Console/Commands/Upgrade/UpgradesDatabase.php
+++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
+use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Support\Facades\Log;
use Safe\Exceptions\InfoException;
@@ -86,10 +87,8 @@ class UpgradesDatabase extends Command
$this->friendlyLine(sprintf('Now executing %s', $command));
$this->call($command, $args);
}
- // set new DB version.
- app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
// index will set FF3 version.
- app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
+ FireflyConfig::set('ff3_version', (string) config('firefly.version'));
return 0;
}
diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.php
index 40455001d3..b31056b10f 100644
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@@ -242,6 +242,7 @@ class PiggyBankFactory
}
}
}
+ Log::debug('Looping all accounts.');
/** @var array $info */
foreach ($accounts as $info) {
@@ -251,6 +252,7 @@ class PiggyBankFactory
continue;
}
+ Log::debug(sprintf('Working on account #%d', $account->id));
if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {
// an amount is set, first check out if there is a difference with the previous amount.
$previous = $toBeLinked[$account->id]['current_amount'] ?? '0';
@@ -258,22 +260,24 @@ class PiggyBankFactory
// create event for difference.
if (0 !== bccomp($diff, '0')) {
+ // 2025-10-01 for issue #10990 disable this event.
Log::debug(sprintf('[a] Will save event for difference %s (previous value was %s)', $diff, $previous));
- event(new ChangedAmount($piggyBank, $diff, null, null));
+ // event(new ChangedAmount($piggyBank, $diff, null, null));
}
$toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
Log::debug(sprintf('[a] Will link account #%d with amount %s', $account->id, $info['current_amount']));
}
if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {
- // an amount is set, first check out if there is a difference with the previous amount.
+ // no amount is set, first check out if there is a difference with the previous amount.
$previous = $toBeLinked[$account->id]['current_amount'] ?? '0';
$diff = bcsub('0', $previous);
// create event for difference.
if (0 !== bccomp($diff, '0')) {
+ // 2025-10-01 for issue #10990 disable this event.
Log::debug(sprintf('[b] Will save event for difference %s (previous value was %s)', $diff, $previous));
- event(new ChangedAmount($piggyBank, $diff, null, null));
+ // event(new ChangedAmount($piggyBank, $diff, null, null));
}
// no amount set, use previous amount or go to ZERO.
@@ -282,7 +286,8 @@ class PiggyBankFactory
// create event:
Log::debug('linkToAccountIds: Trigger change for positive amount [b].');
- event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'] ?? '0', null, null));
+ // 2025-10-01 for issue #10990 disable this event.
+ // event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'] ?? '0', null, null));
}
if (!array_key_exists('current_amount', $info)) {
$toBeLinked[$account->id] ??= [];
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index 377bacd735..9138daf037 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -184,7 +184,6 @@ class DebugController extends Controller
$currentDriver = DB::getDriverName();
return [
- 'db_version' => app('fireflyconfig')->get('db_version', 1)->data,
'php_version' => PHP_VERSION,
'php_os' => PHP_OS,
'uname' => php_uname('m'),
diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php
index e2acfb680f..cd800053d4 100644
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\System;
+use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Cache;
use Exception;
@@ -81,10 +82,7 @@ class InstallController extends Controller
{
app('view')->share('FF_VERSION', config('firefly.version'));
// index will set FF3 version.
- app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
-
- // set new DB version.
- app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
+ FireflyConfig::set('ff3_version', (string) config('firefly.version'));
return view('install.index');
}
diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php
index f7d38232ca..852c523c4c 100644
--- a/app/Http/Middleware/Installer.php
+++ b/app/Http/Middleware/Installer.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\System\IsOldVersion;
use FireflyIII\Support\System\OAuthKeys;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
@@ -37,6 +38,8 @@ use Illuminate\Support\Facades\Log;
*/
class Installer
{
+ use IsOldVersion;
+
/**
* Handle an incoming request.
*
@@ -65,7 +68,7 @@ class Installer
// run installer when no tables are present,
// or when old scheme version
// or when old firefly version
- if ($this->hasNoTables() || $this->oldDBVersion() || $this->oldVersion()) {
+ if ($this->hasNoTables() || $this->isOldVersionInstalled()) {
return response()->redirectTo(route('installer.index'));
}
OAuthKeys::verifyKeysRoutine();
@@ -126,59 +129,4 @@ class Installer
{
return false !== stripos($message, 'Base table or view not found');
}
-
- /**
- * Check if the "db_version" variable is correct.
- */
- private function oldDBVersion(): bool
- {
- // older version in config than database?
- $configVersion = (int) config('firefly.db_version');
- $dbVersion = (int) app('fireflyconfig')->getFresh('db_version', 1)->data;
- if ($configVersion > $dbVersion) {
- Log::warning(
- sprintf(
- 'The current configured version (%d) is older than the required version (%d). Redirect to migrate routine.',
- $dbVersion,
- $configVersion
- )
- );
-
- return true;
- }
-
- // Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
-
- return false;
- }
-
- /**
- * Check if the "firefly_version" variable is correct.
- */
- private function oldVersion(): bool
- {
- // version compare thing.
- $configVersion = (string) config('firefly.version');
- $dbVersion = (string) app('fireflyconfig')->getFresh('ff3_version', '1.0')->data;
- if (str_starts_with($configVersion, 'develop')) {
- Log::debug('Skipping version check for develop version.');
-
- return false;
- }
- if (1 === version_compare($configVersion, $dbVersion)) {
- Log::warning(
- sprintf(
- 'The current configured Firefly III version (%s) is older than the required version (%s). Redirect to migrate routine.',
- $dbVersion,
- $configVersion
- )
- );
-
- return true;
- }
-
- // Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
-
- return false;
- }
}
diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
index e63da28927..734cfe8b0f 100644
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -36,6 +36,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Support\Facades\Log;
@@ -227,7 +228,6 @@ trait ModifiesPiggyBanks
$factory->user = $this->user;
// the piggy bank currency is set or updated FIRST, if it exists.
-
$factory->linkToAccountIds($piggyBank, $data['accounts'] ?? []);
@@ -244,7 +244,7 @@ trait ModifiesPiggyBanks
// question is, from which account(s) to remove the difference?
// solution: just start from the top until there is no more money left to remove.
- $this->removeAmountFromAll($piggyBank, app('steam')->positive($difference));
+ $this->removeAmountFromAll($piggyBank, Steam::positive($difference));
}
// update using name:
diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php
index 9516071ddb..ad55aee903 100644
--- a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php
+++ b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Services\FireflyIIIOrg\Update;
use Carbon\Carbon;
use FireflyIII\Events\NewVersionAvailable;
+use FireflyIII\Support\System\IsOldVersion;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Support\Facades\Log;
@@ -38,6 +39,8 @@ use function Safe\json_decode;
*/
class UpdateRequest implements UpdateRequestInterface
{
+ use IsOldVersion;
+
public function getUpdateInformation(string $channel): array
{
Log::debug(sprintf('Now in getUpdateInformation(%s)', $channel));
@@ -183,20 +186,15 @@ class UpdateRequest implements UpdateRequestInterface
private function parseResultDevelop(string $current, string $latest, array $information): array
{
Log::debug(sprintf('User is running develop version "%s"', $current));
- $parts = explode('/', $current);
+ $compare = $this->compareDevelopVersions($current, $latest);
$return = [];
- /** @var Carbon $devDate */
- $devDate = Carbon::createFromFormat('Y-m-d', $parts[1]);
-
- if ($devDate->lte($information['date'])) {
- Log::debug(sprintf('This development release is older, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
+ if (-1 === $compare) {
$return['level'] = 'info';
$return['message'] = (string) trans('firefly.update_current_dev_older', ['version' => $current, 'new_version' => $latest]);
return $return;
}
- Log::debug(sprintf('This development release is newer, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
$return['level'] = 'info';
$return['message'] = (string) trans('firefly.update_current_dev_newer', ['version' => $current, 'new_version' => $latest]);
diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php
index 5209eab2fe..ddbe866e84 100644
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -263,13 +263,13 @@ trait PeriodOverview
$entry
= [
- 'title' => $title,
- 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
- 'total_transactions' => 0,
- 'spent' => [],
- 'earned' => [],
- 'transferred' => [],
- ];
+ 'title' => $title,
+ 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
+ 'total_transactions' => 0,
+ 'spent' => [],
+ 'earned' => [],
+ 'transferred' => [],
+ ];
$grouped = [];
/** @var PeriodStatistic $statistic */
@@ -515,13 +515,13 @@ trait PeriodOverview
}
$entries[]
= [
- 'title' => $title,
- 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
- 'total_transactions' => count($spent) + count($earned) + count($transferred),
- 'spent' => $this->groupByCurrency($spent),
- 'earned' => $this->groupByCurrency($earned),
- 'transferred' => $this->groupByCurrency($transferred),
- ];
+ 'title' => $title,
+ 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
+ 'total_transactions' => count($spent) + count($earned) + count($transferred),
+ 'spent' => $this->groupByCurrency($spent),
+ 'earned' => $this->groupByCurrency($earned),
+ 'transferred' => $this->groupByCurrency($transferred),
+ ];
++$loops;
}
diff --git a/app/Support/System/IsOldVersion.php b/app/Support/System/IsOldVersion.php
new file mode 100644
index 0000000000..2499debbe8
--- /dev/null
+++ b/app/Support/System/IsOldVersion.php
@@ -0,0 +1,99 @@
+.
+ */
+
+namespace FireflyIII\Support\System;
+
+use Carbon\Carbon;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
+
+trait IsOldVersion
+{
+ /**
+ * By default, version_compare() returns -1 if the first version is lower than the second, 0 if they are equal, and
+ * 1 if the second is lower.
+ */
+ protected function compareDevelopVersions(string $current, string $latest): int
+ {
+ $currentParts = explode('/', $current);
+ $latestParts = explode('/', $latest);
+ if (2 !== count($currentParts) || 2 !== count($latestParts)) {
+ Log::error(sprintf('Version "%s" or "%s" is not a valid develop-version.', $current, $latest));
+
+ return 0;
+ }
+
+ $currentDate = Carbon::createFromFormat('!Y-m-d', $currentParts[1]);
+ $latestDate = Carbon::createFromFormat('!Y-m-d', $latestParts[1]);
+
+ if ($currentDate->lt($latestDate)) {
+ Log::debug(sprintf('This current version is older, current = %s, latest version %s.', $current, $latest));
+
+ return -1;
+ }
+ if ($currentDate->gt($latestDate)) {
+ Log::debug(sprintf('This current version is newer, current = %s, latest version %s.', $current, $latest));
+
+ return 1;
+ }
+ Log::debug(sprintf('This current version is of the same age, current = %s, latest version %s.', $current, $latest));
+
+ return 0;
+ }
+
+ /**
+ * Check if the "firefly_version" variable is correct.
+ */
+ protected function isOldVersionInstalled(): bool
+ {
+ // version compare thing.
+ $configVersion = (string)config('firefly.version');
+ $dbVersion = (string)FireflyConfig::getFresh('ff3_version', '1.0')->data;
+ $compare = 0;
+ // compare develop to develop
+ if (str_starts_with($configVersion, 'develop') && str_starts_with($dbVersion, 'develop')) {
+ $compare = $this->compareDevelopVersions($configVersion, $dbVersion);
+ }
+ // user has develop installed, goes to normal version.
+ if (!str_starts_with($configVersion, 'develop') && str_starts_with($dbVersion, 'develop')) {
+ return true;
+ }
+
+ // user has normal, goes to develop version.
+ if (str_starts_with($configVersion, 'develop') && !str_starts_with($dbVersion, 'develop')) {
+ return true;
+ }
+
+ // compare normal with normal.
+ if (!str_starts_with($configVersion, 'develop') && !str_starts_with($dbVersion, 'develop')) {
+ $compare = version_compare($configVersion, $dbVersion);
+ }
+ if (-1 === $compare) {
+ Log::warning(sprintf('The current configured Firefly III version (%s) is older than the required version (%s). Redirect to migrate routine.', $dbVersion, $configVersion));
+
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/changelog.md b/changelog.md
index aecba981e0..1c9594c475 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,17 +5,33 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## 6.4.1 - 2025-09-15
+### Added
+
+- [PR 10979](https://github.com/firefly-iii/firefly-iii/pull/10979) (Add Kazakhstani Tenge (KZT) currency) reported by @maksimkurb
+
### Fixed
- Fixed a missing filter from [issue 10803](https://github.com/firefly-iii/firefly-iii/issues/10803).
-- #10891
-- #10920
-- #10921
-- #10833
+- [Issue 10833](https://github.com/firefly-iii/firefly-iii/issues/10833) (Can't open transaction after assigning a tag to it) reported by @zynexiz
+- [Issue 10854](https://github.com/firefly-iii/firefly-iii/issues/10854) (string / null in budget causes budget page to not render) reported by @4e868df3
+- [Discussion 10891](https://github.com/orgs/firefly-iii/discussions/10891) (User group id is null when downloading new exchange rates) started by @dakennguyen
+- [Discussion 10916](https://github.com/orgs/firefly-iii/discussions/10916) (Errors/Warnings in Logs after Batch API Import) started by @Mr-Kanister
+- [Issue 10920](https://github.com/firefly-iii/firefly-iii/issues/10920) (Liability transaction with same source and destination possible) reported by @Mr-Kanister
+- [Issue 10921](https://github.com/firefly-iii/firefly-iii/issues/10921) (Transaction type between asset and liability not correctly enforced using API) reported by @Mr-Kanister
+- [Issue 10924](https://github.com/firefly-iii/firefly-iii/issues/10924) (Recurring transactions don't save (or show) selected subscription) reported by @SteffoSpieler
+- [Discussion 10938](https://github.com/orgs/firefly-iii/discussions/10938) (Unable to apply default rule group to certain transactions) started by @praemon
+- [Issue 10940](https://github.com/firefly-iii/firefly-iii/issues/10940) (Internal Server Error when trying to open piggy banks) reported by @mattephi
+- [Issue 10954](https://github.com/firefly-iii/firefly-iii/issues/10954) (Internal Server Error when trying to access (default) account) reported by @thomaschristory
+- [Issue 10956](https://github.com/firefly-iii/firefly-iii/issues/10956) (Manual webhook trigger fail) reported by @dudu7731
+- [Issue 10960](https://github.com/firefly-iii/firefly-iii/issues/10960) (404 after deleting subscription) reported by @lindely
+- [Discussion 10974](https://github.com/orgs/firefly-iii/discussions/10974) (Big webhook_messages table) started by @Billos
+- #10988
+- [Issue 10990](https://github.com/firefly-iii/firefly-iii/issues/10990) (duplicate piggy event via API) reported by @4e868df3
### API
-- #10908
+- [Issue 10803](https://github.com/firefly-iii/firefly-iii/issues/10803) (Issue in /v1/budget-limits spent attribute) reported by @Billos
+- [Discussion 10908](https://github.com/orgs/firefly-iii/discussions/10908) (New fields for BudgetLimit object) started by @Billos
## 6.4.0 - 2025-09-14
diff --git a/composer.lock b/composer.lock
index f7341ff02a..bf27259208 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
},
{
"name": "laravel/framework",
- "version": "v12.31.1",
+ "version": "v12.32.5",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "281b711710c245dd8275d73132e92635be3094df"
+ "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/281b711710c245dd8275d73132e92635be3094df",
- "reference": "281b711710c245dd8275d73132e92635be3094df",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
+ "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
"shasum": ""
},
"require": {
@@ -1915,7 +1915,6 @@
"monolog/monolog": "^3.0",
"nesbot/carbon": "^3.8.4",
"nunomaduro/termwind": "^2.0",
- "phiki/phiki": "^2.0.0",
"php": "^8.2",
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
@@ -2094,7 +2093,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2025-09-23T15:33:04+00:00"
+ "time": "2025-09-30T17:39:22+00:00"
},
{
"name": "laravel/passport",
@@ -2812,16 +2811,16 @@
},
{
"name": "league/csv",
- "version": "9.25.0",
+ "version": "9.26.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/csv.git",
- "reference": "f856f532866369fb1debe4e7c5a1db185f40ef86"
+ "reference": "7fce732754d043f3938899e5183e2d0f3d31b571"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/csv/zipball/f856f532866369fb1debe4e7c5a1db185f40ef86",
- "reference": "f856f532866369fb1debe4e7c5a1db185f40ef86",
+ "url": "https://api.github.com/repos/thephpleague/csv/zipball/7fce732754d043f3938899e5183e2d0f3d31b571",
+ "reference": "7fce732754d043f3938899e5183e2d0f3d31b571",
"shasum": ""
},
"require": {
@@ -2899,7 +2898,7 @@
"type": "github"
}
],
- "time": "2025-09-11T08:29:08+00:00"
+ "time": "2025-10-01T11:24:54+00:00"
},
{
"name": "league/event",
@@ -4352,77 +4351,6 @@
},
"time": "2020-10-15T08:29:30+00:00"
},
- {
- "name": "phiki/phiki",
- "version": "v2.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/phikiphp/phiki.git",
- "reference": "160785c50c01077780ab217e5808f00ab8f05a13"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phikiphp/phiki/zipball/160785c50c01077780ab217e5808f00ab8f05a13",
- "reference": "160785c50c01077780ab217e5808f00ab8f05a13",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "league/commonmark": "^2.5.3",
- "php": "^8.2",
- "psr/simple-cache": "^3.0"
- },
- "require-dev": {
- "illuminate/support": "^11.45",
- "laravel/pint": "^1.18.1",
- "orchestra/testbench": "^9.15",
- "pestphp/pest": "^3.5.1",
- "phpstan/extension-installer": "^1.4.3",
- "phpstan/phpstan": "^2.0",
- "symfony/var-dumper": "^7.1.6"
- },
- "type": "library",
- "extra": {
- "laravel": {
- "providers": [
- "Phiki\\Adapters\\Laravel\\PhikiServiceProvider"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "Phiki\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ryan Chandler",
- "email": "support@ryangjchandler.co.uk",
- "homepage": "https://ryangjchandler.co.uk",
- "role": "Developer"
- }
- ],
- "description": "Syntax highlighting using TextMate grammars in PHP.",
- "support": {
- "issues": "https://github.com/phikiphp/phiki/issues",
- "source": "https://github.com/phikiphp/phiki/tree/v2.0.4"
- },
- "funding": [
- {
- "url": "https://github.com/sponsors/ryangjchandler",
- "type": "github"
- },
- {
- "url": "https://buymeacoffee.com/ryangjchandler",
- "type": "other"
- }
- ],
- "time": "2025-09-20T17:21:02+00:00"
- },
{
"name": "php-http/client-common",
"version": "2.7.2",
diff --git a/config/firefly.php b/config/firefly.php
index d3ff9f679b..01c88d918a 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,10 +78,10 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag.
],
- 'version' => 'develop/2025-09-29',
- 'build_time' => 1759116036,
+ 'version' => 'develop/2025-10-02',
+ 'build_time' => 1759383469,
'api_version' => '2.1.0', // field is no longer used.
- 'db_version' => 27,
+ 'db_version' => 28, // field is no longer used.
// generic settings
'maxUploadSize' => 1073741824, // 1 GB
diff --git a/package-lock.json b/package-lock.json
index 91344ae85e..77e6898b78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2135,9 +2135,9 @@
}
},
"node_modules/@fortawesome/fontawesome-free": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz",
- "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz",
+ "integrity": "sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==",
"license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
"engines": {
"node": ">=6"
@@ -3173,13 +3173,13 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "24.5.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
- "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
+ "version": "24.6.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz",
+ "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==",
"dev": true,
"license": "MIT",
"dependencies": {
- "undici-types": "~7.12.0"
+ "undici-types": "~7.13.0"
}
},
"node_modules/@types/node-forge": {
@@ -3898,16 +3898,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/at-least-node": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
- "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">= 4.0.0"
- }
- },
"node_modules/autoprefixer": {
"version": "10.4.21",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
@@ -4075,9 +4065,9 @@
"license": "MIT"
},
"node_modules/baseline-browser-mapping": {
- "version": "2.8.9",
- "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.9.tgz",
- "integrity": "sha512-hY/u2lxLrbecMEWSB0IpGzGyDyeoMFQhCvZd2jGFSE5I17Fh01sYUBPCJtkWERw7zrac9+cIghxm/ytJa2X8iA==",
+ "version": "2.8.10",
+ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.10.tgz",
+ "integrity": "sha512-uLfgBi+7IBNay8ECBO2mVMGZAc1VgZWEChxm4lv+TobGdG82LnXMjuNGo/BSSZZL4UmkWhxEHP2f5ziLNwGWMA==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -4360,9 +4350,9 @@
}
},
"node_modules/browserslist": {
- "version": "4.26.2",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
- "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+ "version": "4.26.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz",
+ "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==",
"dev": true,
"funding": [
{
@@ -4380,9 +4370,9 @@
],
"license": "MIT",
"dependencies": {
- "baseline-browser-mapping": "^2.8.3",
- "caniuse-lite": "^1.0.30001741",
- "electron-to-chromium": "^1.5.218",
+ "baseline-browser-mapping": "^2.8.9",
+ "caniuse-lite": "^1.0.30001746",
+ "electron-to-chromium": "^1.5.227",
"node-releases": "^2.0.21",
"update-browserslist-db": "^1.1.3"
},
@@ -4521,9 +4511,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001745",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001745.tgz",
- "integrity": "sha512-ywt6i8FzvdgrrrGbr1jZVObnVv6adj+0if2/omv9cmR2oiZs30zL4DIyaptKcbOrBdOIc74QTMoJvSE2QHh5UQ==",
+ "version": "1.0.30001746",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001746.tgz",
+ "integrity": "sha512-eA7Ys/DGw+pnkWWSE/id29f2IcPHVoE8wxtvE5JdvD2V28VTDPy1yEeo11Guz0sJ4ZeGRcm3uaTcAqK1LXaphA==",
"dev": true,
"funding": [
{
@@ -5061,9 +5051,9 @@
}
},
"node_modules/cross-env": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
- "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
+ "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5736,9 +5726,9 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
- "version": "1.5.227",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.227.tgz",
- "integrity": "sha512-ITxuoPfJu3lsNWUi2lBM2PaBPYgH3uqmxut5vmBxgYvyI4AlJ6P3Cai1O76mOrkJCBzq0IxWg/NtqOrpu/0gKA==",
+ "version": "1.5.228",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.228.tgz",
+ "integrity": "sha512-nxkiyuqAn4MJ1QbobwqJILiDtu/jk14hEAWaMiJmNPh1Z+jqoFlBFZjdXwLWGeVSeu9hGLg6+2G9yJaW8rBIFA==",
"dev": true,
"license": "ISC"
},
@@ -7088,9 +7078,9 @@
}
},
"node_modules/i18next": {
- "version": "25.5.2",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.2.tgz",
- "integrity": "sha512-lW8Zeh37i/o0zVr+NoCHfNnfvVw+M6FQbRp36ZZ/NyHDJ3NJVpp2HhAUyU9WafL5AssymNoOjMRB48mmx2P6Hw==",
+ "version": "25.5.3",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.3.tgz",
+ "integrity": "sha512-joFqorDeQ6YpIXni944upwnuHBf5IoPMuqAchGVeQLdWC2JOjxgM9V8UGLhNIIH/Q8QleRxIi0BSRQehSrDLcg==",
"funding": [
{
"type": "individual",
@@ -8653,16 +8643,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/os-tmpdir": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -8818,9 +8798,9 @@
}
},
"node_modules/patch-package": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
- "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz",
+ "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -8829,15 +8809,14 @@
"ci-info": "^3.7.0",
"cross-spawn": "^7.0.3",
"find-yarn-workspace-root": "^2.0.0",
- "fs-extra": "^9.0.0",
+ "fs-extra": "^10.0.0",
"json-stable-stringify": "^1.0.2",
"klaw-sync": "^6.0.0",
"minimist": "^1.2.6",
"open": "^7.4.2",
- "rimraf": "^2.6.3",
"semver": "^7.5.3",
"slash": "^2.0.0",
- "tmp": "^0.0.33",
+ "tmp": "^0.2.4",
"yaml": "^2.2.2"
},
"bin": {
@@ -8848,22 +8827,6 @@
"npm": ">5"
}
},
- "node_modules/patch-package/node_modules/fs-extra": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
- "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/patch-package/node_modules/slash": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -10086,9 +10049,9 @@
}
},
"node_modules/rimraf": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
- "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"deprecated": "Rimraf versions prior to v4 are no longer supported",
"dev": true,
"license": "ISC",
@@ -10097,6 +10060,9 @@
},
"bin": {
"rimraf": "bin.js"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/ripemd160": {
@@ -11214,16 +11180,13 @@
}
},
"node_modules/tmp": {
- "version": "0.0.33",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
- "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+ "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
"dev": true,
"license": "MIT",
- "dependencies": {
- "os-tmpdir": "~1.0.2"
- },
"engines": {
- "node": ">=0.6.0"
+ "node": ">=14.14"
}
},
"node_modules/to-arraybuffer": {
@@ -11343,9 +11306,9 @@
}
},
"node_modules/undici-types": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
- "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz",
+ "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==",
"dev": true,
"license": "MIT"
},
@@ -11863,9 +11826,9 @@
"license": "BSD-2-Clause"
},
"node_modules/webpack": {
- "version": "5.101.3",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz",
- "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==",
+ "version": "5.102.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz",
+ "integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11877,7 +11840,7 @@
"@webassemblyjs/wasm-parser": "^1.14.1",
"acorn": "^8.15.0",
"acorn-import-phases": "^1.0.3",
- "browserslist": "^4.24.0",
+ "browserslist": "^4.24.5",
"chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.17.3",
"es-module-lexer": "^1.2.1",
@@ -11890,9 +11853,9 @@
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
"schema-utils": "^4.3.2",
- "tapable": "^2.1.1",
+ "tapable": "^2.2.3",
"terser-webpack-plugin": "^5.3.11",
- "watchpack": "^2.4.1",
+ "watchpack": "^2.4.4",
"webpack-sources": "^3.3.3"
},
"bin": {
@@ -12155,23 +12118,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/webpack-dev-server/node_modules/rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "deprecated": "Rimraf versions prior to v4 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^7.1.3"
- },
- "bin": {
- "rimraf": "bin.js"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/webpack-dev-server/node_modules/schema-utils": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig
index 6dd268a04e..2e498a162a 100644
--- a/resources/views/partials/debug-table.twig
+++ b/resources/views/partials/debug-table.twig
@@ -12,8 +12,7 @@
{# Firefly III version #}
| Firefly III |
- {% if FF_IS_DEVELOP %}{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }} / #{{ system.db_version }} (expects #{{ config('firefly.db_version') }})
- |
+ {% if FF_IS_DEVELOP %}{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }} |
{# PHP version + settings #}