Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-02-14
JC5a573e19dbc02
diff --git a/app/Handlers/ExchangeRate/ConvertsAmountToPrimaryAmount.php b/app/Handlers/ExchangeRate/ConvertsAmountToPrimaryAmount.phpindex c5f8545a33..a2dd40bab5 100644--- a/app/Handlers/ExchangeRate/ConvertsAmountToPrimaryAmount.php+++ b/app/Handlers/ExchangeRate/ConvertsAmountToPrimaryAmount.php@@ -36,13 +36,13 @@ class ConvertsAmountToPrimaryAmount$primaryAmountField = $params->primaryAmountField;if (!Amount::convertToPrimary($params->user)) {-// Log::debug(sprintf(-// 'User does not want to do conversion, no need to convert "%s" and store it in field "%s" for %s #%d.',-// $params->amountField,-// $params->primaryAmountField,-// get_class($params->model),-// $params->model->id-// ));+ // Log::debug(sprintf(+ // 'User does not want to do conversion, no need to convert "%s" and store it in field "%s" for %s #%d.',+ // $params->amountField,+ // $params->primaryAmountField,+ // get_class($params->model),+ // $params->model->id+ // ));$params->model->{$primaryAmountField} = null;$params->model->saveQuietly();diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.phpindex 3566bf4bc3..f97f0a0db5 100644--- a/app/Support/Authentication/RemoteUserGuard.php+++ b/app/Support/Authentication/RemoteUserGuard.php@@ -59,8 +59,9 @@ class RemoteUserGuard implements Guard{$this->tried = true;Log::debug(sprintf('Now at %s', __METHOD__));- if(App::runningInConsole()) {+ if (App::runningInConsole()) {Log::debug('Running in console, will not authenticate.');+return;}if ($this->user instanceof User) {@@ -155,8 +156,9 @@ class RemoteUserGuard implements Guardpublic function user(): ?User{- if(App::runningInConsole()) {+ if (App::runningInConsole()) {Log::debug('Running in console, will not authenticate.');+return null;}if (false === $this->tried) {diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.phpindex 41a7bfa420..cec8f12741 100644--- a/app/Support/Export/ExportDataGenerator.php+++ b/app/Support/Export/ExportDataGenerator.php@@ -128,6 +128,8 @@ class ExportDataGenerator// @phpstan-ignore-line+ // @phpstan-ignore-line+public function __construct(){$this->accounts = new Collection();diff --git a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.phpindex e8f5bad6c5..cf8a8d3062 100644--- a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php@@ -60,6 +60,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate readonly bool $convertToPrimary; // @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line@@ -80,6 +81,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $currencies = [];private array $currencyIds = [];private array $ids = [];diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.phpindex ed96d24ff8..b78dd1e5a4 100644--- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php+++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php@@ -60,6 +60,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $currencies = [];private array $currencyIds = [];private Carbon $end;diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.phpindex 53b1134d48..e99fecdeb8 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php@@ -62,6 +62,7 @@ class PiggyBankEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $accounts = []; // @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line@@ -82,6 +83,7 @@ class PiggyBankEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $amounts = [];private Collection $collection;private array $currencies = [];diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.phpindex b8af54f739..7fcca8b63f 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php@@ -57,6 +57,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $accountIds = []; // @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line@@ -77,6 +78,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate Collection $collection;private array $currencies = [];private array $groupIds = [];diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.phpindex 332b4aa68f..3c0b1e616f 100644--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php@@ -66,6 +66,7 @@ class SubscriptionEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate readonly bool $convertToPrimary;private ?Carbon $end = null;private array $mappedObjects = [];diff --git a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.phpindex ba104f4edc..4526a22fea 100644--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php@@ -93,6 +93,8 @@ class TransactionGroupEnrichment implements EnrichmentInterface// @phpstan-ignore-line+ // @phpstan-ignore-line+public function __construct(){$this->dateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];diff --git a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php b/app/Support/JsonApi/Enrichments/WebhookEnrichment.phpindex afd6c14aa5..760129d931 100644--- a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php+++ b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php@@ -62,6 +62,7 @@ class WebhookEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $ids = []; // @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line@@ -82,6 +83,7 @@ class WebhookEnrichment implements EnrichmentInterface// @phpstan-ignore-line// @phpstan-ignore-line// @phpstan-ignore-line+ // @phpstan-ignore-lineprivate array $responses = [];private array $triggers = [];private array $webhookDeliveries = [];diff --git a/config/firefly.php b/config/firefly.phpindex ec2456b8ec..2d6f5b6e0b 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],- 'version' => '6.4.20',- 'build_time' => 1771072586,+ 'version' => 'develop/2026-02-14',+ 'build_time' => 1771075358,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.