kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-10-07

Browse Source
This commit is contained in:
github-actions
2024-10-07 05:13:20 +02:00
parent d03960e379
commit da0b41e45c
8 changed files with 643 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/php-cs-fixer/composer.lock generated
View File

@@ -2541,10 +2541,10 @@
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": {},
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.6.0" "plugin-api-version": "2.6.0"
} }

8
app/Api/V2/Request/Chart/ChartRequest.php
View File

@@ -80,14 +80,14 @@ class ChartRequest extends FormRequest
return [ return [
'fields' => JsonApiRule::notSupported(), 'fields' => JsonApiRule::notSupported(),
'filter' => ['nullable', 'array', 'filter' => ['nullable', 'array',
new IsValidFilter(['start', 'end', 'preselected', 'accounts', 'period']), new IsValidFilter(['start', 'end', 'preselected', 'accounts', 'period']),
new IsFilterValueIn('preselected', config('firefly.preselected_accounts')), new IsFilterValueIn('preselected', config('firefly.preselected_accounts')),
], ],
'include' => JsonApiRule::notSupported(), 'include' => JsonApiRule::notSupported(),
'page' => JsonApiRule::notSupported(), 'page' => JsonApiRule::notSupported(),
'sort' => JsonApiRule::notSupported(), 'sort' => JsonApiRule::notSupported(),
//'start' => 'required|date|after:1900-01-01|before:2099-12-31', // 'start' => 'required|date|after:1900-01-01|before:2099-12-31',
//'end' => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01', // 'end' => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
]; ];
// return [ // return [

2
app/Jobs/CreateRecurringTransactions.php
View File

@@ -363,7 +363,7 @@ class CreateRecurringTransactions implements ShouldQueue
$count = $recurrence->recurrenceTransactions->count(); $count = $recurrence->recurrenceTransactions->count();
// #8844, if there is one recurrence transaction, use the first title as the title. // #8844, if there is one recurrence transaction, use the first title as the title.
// #9305, if there is one recurrence transaction, group title must be NULL. // #9305, if there is one recurrence transaction, group title must be NULL.
$groupTitle = null; $groupTitle = null;
// #8844, if there are more, use the recurrence transaction itself. // #8844, if there are more, use the recurrence transaction itself.
if ($count > 1) { if ($count > 1) {

1
app/Support/Http/Api/ParsesQueryFilters.php
View File

@@ -66,6 +66,7 @@ trait ParsesQueryFilters
{ {
return (string) ($parameters->page()[$field] ?? $default); return (string) ($parameters->page()[$field] ?? $default);
} }
private function stringFromFilterParams(QueryParameters $parameters, string $field, string $default): string private function stringFromFilterParams(QueryParameters $parameters, string $field, string $default): string
{ {
return (string)$parameters->filter()?->value($field, $default) ?? $default; return (string)$parameters->filter()?->value($field, $default) ?? $default;

26
composer.lock generated
View File

@@ -4470,16 +4470,16 @@
}, },
{ {
"name": "nette/schema", "name": "nette/schema",
"version": "v1.3.1", "version": "v1.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nette/schema.git", "url": "https://github.com/nette/schema.git",
"reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5" "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nette/schema/zipball/9522dad6211c4d995a01a9ac529da88d0b0ba7b5", "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
"reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5", "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4526,9 +4526,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nette/schema/issues", "issues": "https://github.com/nette/schema/issues",
"source": "https://github.com/nette/schema/tree/v1.3.1" "source": "https://github.com/nette/schema/tree/v1.3.2"
}, },
"time": "2024-10-05T03:01:50+00:00" "time": "2024-10-06T23:10:23+00:00"
}, },
{ {
"name": "nette/utils", "name": "nette/utils",
@@ -11959,16 +11959,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.12.5", "version": "1.12.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17" "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -12013,7 +12013,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-09-26T12:45:22+00:00" "time": "2024-10-06T15:03:59+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@@ -13557,7 +13557,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
@@ -13578,6 +13578,6 @@
"ext-xml": "*", "ext-xml": "*",
"ext-xmlwriter": "*" "ext-xmlwriter": "*"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.6.0" "plugin-api-version": "2.6.0"
} }

2
config/firefly.php
View File

@@ -110,7 +110,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2024-09-30', 'version' => 'develop/2024-10-07',
'api_version' => '2.1.0', 'api_version' => '2.1.0',
'db_version' => 24, 'db_version' => 24,

18
config/mail.php
View File

@@ -35,7 +35,7 @@ return [
'default' => envNonEmpty('MAIL_MAILER', 'log'), 'default' => envNonEmpty('MAIL_MAILER', 'log'),
'mailers' => [ 'mailers' => [
'smtp' => [ 'smtp' => [
'transport' => 'smtp', 'transport' => 'smtp',
'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'), 'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
'port' => (int)env('MAIL_PORT', 2525), 'port' => (int)env('MAIL_PORT', 2525),
@@ -48,38 +48,38 @@ return [
'mailersend' => [ 'mailersend' => [
'transport' => 'mailersend', 'transport' => 'mailersend',
], ],
'ses' => [ 'ses' => [
'transport' => 'ses', 'transport' => 'ses',
], ],
'mailgun' => [ 'mailgun' => [
'transport' => 'mailgun', 'transport' => 'mailgun',
], ],
'mandrill' => [ 'mandrill' => [
'transport' => 'mandrill', 'transport' => 'mandrill',
], ],
'postmark' => [ 'postmark' => [
'transport' => 'postmark', 'transport' => 'postmark',
], ],
'sendmail' => [ 'sendmail' => [
'transport' => 'sendmail', 'transport' => 'sendmail',
'path' => envNonEmpty('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'), 'path' => envNonEmpty('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'),
], ],
'log' => [ 'log' => [
'transport' => 'log', 'transport' => 'log',
'channel' => env('MAIL_LOG_CHANNEL', 'stack'), 'channel' => env('MAIL_LOG_CHANNEL', 'stack'),
'level' => 'info', 'level' => 'info',
], ],
'null' => [ 'null' => [
'transport' => 'log', 'transport' => 'log',
'channel' => env('MAIL_LOG_CHANNEL', 'stack'), 'channel' => env('MAIL_LOG_CHANNEL', 'stack'),
'level' => 'notice', 'level' => 'notice',
], ],
'array' => [ 'array' => [
'transport' => 'array', 'transport' => 'array',
], ],
], ],

1231
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff