Auto commit for release 'develop' on 2025-03-14

app/Api/V1/Controllers/Controller.php

@@ -263,7 +263,7 @@ abstract class Controller extends BaseController
 
         // the transformer, at this point, needs to collect information that ALL items in the collection
         // require, like meta-data and stuff like that, and save it for later.
-        //$objects  = $transformer->collectMetaData($objects);
+        // $objects  = $transformer->collectMetaData($objects);
         $paginator->setCollection($objects);
 
         $resource = new FractalCollection($objects, $transformer, $key);
@@ -284,7 +284,7 @@ abstract class Controller extends BaseController
         $baseUrl  = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        //$transformer->collectMetaData(new Collection([$object]));
+        // $transformer->collectMetaData(new Collection([$object]));
 
         $resource = new Item($object, $transformer, $key);
 

app/Api/V2/Controllers/Controller.php

@@ -167,7 +167,7 @@ class Controller extends BaseController
 
         // the transformer, at this point, needs to collect information that ALL items in the collection
         // require, like meta-data and stuff like that, and save it for later.
-        //$objects  = $transformer->collectMetaData($objects);
+        // $objects  = $transformer->collectMetaData($objects);
         $paginator->setCollection($objects);
 
         $resource = new FractalCollection($objects, $transformer, $key);
@@ -188,7 +188,7 @@ class Controller extends BaseController
         $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        //$transformer->collectMetaData(new Collection([$object]));
+        // $transformer->collectMetaData(new Collection([$object]));
 
         $resource = new Item($object, $transformer, $key);
 

app/Repositories/Account/AccountRepository.php

@@ -680,7 +680,8 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
 
                 // fields
                 'transaction_journals.date', 'transaction_types.type', 'transaction_journals.transaction_currency_id', 'transactions.amount'])
-            ->toArray();
+            ->toArray()
+        ;
 
     }
 }

app/Repositories/Category/NoCategoryRepository.php

@@ -77,9 +77,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
             $journalId  = (int) $journal['transaction_journal_id'];
             $array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
                         = [
-                           'amount' => app('steam')->negative($journal['amount']),
-                           'date'   => $journal['date'],
-                       ];
+                            'amount' => app('steam')->negative($journal['amount']),
+                            'date'   => $journal['date'],
+                        ];
         }
 
         return $array;
@@ -123,9 +123,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
             $journalId  = (int) $journal['transaction_journal_id'];
             $array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
                         = [
-                           'amount' => app('steam')->positive($journal['amount']),
-                           'date'   => $journal['date'],
-                       ];
+                            'amount' => app('steam')->positive($journal['amount']),
+                            'date'   => $journal['date'],
+                        ];
         }
 
         return $array;

app/Support/Http/Controllers/PeriodOverview.php

@@ -109,14 +109,14 @@ trait PeriodOverview
             [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
             $entries[]
                                               = [
-                    'title'              => $title,
-                    'route'              => route('accounts.show', [$account->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
-                    'total_transactions' => count($spent) + count($earned) + count($transferredAway) + count($transferredIn),
-                    'spent'              => $this->groupByCurrency($spent),
-                    'earned'             => $this->groupByCurrency($earned),
-                    'transferred_away'   => $this->groupByCurrency($transferredAway),
-                    'transferred_in'     => $this->groupByCurrency($transferredIn),
-                ];
+                                                  'title'              => $title,
+                                                  'route'              => route('accounts.show', [$account->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
+                                                  'total_transactions' => count($spent) + count($earned) + count($transferredAway) + count($transferredIn),
+                                                  'spent'              => $this->groupByCurrency($spent),
+                                                  'earned'             => $this->groupByCurrency($earned),
+                                                  'transferred_away'   => $this->groupByCurrency($transferredAway),
+                                                  'transferred_in'     => $this->groupByCurrency($transferredIn),
+                                              ];
         }
         $cache->store($entries);
         Timer::stop('account-period-total');
@@ -603,13 +603,13 @@ trait PeriodOverview
             }
             $entries[]
                          = [
-                    'title'              => $title,
-                    'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
-                    'total_transactions' => count($spent) + count($earned) + count($transferred),
-                    'spent'              => $this->groupByCurrency($spent),
-                    'earned'             => $this->groupByCurrency($earned),
-                    'transferred'        => $this->groupByCurrency($transferred),
-                ];
+                             'title'              => $title,
+                             'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
+                             'total_transactions' => count($spent) + count($earned) + count($transferred),
+                             'spent'              => $this->groupByCurrency($spent),
+                             'earned'             => $this->groupByCurrency($earned),
+                             'transferred'        => $this->groupByCurrency($transferred),
+                         ];
         }
 
         return $entries;

app/Transformers/ExchangeRateTransformer.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ExchangeRateTransformer.php
  * Copyright (c) 2025 james@firefly-iii.org.

app/Transformers/UserGroupTransformer.php

