Merge pull request #11655 from firefly-iii/release-1770383285

🤖 Automatically merge the PR into the develop branch.

app/Http/Controllers/Bill/IndexController.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\ObjectGroup\OrganisesObjectGroups;
 use FireflyIII\Support\Facades\Navigation;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;
 use FireflyIII\Transformers\BillTransformer;
 use FireflyIII\User;
@@ -75,6 +76,16 @@ class IndexController extends Controller
         $this->repository->correctTransfers();
         $start       = session('start');
         $end         = session('end');
+        $viewRange   = Preferences::get('viewRange', '1M')->data;
+
+        // give the end some extra space when the user has last7, last30 or last90.
+        if ('last7' === $viewRange || 'last30' === $viewRange) {
+            $end->addDays(30);
+        }
+        if ('last90') {
+            $end->addDays(90);
+        }
+
         $collection  = $this->repository->getBills();
         $total       = $collection->count();
 

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -35,10 +35,10 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
+use Override;
 use Spatie\Period\Boundaries;
 use Spatie\Period\Period;
 use Spatie\Period\Precision;
-use Override;
 
 /**
  * Class AvailableBudgetRepository

app/Support/Calendar/Calculator.php

@@ -37,6 +37,7 @@ class Calculator
 
     private static ?SplObjectStorage $intervalMap = null; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private static array $intervals               = [];
 
     public function isAvailablePeriodicity(Periodicity $periodicity): bool

app/Support/Export/ExportDataGenerator.php

@@ -92,6 +92,8 @@ class ExportDataGenerator
 
     // @phpstan-ignore-line
 
+    // @phpstan-ignore-line
+
     public function __construct()
     {
         $this->accounts = new Collection();

app/Support/Http/Controllers/PeriodOverview.php

@@ -82,10 +82,13 @@ trait PeriodOverview
     protected PeriodStatisticRepositoryInterface $periodStatisticRepo;
     private Collection $statistics; // temp data holder
     // temp data holder
+    // temp data holder
     private array $transactions; // temp data holder
 
     // temp data holder
 
+    // temp data holder
+
     /**
      * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
      * and for each period, the amount of money spent and earned. This is a complex operation which is cached for

app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php

@@ -42,8 +42,10 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
 {
     private Collection $collection; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private readonly bool $convertToPrimary; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies            = [];
     private array $currencyIds           = [];
     private array $ids                   = [];

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -42,6 +42,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface
     private Collection $collection;
     private readonly bool $convertToPrimary; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies  = [];
     private array $currencyIds = [];
     private Carbon $end;

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -44,8 +44,10 @@ class PiggyBankEnrichment implements EnrichmentInterface
 {
     private array $accountIds    = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accounts      = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $amounts       = [];
     private Collection $collection;
     private array $currencies    = [];

app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php

@@ -39,8 +39,10 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
 {
     private array $accountCurrencies = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accountIds        = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private Collection $collection;
     private array $currencies        = [];
     private array $groupIds          = [];

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -48,6 +48,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
     private BillDateCalculator $calculator;
     private Collection $collection; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private readonly bool $convertToPrimary;
     private ?Carbon $end             = null;
     private array   $mappedObjects   = [];

app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php

@@ -57,6 +57,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'];

app/Support/JsonApi/Enrichments/WebhookEnrichment.php

@@ -44,8 +44,10 @@ class WebhookEnrichment implements EnrichmentInterface
     private Collection $collection;
     private array $deliveries        = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $ids               = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $responses         = [];
     private array $triggers          = [];
     private array $webhookDeliveries = [];

config/firefly.php

@@ -79,7 +79,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                              => 'develop/2026-02-06',
-    'build_time'                           => 1770382386,
+    'build_time'                           => 1770383155,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.