Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-11-26
JC58722d264dc51
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.phpindex 9f0e3ea21b..6cf391dd4a 100644--- a/app/Http/Controllers/PiggyBank/CreateController.php+++ b/app/Http/Controllers/PiggyBank/CreateController.php@@ -75,7 +75,7 @@ class CreateController extends Controller$subTitleIcon = 'fa-plus';$request->old('_token');$preFilled = $request->old();- if(!array_key_exists('transaction_currency_id', $preFilled)) {+ if (!array_key_exists('transaction_currency_id', $preFilled)) {$preFilled['transaction_currency_id'] = $this->primaryCurrency->id;}diff --git a/app/Support/Navigation.php b/app/Support/Navigation.phpindex 52eaf56fb0..585ba925b8 100644--- a/app/Support/Navigation.php+++ b/app/Support/Navigation.php@@ -77,10 +77,10 @@ class Navigationif (!array_key_exists($repeatFreq, $functionMap)) {Log::error(sprintf(- 'The periodicity %s is unknown. Choose one of available periodicity: %s',- $repeatFreq,- implode(', ', array_keys($functionMap))- ));+ 'The periodicity %s is unknown. Choose one of available periodicity: %s',+ $repeatFreq,+ implode(', ', array_keys($functionMap))+ ));return $theDate;}@@ -93,7 +93,7 @@ class Navigationif ($end < $start) {[$start, $end] = [$end, $start];}- $periods = [];+ $periods = [];// first, 13 periods of [range]$loopCount = 0;$loopDate = clone $end;@@ -151,13 +151,13 @@ class Navigationpublic function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int{Log::debug(sprintf(- 'diffInPeriods: %s (skip: %d), between %s and %s.',- $period,- $skip,- $beginning->format('Y-m-d'),- $end->format('Y-m-d')- ));- $map = [+ 'diffInPeriods: %s (skip: %d), between %s and %s.',+ $period,+ $skip,+ $beginning->format('Y-m-d'),+ $end->format('Y-m-d')+ ));+ $map = ['daily' => 'diffInDays','weekly' => 'diffInWeeks','monthly' => 'diffInMonths',@@ -170,7 +170,7 @@ class Navigationreturn 1;}- $func = $map[$period];+ $func = $map[$period];// first do the diff$floatDiff = $beginning->{$func}($end, true); // @phpstan-ignore-line@@ -185,7 +185,7 @@ class Navigation}// then do ceil()- $diff = ceil($floatDiff);+ $diff = ceil($floatDiff);Log::debug(sprintf('Diff is %f periods (%d rounded up)', $floatDiff, $diff));@@ -193,11 +193,11 @@ class Navigation$parameter = $skip + 1;$diff = ceil($diff / $parameter) * $parameter;Log::debug(sprintf(- 'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',- $skip,- $parameter,- $diff- ));+ 'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',+ $skip,+ $parameter,+ $diff+ ));}return (int)$diff;@@ -205,7 +205,7 @@ class Navigationpublic function endOfPeriod(Carbon $end, string $repeatFreq): Carbon{- $currentEnd = clone $end;+ $currentEnd = clone $end;// Log::debug(sprintf('Now in endOfPeriod("%s", "%s").', $currentEnd->toIso8601String(), $repeatFreq));$functionMap = [@@ -239,7 +239,7 @@ class NavigationLog::debug('Session data available.');/** @var Carbon $tStart */- $tStart = session('start', today(config('app.timezone'))->startOfMonth());+ $tStart = session('start', today(config('app.timezone'))->startOfMonth());/** @var Carbon $tEnd */$tEnd = session('end', today(config('app.timezone'))->endOfMonth());@@ -260,9 +260,10 @@ class Navigationif ($today->isSameMonth($end)) {$res = $today->endOfDay()->milli(0);// add sanity check.- if($res->lt($end)) {+ if ($res->lt($end)) {throw new FireflyException(sprintf('[b] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $res->toW3cString()));}+return $res;}@@ -270,10 +271,11 @@ class Navigationif ($currentEnd->lt($end)) {throw new FireflyException(sprintf('[c] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString()));}+return $end->endOfMonth();}- $result = match ($repeatFreq) {+ $result = match ($repeatFreq) {'last7' => $currentEnd->addDays(7)->startOfDay(),'last30' => $currentEnd->addDays(30)->startOfDay(),'last90' => $currentEnd->addDays(90)->startOfDay(),@@ -303,7 +305,7 @@ class Navigationreturn $end;}- $function = $functionMap[$repeatFreq];+ $function = $functionMap[$repeatFreq];if (array_key_exists($repeatFreq, $modifierMap)) {$currentEnd->{$function}($modifierMap[$repeatFreq])->milli(0); // @phpstan-ignore-line@@ -353,7 +355,7 @@ class Navigation'yearly' => 'endOfYear',];- $currentEnd = clone $theCurrentEnd;+ $currentEnd = clone $theCurrentEnd;if (array_key_exists($repeatFreq, $functionMap)) {$function = $functionMap[$repeatFreq];@@ -396,7 +398,7 @@ class Navigation*/public function listOfPeriods(Carbon $start, Carbon $end): array{- $locale = app('steam')->getLocale();+ $locale = app('steam')->getLocale();// define period to increment$increment = 'addDay';$format = $this->preferredCarbonFormat($start, $end);@@ -413,8 +415,8 @@ class Navigation$increment = 'addYear';$displayFormat = (string)trans('config.year_js');}- $begin = clone $start;- $entries = [];+ $begin = clone $start;+ $entries = [];while ($begin < $end) {$formatted = $begin->format($format);$displayed = $begin->isoFormat($displayFormat);@@ -597,9 +599,9 @@ class Navigationpublic function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon{- $date = clone $theDate;+ $date = clone $theDate;// Log::debug(sprintf('Now in startOfPeriod("%s", "%s")', $date->toIso8601String(), $repeatFreq));- $functionMap = [+ $functionMap = ['1D' => 'startOfDay','daily' => 'startOfDay','1W' => 'startOfWeek',@@ -646,7 +648,7 @@ class Navigationreturn $date;}- $result = match ($repeatFreq) {+ $result = match ($repeatFreq) {'last7' => $date->subDays(7)->startOfDay(),'last30' => $date->subDays(30)->startOfDay(),'last90' => $date->subDays(90)->startOfDay(),@@ -678,7 +680,7 @@ class Navigationpublic function subtractPeriod(Carbon $theDate, string $repeatFreq, ?int $subtract = null): Carbon{$subtract ??= 1;- $date = clone $theDate;+ $date = clone $theDate;// 1D 1W 1M 3M 6M 1Y$functionMap = ['1D' => 'subDays',@@ -717,7 +719,7 @@ class Navigation// this is then subtracted from $theDate (* $subtract).if ('custom' === $repeatFreq) {/** @var Carbon $tStart */- $tStart = session('start', today(config('app.timezone'))->startOfMonth());+ $tStart = session('start', today(config('app.timezone'))->startOfMonth());/** @var Carbon $tEnd */$tEnd = session('end', today(config('app.timezone'))->endOfMonth());@@ -811,7 +813,7 @@ class Navigationreturn $fiscalHelper->endOfFiscalYear($end);}- $list = [+ $list = ['last7','last30','last90',diff --git a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.phpindex 58f40b85a4..e55405de9e 100644--- a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php+++ b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php@@ -35,7 +35,6 @@ use Illuminate\Support\Facades\Log;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;use Spatie\Period\Boundaries;-use Spatie\Period\Exceptions\InvalidPeriod;use Spatie\Period\Period;use Spatie\Period\Precision;@@ -203,8 +202,8 @@ trait RecalculatesAvailableBudgetsTrait}if (null === $availableBudget && $currentEnd->gte($current)) {$currentPeriod = Period::make($current, $currentEnd, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());- $daily = $this->getDailyAmount($budgetLimit);- $amount = bcmul((string)$daily, (string)$currentPeriod->length(), 12);+ $daily = $this->getDailyAmount($budgetLimit);+ $amount = bcmul((string)$daily, (string)$currentPeriod->length(), 12);// no need to calculate if period is equal.if ($currentPeriod->equals($limitPeriod)) {diff --git a/config/firefly.php b/config/firefly.phpindex b372972378..2ecdb8e4ad 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2025-11-26',- 'build_time' => 1764136346,+ 'build_time' => 1764178914,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.