@@ -28,7 +28,6 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Transformers\AbstractTransformer;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 

app/Transformers/V2/AbstractTransformer.php

@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class AbstractTransformer
+ *
  * @deprecated
  */
 abstract class AbstractTransformer extends TransformerAbstract

app/Transformers/V2/AccountTransformer.php

@@ -36,6 +36,7 @@ use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountTransformer
+ *
  * @deprecated
  */
 class AccountTransformer extends AbstractTransformer

app/Transformers/V2/BillTransformer.php

@@ -40,6 +40,7 @@ use Illuminate\Support\Facades\Log;
 
 /**
  * Class BillTransformer
+ *
  * @deprecated
  */
 class BillTransformer extends AbstractTransformer

app/Transformers/V2/BudgetLimitTransformer.php

@@ -30,6 +30,7 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class BudgetLimitTransformer
+ *
  * @deprecated
  */
 class BudgetLimitTransformer extends AbstractTransformer

app/Transformers/V2/BudgetTransformer.php

@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class BudgetTransformer
+ *
  * @deprecated
  */
 class BudgetTransformer extends AbstractTransformer

app/Transformers/V2/CurrencyTransformer.php

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
 
 /**
  * Class CurrencyTransformer
+ *
  * @deprecated
  */
 class CurrencyTransformer extends AbstractTransformer

app/Transformers/V2/ExchangeRateTransformer.php

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
 
 /**
  * Class AccountTransformer
+ *
  * @deprecated
  */
 class ExchangeRateTransformer extends AbstractTransformer

app/Transformers/V2/PiggyBankTransformer.php

@@ -41,6 +41,7 @@ use Illuminate\Support\Facades\Log;
 
 /**
  * Class PiggyBankTransformer
+ *
  * @deprecated
  */
 class PiggyBankTransformer extends AbstractTransformer

app/Transformers/V2/PreferenceTransformer.php

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
 
 /**
  * Class PreferenceTransformer
+ *
  * @deprecated
  */
 class PreferenceTransformer extends AbstractTransformer

app/Transformers/V2/TransactionGroupTransformer.php

@@ -43,6 +43,7 @@ use Illuminate\Support\Facades\DB;
 
 /**
  * Class TransactionGroupTransformer
+ *
  * @deprecated
  */
 class TransactionGroupTransformer extends AbstractTransformer

app/Transformers/V2/UserGroupTransformer.php

@@ -32,6 +32,7 @@ use Illuminate\Support\Collection;
 
 /**
  * Class UserGroupTransformer
+ *
  * @deprecated
  */
 class UserGroupTransformer extends AbstractTransformer

changelog.md

@@ -7,29 +7,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- #9903
+- [PR 9903](https://github.com/firefly-iii/firefly-iii/pull/9903) (Add support for PHP function `strpos` in expressions) reported by @lompi
 
 ### Changed
 
-- #9972
+- [Issue 9972](https://github.com/firefly-iii/firefly-iii/issues/9972) (Important optimization improvement: enable opcache) reported by @jgoclawski
 - Greatly improved speed of account overview
 - Better validation of environment variables
 
 ### Fixed
 
-- #9895
-- #9906
-- #9908
-- #9914
-- #9941
-- #9948
-- #9954
-- #9970
-- #9876
+- [Issue 9895](https://github.com/firefly-iii/firefly-iii/issues/9895) (Account Balance not updating in Transaction tab) reported by @StoicaRemus
+- [Issue 9906](https://github.com/firefly-iii/firefly-iii/issues/9906) (404 Not Found when deleting rule group) reported by @EnochPrime
+- [Issue 9908](https://github.com/firefly-iii/firefly-iii/issues/9908) (HTTP 500 on tags) reported by @wuvs
+- [Issue 9914](https://github.com/firefly-iii/firefly-iii/issues/9914) (adding money to piggy bank via API broken) reported by @4e868df3
+- [Issue 9941](https://github.com/firefly-iii/firefly-iii/issues/9941) (has_any_subscription search filter not valid) reported by @PhilWun
+- [Issue 9948](https://github.com/firefly-iii/firefly-iii/issues/9948) (typo in docker example env file) reported by @amenekowo
+- [Issue 9954](https://github.com/firefly-iii/firefly-iii/issues/9954) (Creating Bills via API is broken (optional fields are required)) reported by @jsegido
+- [Discussion 9970](https://github.com/orgs/firefly-iii/discussions/9970) (Category report with tags?) started by @luddeluddis
+- [Issue 9876](https://github.com/firefly-iii/firefly-iii/issues/9876) (data/bulkUpdateTransactions POST should not requires Content-Type header in request as request body must be empty) reported by @bouil
 
 ### API
 
-- #9902
+- [Issue 9902](https://github.com/firefly-iii/firefly-iii/issues/9902) (BIC number no longer returned by the /accounts API endpoint) reported by @dawid-czarnecki
 
 
 ## 6.2.9 - 2025-02-22