kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-10 21:58:45 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'v6.4.18' on 2026-02-08

Browse Source
This commit is contained in:
JC5
2026-02-08 08:27:35 +01:00
parent c334641b90
commit 5cbb311e4d
14 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@@ -198,9 +198,9 @@ 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 {
$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) {
@@ -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;
});

1
app/Support/Calendar/Calculator.php
View File

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

2
app/Support/Export/ExportDataGenerator.php
View File

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

3
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -89,6 +89,7 @@ trait PeriodOverview
// temp data holder
// temp data holder
// temp data holder
// temp data holder
private array $transactions; // temp data holder
// temp data holder
@@ -107,6 +108,8 @@ trait PeriodOverview
// 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

2
app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php
View File

@@ -49,6 +49,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
// @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
@@ -58,6 +59,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
// @phpstan-ignore-line
// @phpstan-ignore-line
// @phpstan-ignore-line
// @phpstan-ignore-line
private array $currencies = [];
private array $currencyIds = [];
private array $ids = [];

1
app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
View File

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

2
app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
View File

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

2
app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
View File

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

1
app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
View File

@@ -55,6 +55,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
// @phpstan-ignore-line
// @phpstan-ignore-line
// @phpstan-ignore-line
// @phpstan-ignore-line
private readonly bool $convertToPrimary;
private ?Carbon $end = null;
private array $mappedObjects = [];

2
app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
View File

@@ -71,6 +71,8 @@ class TransactionGroupEnrichment implements EnrichmentInterface
// @phpstan-ignore-line
// @phpstan-ignore-line
public function __construct()
{
$this->dateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];

2
app/Support/JsonApi/Enrichments/WebhookEnrichment.php
View File

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

2
app/Support/Request/ChecksLogin.php
View File

@@ -46,7 +46,7 @@ trait ChecksLogin
return false;
}
if (!property_exists($this, 'acceptedRoles')) { // @phpstan-ignore-line
Log::debug(sprintf('Request class %s has no acceptedRoles array', get_class($this)));
Log::debug(sprintf('Request class %s has no acceptedRoles array', static::class));
return true; // check for false already took place.
}

14
composer.lock generated
View File

@@ -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",

4
config/firefly.php
View File

@@ -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' => 1770534353,
'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.