Merge pull request #11676 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

app/Helpers/Collector/GroupCollector.php

@@ -433,7 +433,7 @@ class GroupCollector implements GroupCollectorInterface
      */
     public function getGroups(): Collection
     {
-        Log::debug('Now in getGroups()');
+        // Log::debug('Now in getGroups()');
         if ($this->expandGroupSearch) {
             // get group ID's for the query:
             $groupIds = $this->getCollectedGroupIds();
@@ -556,7 +556,7 @@ class GroupCollector implements GroupCollectorInterface
         if (0 !== count($journalIds)) {
             // make all integers.
             $integerIDs = array_map(intval(...), $journalIds);
-            Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
+            // Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
 
             $this->query->whereIn('transaction_journals.id', $integerIDs);
         }

app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php

@@ -40,7 +40,7 @@ trait SupportsGroupProcessingTrait
         $first               = $set->first();
         $journalIds          = implode(',', $array);
         $user                = $first->user;
-        Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
+        // Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
 
         // collect rules:
         $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);

app/Repositories/Budget/OperationsRepository.php

@@ -85,7 +85,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         ?Collection $budgets = null,
         ?TransactionCurrency $currency = null
     ): array {
-        Log::debug(sprintf('Start of %s(%s, %s, array, array, "%s").', __METHOD__, $start->toW3cString(), $end->toW3cString(), $currency?->code));
+        // Log::debug(sprintf('Start of %s(%s, %s, array, array, "%s").', __METHOD__, $start->toW3cString(), $end->toW3cString(), $currency?->code));
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
         // 2024-12-24 disable the exclusion for now.
@@ -275,7 +275,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         TransactionCurrency $transactionCurrency,
         bool $convertToPrimary = false
     ): array {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        //        Log::debug(sprintf('Start of %s.', __METHOD__));
         $summarizer = new TransactionSummarizer($this->user);
         $summarizer->setConvertToPrimary($convertToPrimary);
 
@@ -290,7 +290,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
 
     public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array
     {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        // Log::debug(sprintf('Start of %s.', __METHOD__));
         $summarizer = new TransactionSummarizer($this->user);
         $summarizer->setConvertToPrimary($convertToPrimary);
 
@@ -311,7 +311,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         ?TransactionCurrency $currency = null,
         bool $convertToPrimary = false
     ): array {
-        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", %s).', __METHOD__, $currency?->code, var_export($convertToPrimary, true)));
+        //        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", %s).', __METHOD__, $currency?->code, var_export($convertToPrimary, true)));
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
         // 2024-12-24 disable the exclusion for now.

app/Repositories/Category/OperationsRepository.php

@@ -372,7 +372,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
 
     public function sumCollectedTransactionsByCategory(array $expenses, Category $category, string $method, bool $convertToPrimary = false): array
     {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        //        Log::debug(sprintf('Start of %s.', __METHOD__));
         $summarizer = new TransactionSummarizer($this->user);
         $summarizer->setConvertToPrimary($convertToPrimary);
 

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -195,21 +195,21 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
         if (null === $filter) {
             return $groups;
         }
-        Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));
+        // Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));
 
         return $groups->map(static function (RuleGroup $group) use ($filter): RuleGroup { // @phpstan-ignore-line
-            Log::debug(sprintf('Now filtering group #%d', $group->id));
+            //            Log::debug(sprintf('Now filtering group #%d', $group->id));
             // filter the rules in the rule group:
-            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter, $group): bool {
-                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
+            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter): bool {
+                // Log::debug(sprintf('Now filtering rule #%d', $rule->id));
                 foreach ($rule->ruleTriggers as $trigger) {
                     if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
-                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
+                        // Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
 
                         return true;
                     }
                 }
-                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
+                // Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
 
                 return false;
             });
@@ -251,18 +251,18 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
         Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));
 
         return $groups->map(static function (RuleGroup $group) use ($filter): RuleGroup { // @phpstan-ignore-line
-            Log::debug(sprintf('Now filtering group #%d', $group->id));
+            //            Log::debug(sprintf('Now filtering group #%d', $group->id));
             // filter the rules in the rule group:
-            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter, $group): bool {
-                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
+            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter): bool {
+                //                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
                 foreach ($rule->ruleTriggers as $trigger) {
                     if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
-                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
+                        //                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
 
                         return true;
                     }
                 }
-                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
+                //                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
 
                 return false;
             });

app/Support/Calendar/Calculator.php

@@ -43,6 +43,8 @@ class Calculator
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private static array $intervals               = [];
 
     public function isAvailablePeriodicity(Periodicity $periodicity): bool

app/Support/Export/ExportDataGenerator.php

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

app/Support/Http/Controllers/PeriodOverview.php

@@ -88,6 +88,8 @@ trait PeriodOverview
     // temp data holder
     // temp data holder
     // temp data holder
+    // temp data holder
+    // temp data holder
     private array $transactions; // temp data holder
 
     // temp data holder
@@ -104,6 +106,10 @@ trait PeriodOverview
 
     // 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/AccountEnrichment.php

@@ -92,7 +92,7 @@ class AccountEnrichment implements EnrichmentInterface
      */
     public function enrich(Collection $collection): Collection
     {
-        Log::debug(sprintf('Now doing account enrichment for %d account(s)', $collection->count()));
+        // Log::debug(sprintf('Now doing account enrichment for %d account(s)', $collection->count()));
 
         // prep local fields
         $this->collection = $collection;

app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php

@@ -48,6 +48,8 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private readonly bool $convertToPrimary; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -56,6 +58,8 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies            = [];
     private array $currencyIds           = [];
     private array $ids                   = [];

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -48,6 +48,8 @@ class BudgetLimitEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies  = [];
     private array $currencyIds = [];
     private Carbon $end;

app/Support/JsonApi/Enrichments/CategoryEnrichment.php

@@ -63,7 +63,7 @@ class CategoryEnrichment implements EnrichmentInterface
 
     public function enrichSingle(array|Model $model): array|Model
     {
-        Log::debug(__METHOD__);
+        // Log::debug(__METHOD__);
         $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -50,6 +50,8 @@ class PiggyBankEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accounts      = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -58,6 +60,8 @@ class PiggyBankEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $amounts       = [];
     private Collection $collection;
     private array $currencies    = [];

app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php

@@ -45,6 +45,8 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accountIds        = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -53,6 +55,8 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private Collection $collection;
     private array $currencies        = [];
     private array $groupIds          = [];

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -54,6 +54,8 @@ class SubscriptionEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @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

@@ -69,6 +69,10 @@ class TransactionGroupEnrichment implements EnrichmentInterface
 
     // @phpstan-ignore-line
 
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
     public function __construct()
     {
         $this->dateFields      = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
@@ -78,7 +82,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface
     #[Override]
     public function enrich(Collection $collection): Collection
     {
-        Log::debug(sprintf('Now doing account enrichment for %d transaction group(s)', $collection->count()));
+        // Log::debug(sprintf('Now doing account enrichment for %d transaction group(s)', $collection->count()));
         // prep local fields
         $this->collection = $collection;
         $this->collectJournalIds();

app/Support/JsonApi/Enrichments/WebhookEnrichment.php

@@ -50,6 +50,8 @@ class WebhookEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $ids               = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -58,6 +60,8 @@ class WebhookEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $responses         = [];
     private array $triggers          = [];
     private array $webhookDeliveries = [];

app/Support/Models/AccountBalanceCalculator.php

@@ -78,7 +78,7 @@ class AccountBalanceCalculator
         ]);
 
         if (null === $first) {
-            Log::debug(sprintf('Found no transactions for currency #%d and account #%d, return 0.', $currencyId, $accountId));
+            // Log::debug(sprintf('Found no transactions for currency #%d and account #%d, return 0.', $currencyId, $accountId));
 
             return '0';
         }

app/Support/Report/Summarizer/TransactionSummarizer.php

@@ -45,7 +45,7 @@ class TransactionSummarizer
 
     public function groupByCurrencyId(array $journals, string $method = 'negative', bool $includeForeign = true): array
     {
-        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));
+        // Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));
         $array = [];
         foreach ($journals as $journal) {
             $field                        = 'amount';
@@ -146,7 +146,7 @@ class TransactionSummarizer
             // $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], \FireflyIII\Support\Facades\Steam::{$method}($amount));
             // Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
         }
-        Log::debug('End of sumExpenses.', $array);
+        //        Log::debug('End of sumExpenses.', $array);
 
         return $array;
     }
@@ -234,7 +234,7 @@ class TransactionSummarizer
 
     public function setConvertToPrimary(bool $convertToPrimary): void
     {
-        Log::debug(sprintf('Overrule convertToPrimary to become %s', var_export($convertToPrimary, true)));
+        // Log::debug(sprintf('Overrule convertToPrimary to become %s', var_export($convertToPrimary, true)));
         $this->convertToPrimary = $convertToPrimary;
     }
 

app/Support/Request/ChecksLogin.php

