Merge pull request #10975 from firefly-iii/release-1758945886

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/composer.lock

@@ -402,16 +402,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.88.0",
+            "version": "v3.88.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe"
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f23469674ae50d40e398bfff8018911a2a2b0dbe",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a8d15584bafb0f0d9d938827840060fd4a3ebc99",
-                "reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe",
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99",
                 "shasum": ""
             },
             "require": {
@@ -494,7 +494,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.2"
             },
             "funding": [
                 {
@@ -502,7 +502,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-24T21:31:42+00:00"
+            "time": "2025-09-27T00:24:15+00:00"
         },
         {
             "name": "psr/container",

app/Console/Commands/Tools/ApplyRules.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Tools;
 
-use Carbon\CarbonInterface;
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Console\Commands\VerifiesAccessToken;

app/Handlers/Events/StoredGroupEventHandler.php

@@ -109,10 +109,10 @@ class StoredGroupEventHandler
             $dest   = $journal->transactions()->where('amount', '>', '0')->first();
             $repository->deleteStatisticsForModel($source->account, $journal->date);
             $repository->deleteStatisticsForModel($dest->account, $journal->date);
-            foreach($journal->categories as $category) {
+            foreach ($journal->categories as $category) {
                 $repository->deleteStatisticsForModel($category, $journal->date);
             }
-            foreach($journal->tags as $tag) {
+            foreach ($journal->tags as $tag) {
                 $repository->deleteStatisticsForModel($tag, $journal->date);
             }
         }

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -60,10 +60,6 @@ class UpdatedGroupEventHandler
 
     /**
      * TODO duplicate
-     * 
-     * @param UpdatedTransactionGroup $event
-     *
-     * @return void
      */
     private function removePeriodStatistics(UpdatedTransactionGroup $event): void
     {
@@ -76,10 +72,10 @@ class UpdatedGroupEventHandler
             $dest   = $journal->transactions()->where('amount', '>', '0')->first();
             $repository->deleteStatisticsForModel($source->account, $journal->date);
             $repository->deleteStatisticsForModel($dest->account, $journal->date);
-            foreach($journal->categories as $category) {
+            foreach ($journal->categories as $category) {
                 $repository->deleteStatisticsForModel($category, $journal->date);
             }
-            foreach($journal->tags as $tag) {
+            foreach ($journal->tags as $tag) {
                 $repository->deleteStatisticsForModel($tag, $journal->date);
             }
         }

app/Http/Controllers/Transaction/CreateController.php

@@ -115,7 +115,8 @@ class CreateController extends Controller
         $preFilled                  = session()->has('preFilled') ? session('preFilled') : [];
         $subTitle                   = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType)));
         $subTitleIcon               = 'fa-plus';
-        /** @var array|null $optionalFields */
+
+        /** @var null|array $optionalFields */
         $optionalFields             = Preferences::get('transaction_journal_optional_fields', [])->data;
         $allowedOpposingTypes       = config('firefly.allowed_opposing_types');
         $accountToTypes             = config('firefly.account_to_transaction');

app/Repositories/Category/CategoryRepository.php

@@ -364,7 +364,7 @@ class CategoryRepository implements CategoryRepositoryInterface, UserGroupInterf
         Log::debug(sprintf('periodCollection(#%d, %s, %s)', $category->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
 
         return $category->transactionJournals()
-            ->leftJoin('transactions','transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
             ->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id')

app/Repositories/Category/OperationsRepository.php

@@ -510,7 +510,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         $summarizer->setConvertToPrimary($convertToPrimary);
 
         // filter $journals by range AND currency if it is present.
-        $expenses   = array_filter($expenses, static fn(array $expense): bool => $expense['category_id'] === $category->id);
+        $expenses   = array_filter($expenses, static fn (array $expense): bool => $expense['category_id'] === $category->id);
 
         return $summarizer->groupByCurrencyId($expenses, $method, false);
     }

app/Repositories/Tag/TagRepository.php

@@ -387,7 +387,7 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
         Log::debug(sprintf('periodCollection(#%d, %s, %s)', $tag->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
 
         return $tag->transactionJournals()
-                        ->leftJoin('transactions','transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
             ->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id')

app/Repositories/Tag/TagRepositoryInterface.php

@@ -50,6 +50,7 @@ interface TagRepositoryInterface
      * This method destroys a tag.
      */
     public function destroy(Tag $tag): bool;
+
     public function periodCollection(Tag $tag, Carbon $start, Carbon $end): array;
 
     /**

app/Support/Debug/Timer.php

@@ -38,7 +38,7 @@ class Timer
 
     public static function getInstance(): self
     {
-        if (!self::$instance instanceof \FireflyIII\Support\Debug\Timer) {
+        if (!self::$instance instanceof self) {
             self::$instance = new self();
         }
 

app/Support/Http/Controllers/PeriodOverview.php

@@ -287,7 +287,6 @@ trait PeriodOverview
         return $entries;
     }
 
-
     protected function getSingleAccountPeriod(Account $account, string $period, Carbon $start, Carbon $end): array
     {
         Log::debug(sprintf('Now in getSingleAccountPeriod(#%d, %s %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d')));

app/Support/Singleton/PreferencesSingleton.php

@@ -38,7 +38,7 @@ class PreferencesSingleton
 
     public static function getInstance(): self
     {
-        if (!self::$instance instanceof PreferencesSingleton) {
+        if (!self::$instance instanceof self) {
             self::$instance = new self();
         }
 

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-09-26',
+    'version'                      => 'develop/2025-09-27',
-    'build_time'                   => 1758914637,
+    'build_time'                   => 1758945787,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 27,