Release 1742108081

THANKS.md

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- github-actions[bot]
 - Jose Diaz-Gonzalez
 - SoftBrix
 

app/Api/V1/Controllers/Summary/BasicController.php

@@ -185,8 +185,8 @@ private function getBalanceInformation(Carbon $start, Carbon $end): array
                 'currency_decimal_places' => $currency->decimal_places,
                 'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId] ?? '0', false),
                 'local_icon'              => 'balance-scale',
-                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false).
-                                             ' + '.app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false)
+                                             .' + '.app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
             ];
             $return[] = [
                 'key'                     => sprintf('spent-in-%s', $currency->code),

app/Api/V1/Requests/Data/DestroyRequest.php

@@ -49,9 +49,9 @@ public function getObjects(): string
      */
     public function rules(): array
     {
-        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'.
-                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'.
-                 ',not_assets_liabilities';
+        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'
+                 .',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'
+                 .',not_assets_liabilities';
 
         return [
             'objects' => sprintf('required|max:255|min:1|string|in:%s', $valid),

app/Factory/BillFactory.php

@@ -48,8 +48,8 @@ public function create(array $data): ?Bill
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__), $data);
         $factory          = app(TransactionCurrencyFactory::class);
-        $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null)) ??
-                    app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
+        $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null))
+                    ?? app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         try {
             $skip   = array_key_exists('skip', $data) ? $data['skip'] : 0;

app/Http/Controllers/Transaction/MassController.php

@@ -141,8 +141,8 @@ public function edit(array $journals): IlluminateView
         // reverse amounts
         foreach ($journals as $index => $journal) {
             $journals[$index]['amount']         = app('steam')->bcround(app('steam')->positive($journal['amount']), $journal['currency_decimal_places']);
-            $journals[$index]['foreign_amount'] = null === $journal['foreign_amount'] ?
-                null : app('steam')->positive($journal['foreign_amount']);
+            $journals[$index]['foreign_amount'] = null === $journal['foreign_amount']
+                ? null : app('steam')->positive($journal['foreign_amount']);
         }
 
         $this->rememberPreviousUrl('transactions.mass-edit.url');

app/Http/Middleware/TrustProxies.php

@@ -33,11 +33,11 @@ class TrustProxies extends Middleware
 {
     // After...
     protected $headers
-        = Request::HEADER_X_FORWARDED_FOR |
-        Request::HEADER_X_FORWARDED_HOST |
-        Request::HEADER_X_FORWARDED_PORT |
-        Request::HEADER_X_FORWARDED_PROTO |
-        Request::HEADER_X_FORWARDED_AWS_ELB;
+        = Request::HEADER_X_FORWARDED_FOR
+        | Request::HEADER_X_FORWARDED_HOST
+        | Request::HEADER_X_FORWARDED_PORT
+        | Request::HEADER_X_FORWARDED_PROTO
+        | Request::HEADER_X_FORWARDED_AWS_ELB;
 
     /**
      * TrustProxies constructor.

app/Services/Internal/Update/BillUpdateService.php

@@ -54,8 +54,8 @@ public function update(Bill $bill, array $data): Bill
 
         if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
             $factory                       = app(TransactionCurrencyFactory::class);
-            $currency                      = $factory->find((int) ($data['currency_id'] ?? null), $data['currency_code'] ?? null) ??
-                        app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup);
+            $currency                      = $factory->find((int) ($data['currency_id'] ?? null), $data['currency_code'] ?? null)
+                        ?? app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup);
 
             // enable the currency if it isn't.
             $currency->enabled             = true;

app/Services/Internal/Update/JournalUpdateService.php

@@ -703,8 +703,8 @@ private function updateForeignAmount(): void
         // find currency in data array
         $newForeignId    = $this->data['foreign_currency_id'] ?? null;
         $newForeignCode  = $this->data['foreign_currency_code'] ?? null;
-        $foreignCurrency = $this->currencyRepository->findCurrencyNull($newForeignId, $newForeignCode) ??
-                           $foreignCurrency;
+        $foreignCurrency = $this->currencyRepository->findCurrencyNull($newForeignId, $newForeignCode)
+                           ?? $foreignCurrency;
 
         // not the same as normal currency
         if (null !== $foreignCurrency && $foreignCurrency->id === $this->transactionJournal->transaction_currency_id) {

config/firefly.php

@@ -81,7 +81,7 @@
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.2.9',
+    'version'                      => 'develop/2025-03-16',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,