@@ -39,14 +39,14 @@ trait ChecksLogin
      */
     public function authorize(): bool
     {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        // Log::debug(sprintf('Now in %s', __METHOD__));
         // Only allow logged-in users
         $check     = auth()->check();
         if (!$check) {
             return false;
         }
         if (!property_exists($this, 'acceptedRoles')) { // @phpstan-ignore-line
-            Log::debug('Request class has no acceptedRoles array');
+            Log::debug(sprintf('Request class %s has no acceptedRoles array', static::class));
 
             return true; // check for false already took place.
         }
@@ -81,15 +81,15 @@ trait ChecksLogin
     {
         /** @var User $user */
         $user      = auth()->user();
-        Log::debug('Now in getUserGroup()');
+        // Log::debug('Now in getUserGroup()');
 
         /** @var null|UserGroup $userGroup */
         $userGroup = $this->route()?->parameter('userGroup');
         if (null === $userGroup) {
-            Log::debug('Request class has no userGroup parameter, but perhaps there is a parameter.');
+            // Log::debug('Request class has no userGroup parameter, but perhaps there is a parameter.');
             $userGroupId = (int) $this->get('user_group_id');
             if (0 === $userGroupId) {
-                Log::debug(sprintf('Request class has no user_group_id parameter, grab default from user (group #%d).', $user->user_group_id));
+                // Log::debug(sprintf('Request class has no user_group_id parameter, grab default from user (group #%d).', $user->user_group_id));
                 $userGroupId = (int) $user->user_group_id;
             }
             $userGroup   = UserGroup::find($userGroupId);
@@ -98,7 +98,8 @@ trait ChecksLogin
 
                 return null;
             }
-            Log::debug('Request class has valid user_group_id.');
+
+            // Log::debug('Request class has valid user_group_id.');
         }
 
         return $userGroup;

app/Support/Search/OperatorQuerySearch.php

@@ -122,11 +122,11 @@ class OperatorQuerySearch implements SearchInterface
             if (str_starts_with($original, '-')) {
                 $return = sprintf('-%s', $config['alias_for']);
             }
-            Log::debug(sprintf('"%s" is an alias for "%s", so return that instead.', $original, $return));
+            // Log::debug(sprintf('"%s" is an alias for "%s", so return that instead.', $original, $return));
 
             return $return;
         }
-        Log::debug(sprintf('"%s" is not an alias.', $operator));
+        // Log::debug(sprintf('"%s" is not an alias.', $operator));
 
         return $original;
     }
@@ -174,7 +174,7 @@ class OperatorQuerySearch implements SearchInterface
      */
     public function parseQuery(string $query): void
     {
-        Log::debug(sprintf('Now in parseQuery("%s")', $query));
+        // Log::debug(sprintf('Now in parseQuery("%s")', $query));
 
         /** @var QueryParserInterface $parser */
         $parser = app(QueryParserInterface::class);

app/Support/Search/QueryParser/QueryParser.php

@@ -39,7 +39,7 @@ class QueryParser implements QueryParserInterface
 
     public function parse(string $query): NodeGroup
     {
-        Log::debug(sprintf('Parsing query in QueryParser: "%s"', $query));
+        // Log::debug(sprintf('Parsing query in QueryParser: "%s"', $query));
         $this->query    = $query;
         $this->position = 0;
 
@@ -78,7 +78,7 @@ class QueryParser implements QueryParserInterface
                 }
                 // char is "
                 ++$this->position;
-                Log::debug(sprintf('Constructed token: %s', $tokenUnderConstruction));
+                // Log::debug(sprintf('Constructed token: %s', $tokenUnderConstruction));
 
                 return new NodeResult($this->createNode($tokenUnderConstruction, $fieldName, $prohibited), false);
             }
@@ -200,11 +200,11 @@ class QueryParser implements QueryParserInterface
                 $token = rtrim($token, '"');
             }
             $token = str_replace('\"', '"', $token);
-            Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));
+            // Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));
 
             return new FieldNode(trim($fieldName), trim($token), $prohibited);
         }
-        Log::debug(sprintf('Create StringNode "%s" (%s)', $token, var_export($prohibited, true)));
+        // F Now in handleSearchNodeLog::debug(sprintf('Create StringNode "%s" (%s)', $token, var_export($prohibited, true)));
 
         return new StringNode(trim($token), $prohibited);
     }

app/TransactionRules/Engine/SearchRuleEngine.php

@@ -60,7 +60,7 @@ class SearchRuleEngine implements RuleEngineInterface
 
     public function addOperator(array $operator): void
     {
-        Log::debug('Add extra operator: ', $operator);
+        // Log::debug('Add extra operator: ', $operator);
         $this->operators[] = $operator;
     }
 

composer.lock

@@ -11908,16 +11908,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.5.9",
+            "version": "12.5.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "83d4c158526c879b4c5cf7149d27958b6d912373"
+                "reference": "1686e30f6b32d35592f878a7f56fd0421d7d56c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d4c158526c879b4c5cf7149d27958b6d912373",
-                "reference": "83d4c158526c879b4c5cf7149d27958b6d912373",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1686e30f6b32d35592f878a7f56fd0421d7d56c5",
+                "reference": "1686e30f6b32d35592f878a7f56fd0421d7d56c5",
                 "shasum": ""
             },
             "require": {
@@ -11931,7 +11931,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.5.2",
+                "phpunit/php-code-coverage": "^12.5.3",
                 "phpunit/php-file-iterator": "^6.0.1",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
@@ -11986,7 +11986,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.10"
             },
             "funding": [
                 {
@@ -12010,7 +12010,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-05T08:01:09+00:00"
+            "time": "2026-02-08T07:06:48+00:00"
         },
         {
             "name": "rector/rector",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-02-08',
-    'build_time'                           => 1770531224,
+    'version'                              => '6.4.18',
+    'build_time'                           => 1770535525,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.