Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-03-21
JC5a40425fd7539
diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.phpindex c65a37ca15..22e10bc187 100644--- a/app/Helpers/Collector/GroupCollector.php+++ b/app/Helpers/Collector/GroupCollector.php@@ -48,6 +48,7 @@ use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use Override;use Safe\Exceptions\JsonException;+use function Safe\json_decode;/**@@ -67,13 +68,13 @@ class GroupCollector implements GroupCollectorInterface*/public function __construct(){- $this->sorting = [];- $this->postFilters = [];- $this->tags = [];- $this->user = null;- $this->userGroup = null;- $this->limit = null;- $this->page = null;+ $this->sorting = [];+ $this->postFilters = [];+ $this->tags = [];+ $this->user = null;+ $this->userGroup = null;+ $this->limit = null;+ $this->page = null;$this->hasAccountInfo = false;$this->hasCatInformation = false;@@ -271,16 +272,16 @@ class GroupCollector implements GroupCollectorInterfaceforeach ($params as $param) {$replace = sprintf('"%s"', $param);if (is_int($param)) {- $replace = (string)$param;+ $replace = (string) $param;}- $pos = strpos($query, '?');+ $pos = strpos($query, '?');if (false !== $pos) {$query = substr_replace($query, $replace, $pos, 1);}}echo $query;- exit(PHP_EOL . 'To see the query, uncomment the next lines first.');+ exit(PHP_EOL.'To see the query, uncomment the next lines first.');// echo '<pre>';// print_r($this->query->getBindings());@@ -449,13 +450,13 @@ class GroupCollector implements GroupCollectorInterface// $this->dumpQueryInLogs();// now to parse the rest into an array.- $collection = $this->parseArray($result);+ $collection = $this->parseArray($result);// filter the array using all available post filters:- $collection = $this->postFilterCollection($collection);+ $collection = $this->postFilterCollection($collection);// sort the collection, if sort instructions are present.- $collection = $this->sortCollection($collection);+ $collection = $this->sortCollection($collection);// now filter the array according to the page and the limit (if necessary)if (count($this->postFilters) > 0 && null !== $this->limit && null !== $this->page) {@@ -463,6 +464,7 @@ class GroupCollector implements GroupCollectorInterfacereturn $collection->slice($offset, $this->limit);}+return $collection;}@@ -476,7 +478,7 @@ class GroupCollector implements GroupCollectorInterfaceif (0 === $this->limit) {$this->setLimit(50);}- $set = $this->getGroups();+ $set = $this->getGroups();return new LengthAwarePaginator($set, $this->total, $limit, $this->page);}@@ -508,7 +510,6 @@ class GroupCollector implements GroupCollectorInterfacereturn $this;}-public function setExpandGroupSearch(bool $expandGroupSearch): GroupCollectorInterface{$this->expandGroupSearch = $expandGroupSearch;@@ -671,6 +672,7 @@ class GroupCollector implements GroupCollectorInterfaceif (0 === count($this->sorting)) {return $collection;}+/*** @var string $field* @var string $direction@@ -710,7 +712,8 @@ class GroupCollector implements GroupCollectorInterface// include budget ID + name (if any)->withBudgetInformation()// include bill ID + name (if any)- ->withBillInformation();+ ->withBillInformation()+ ;return $this;}@@ -718,7 +721,7 @@ class GroupCollector implements GroupCollectorInterfaceprivate function convertToBoolean(array $array): array{foreach ($this->booleanFields as $field) {- $array[$field] = array_key_exists($field, $array) ? (bool)$array[$field] : null;+ $array[$field] = array_key_exists($field, $array) ? (bool) $array[$field] : null;}return $array;@@ -730,7 +733,7 @@ class GroupCollector implements GroupCollectorInterfaceprivate function convertToInteger(array $array): array{foreach ($this->integerFields as $field) {- $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (int)$array[$field] : null;+ $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (int) $array[$field] : null;}return $array;@@ -739,7 +742,7 @@ class GroupCollector implements GroupCollectorInterfaceprivate function convertToStrings(array $array): array{foreach ($this->stringFields as $field) {- $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (string)$array[$field] : null;+ $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (string) $array[$field] : null;}return $array;@@ -750,14 +753,15 @@ class GroupCollector implements GroupCollectorInterfacereturn $this->query->get(['transaction_journals.transaction_group_id'])->pluck('transaction_group_id')- ->toArray();+ ->toArray()+ ;}private function mergeAttachments(array $existingJournal, TransactionJournal $newJournal): array{$newArray = $newJournal->toArray();if (array_key_exists('attachment_id', $newArray)) {- $attachmentId = (int)$newJournal['attachment_id'];+ $attachmentId = (int) $newJournal['attachment_id'];if (0 !== $attachmentId) {$existingJournal['attachments'][$attachmentId] = ['id' => $attachmentId];}@@ -770,9 +774,9 @@ class GroupCollector implements GroupCollectorInterface{$newArray = $newJournal->toArray();if (array_key_exists('tag_id', $newArray)) { // assume the other fields are present as well.- $tagId = (int)$newJournal['tag_id'];+ $tagId = (int) $newJournal['tag_id'];- $tagDate = null;+ $tagDate = null;try {$tagDate = Carbon::parse($newArray['tag_date']);@@ -781,7 +785,7 @@ class GroupCollector implements GroupCollectorInterface}$existingJournal['tags'][$tagId] = [- 'id' => (int)$newArray['tag_id'],+ 'id' => (int) $newArray['tag_id'],'name' => $newArray['tag_name'],'date' => $tagDate,'description' => $newArray['tag_description'],@@ -800,13 +804,13 @@ class GroupCollector implements GroupCollectorInterface/** @var TransactionJournal $augumentedJournal */foreach ($collection as $augumentedJournal) {- $groupId = (int)$augumentedJournal->transaction_group_id;+ $groupId = (int) $augumentedJournal->transaction_group_id;if (!array_key_exists($groupId, $groups)) {// make new array- $parsedGroup = $this->parseAugmentedJournal($augumentedJournal);- $groupArray = [- 'id' => (int)$augumentedJournal->transaction_group_id,+ $parsedGroup = $this->parseAugmentedJournal($augumentedJournal);+ $groupArray = [+ 'id' => (int) $augumentedJournal->transaction_group_id,'user_id' => $augumentedJournal->user_id,'user_group_id' => $augumentedJournal->user_group_id,// Field transaction_group_title was added by the query.@@ -819,7 +823,7 @@ class GroupCollector implements GroupCollectorInterface'transactions' => [],];// Field transaction_journal_id was added by the query.- $journalId = (int)$augumentedJournal->transaction_journal_id;+ $journalId = (int) $augumentedJournal->transaction_journal_id;$groupArray['transactions'][$journalId] = $parsedGroup;$groups[$groupId] = $groupArray;@@ -827,7 +831,7 @@ class GroupCollector implements GroupCollectorInterface}// or parse the rest.// Field transaction_journal_id was added by the query.- $journalId = (int)$augumentedJournal->transaction_journal_id;+ $journalId = (int) $augumentedJournal->transaction_journal_id;if (array_key_exists($journalId, $groups[$groupId]['transactions'])) {// append data to existing group + journal (for multiple tags or multiple attachments)$groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal);@@ -877,27 +881,27 @@ class GroupCollector implements GroupCollectorInterface}// try to process meta date value (if present)- $dates = ['interest_date', 'payment_date', 'invoice_date', 'book_date', 'due_date', 'process_date'];+ $dates = ['interest_date', 'payment_date', 'invoice_date', 'book_date', 'due_date', 'process_date'];if (array_key_exists('meta_name', $result) && in_array($result['meta_name'], $dates, true)) {$name = $result['meta_name'];- if (array_key_exists('meta_data', $result) && '' !== (string)$result['meta_data']) {- $result[$name] = Carbon::createFromFormat('!Y-m-d', substr((string)json_decode((string)$result['meta_data']), 0, 10));+ if (array_key_exists('meta_data', $result) && '' !== (string) $result['meta_data']) {+ $result[$name] = Carbon::createFromFormat('!Y-m-d', substr((string) json_decode((string) $result['meta_data']), 0, 10));}}// convert values to integers:- $result = $this->convertToInteger($result);+ $result = $this->convertToInteger($result);// convert to boolean- $result = $this->convertToBoolean($result);+ $result = $this->convertToBoolean($result);// convert back to strings because SQLite is dumb like that.- $result = $this->convertToStrings($result);+ $result = $this->convertToStrings($result);- $result['reconciled'] = 1 === (int)$result['reconciled'];+ $result['reconciled'] = 1 === (int) $result['reconciled'];if (array_key_exists('tag_id', $result) && null !== $result['tag_id']) { // assume the other fields are present as well.- $tagId = (int)$augumentedJournal['tag_id'];- $tagDate = null;+ $tagId = (int) $augumentedJournal['tag_id'];+ $tagDate = null;try {$tagDate = Carbon::parse($augumentedJournal['tag_date']);@@ -906,7 +910,7 @@ class GroupCollector implements GroupCollectorInterface}$result['tags'][$tagId] = [- 'id' => (int)$result['tag_id'],+ 'id' => (int) $result['tag_id'],'name' => $result['tag_name'],'date' => $tagDate,'description' => $result['tag_description'],@@ -915,8 +919,8 @@ class GroupCollector implements GroupCollectorInterface// also merge attachments:if (array_key_exists('attachment_id', $result) && null !== $result['attachment_id']) {- $uploaded = 1 === (int)$result['attachment_uploaded'];- $attachmentId = (int)$augumentedJournal['attachment_id'];+ $uploaded = 1 === (int) $result['attachment_uploaded'];+ $attachmentId = (int) $augumentedJournal['attachment_id'];$deleted = null !== $result['attachment_deleted_at'];if (0 !== $attachmentId && $uploaded && !$deleted) {$result['attachments'][$attachmentId] = [@@ -953,13 +957,13 @@ class GroupCollector implements GroupCollectorInterfaceforeach ($groups as $groudId => $group) {/** @var array $transaction */foreach ($group['transactions'] as $transaction) {- $currencyId = (int)$transaction['currency_id'];+ $currencyId = (int) $transaction['currency_id'];if (null === $transaction['amount']) {throw new FireflyException(sprintf('Amount is NULL for a transaction in group #%d, please investigate.', $groudId));}- $pcAmount = (string)('' === $transaction['pc_amount'] ? '0' : $transaction['pc_amount']);- $pcForeignAmount = (string)('' === $transaction['pc_foreign_amount'] ? '0' : $transaction['pc_foreign_amount']);- $foreignAmount = (string)('' === $transaction['foreign_amount'] ? '0' : $transaction['foreign_amount']);+ $pcAmount = (string) ('' === $transaction['pc_amount'] ? '0' : $transaction['pc_amount']);+ $pcForeignAmount = (string) ('' === $transaction['pc_foreign_amount'] ? '0' : $transaction['pc_foreign_amount']);+ $foreignAmount = (string) ('' === $transaction['foreign_amount'] ? '0' : $transaction['foreign_amount']);// set default:if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {@@ -970,11 +974,11 @@ class GroupCollector implements GroupCollectorInterface$groups[$groudId]['sums'][$currencyId]['amount'] = '0';$groups[$groudId]['sums'][$currencyId]['pc_amount'] = '0';}- $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd((string)$groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount']);- $groups[$groudId]['sums'][$currencyId]['pc_amount'] = bcadd((string)$groups[$groudId]['sums'][$currencyId]['pc_amount'], $pcAmount);+ $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd((string) $groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount']);+ $groups[$groudId]['sums'][$currencyId]['pc_amount'] = bcadd((string) $groups[$groudId]['sums'][$currencyId]['pc_amount'], $pcAmount);if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) {- $currencyId = (int)$transaction['foreign_currency_id'];+ $currencyId = (int) $transaction['foreign_currency_id'];// set default:if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {@@ -985,7 +989,7 @@ class GroupCollector implements GroupCollectorInterface$groups[$groudId]['sums'][$currencyId]['amount'] = '0';$groups[$groudId]['sums'][$currencyId]['pc_amount'] = '0';}- $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd((string)$groups[$groudId]['sums'][$currencyId]['amount'], $foreignAmount);+ $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd((string) $groups[$groudId]['sums'][$currencyId]['amount'], $foreignAmount);$groups[$groudId]['sums'][$currencyId]['pc_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $pcForeignAmount);}}@@ -1002,10 +1006,10 @@ class GroupCollector implements GroupCollectorInterfacereturn $currentCollection;}Log::debug(sprintf(- 'GroupCollector: postFilterCollection has %d filter(s) and %d transaction(s).',- count($this->postFilters),- count($currentCollection)- ));+ 'GroupCollector: postFilterCollection has %d filter(s) and %d transaction(s).',+ count($this->postFilters),+ count($currentCollection)+ ));if (0 === $currentCollection->count()) {Log::debug('Found nothing anyway, return empty collection.');@@ -1018,7 +1022,7 @@ class GroupCollector implements GroupCollectorInterface*/foreach ($this->postFilters as $function) {Log::debug('Applying filter...');- $nextCollection = new Collection();+ $nextCollection = new Collection();// loop everything in the current collection// and save it (or not) in the new collection.@@ -1089,7 +1093,8 @@ class GroupCollector implements GroupCollectorInterface->orderBy('transaction_journals.order', 'ASC')->orderBy('transaction_journals.id', 'DESC')->orderBy('transaction_journals.description', 'DESC')- ->orderBy('source.amount', 'DESC');+ ->orderBy('source.amount', 'DESC')+ ;}/**diff --git a/config/firefly.php b/config/firefly.phpindex c244bf5b46..6f033e3b2d 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],- 'version' => '6.5.8',- 'build_time' => 1774090288,+ 'version' => 'develop/2026-03-21',+ 'build_time' => 1774102650,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex c2e06bc6bc..4d7ba9f6a2 100644--- a/package-lock.json+++ b/package-lock.json@@ -4135,9 +4135,9 @@"license": "MIT"},"node_modules/baseline-browser-mapping": {- "version": "2.10.9",- "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.9.tgz",- "integrity": "sha512-OZd0e2mU11ClX8+IdXe3r0dbqMEznRiT4TfbhYIbcRPZkqJ7Qwer8ij3GZAmLsRKa+II9V1v5czCkvmHH3XZBg==",+ "version": "2.10.10",+ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.10.tgz",+ "integrity": "sha512-sUoJ3IMxx4AyRqO4MLeHlnGDkyXRoUG0/AI9fjK+vS72ekpV0yWVY7O0BVjmBcRtkNcsAO2QDZ4tdKKGoI6YaQ==","dev": true,"license": "Apache-2.0","bin": {@@ -7143,9 +7143,9 @@}},"node_modules/i18next": {- "version": "25.9.0",- "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.9.0.tgz",- "integrity": "sha512-mJ4rVRNWOTkqh5xnaGR6iMFT5vEw3Y2MTJhcjinR/7u8cRv6dAfC0ofuePh5fVPxoh395p6JdrJTStCcNW66gg==",+ "version": "25.10.0",+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.10.0.tgz",+ "integrity": "sha512-syBEN80PJ3MOpczGXFtv6OTfKQzgi/VbvgtQQjr1z5b/0xSGa1iG8n5ESG7TVT5scGbbRr/1Du2tufHEkr5pHw==","funding": [{"type": "individual",