IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-06-15

Browse Source
This commit is contained in:
github-actions 2024-06-15 16:16:40 +02:00
parent 6abb74a038
commit a1a8968e98
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,16 +398,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.58.1", "version": "v3.59.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "04e9424025677a86914b9a4944dbbf4060bb0aff" "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff", "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/756fa7852c2e961cba4ea39e3e510e1c020f2123",
"reference": "04e9424025677a86914b9a4944dbbf4060bb0aff", "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -486,7 +486,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.1" "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.1"
}, },
"funding": [ "funding": [
{ {
@ -494,7 +494,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-05-29T16:39:07+00:00" "time": "2024-06-15T12:19:07+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",

2
app/Api/V1/Requests/Models/Attachment/StoreRequest.php
View File

@ -58,7 +58,7 @@ class StoreRequest extends FormRequest
$models = config('firefly.valid_attachment_models'); $models = config('firefly.valid_attachment_models');
$models = array_map( $models = array_map(
static function (string $className) { static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className); return str_replace('FireflyIII\Models\\', '', $className);
}, },
$models $models
); );

2
app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
View File

@ -60,7 +60,7 @@ class UpdateRequest extends FormRequest
$models = config('firefly.valid_attachment_models'); $models = config('firefly.valid_attachment_models');
$models = array_map( $models = array_map(
static function (string $className) { static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className); return str_replace('FireflyIII\Models\\', '', $className);
}, },
$models $models
); );

2
app/Console/Commands/Integrity/UpdateGroupInformation.php
View File

@ -115,7 +115,7 @@ class UpdateGroupInformation extends Command
return; return;
} }
if (0 !== $result) { if (0 !== $result) {
$this->friendlyPositive(sprintf('User #%d: Moved %d %s objects to the correct group.', $user->id, $result, str_replace('FireflyIII\\Models\\', '', $className))); $this->friendlyPositive(sprintf('User #%d: Moved %d %s objects to the correct group.', $user->id, $result, str_replace('FireflyIII\Models\\', '', $className)));
} }
} }
} }

4
app/Console/Commands/System/ForceDecimalSize.php
View File

@ -111,7 +111,7 @@ class ForceDecimalSize extends Command
{ {
// switch stuff based on database connection: // switch stuff based on database connection:
$this->operator = 'REGEXP'; $this->operator = 'REGEXP';
$this->regularExpression = '\'\\\\.[\\\\d]{%d}[1-9]+\''; $this->regularExpression = '\'\\\.[\\\d]{%d}[1-9]+\'';
$this->cast = 'CHAR'; $this->cast = 'CHAR';
if ('pgsql' === config('database.default')) { if ('pgsql' === config('database.default')) {
$this->operator = 'SIMILAR TO'; $this->operator = 'SIMILAR TO';
@ -119,7 +119,7 @@ class ForceDecimalSize extends Command
$this->cast = 'TEXT'; $this->cast = 'TEXT';
} }
if ('sqlite' === config('database.default')) { if ('sqlite' === config('database.default')) {
$this->regularExpression = '"\\.[\d]{%d}[1-9]+"'; $this->regularExpression = '"\.[\d]{%d}[1-9]+"';
} }
} }

2
app/Factory/AttachmentFactory.php
View File

@ -43,7 +43,7 @@ class AttachmentFactory
public function create(array $data): ?Attachment public function create(array $data): ?Attachment
{ {
// append if necessary. // append if necessary.
$model = !str_contains($data['attachable_type'], 'FireflyIII') ? sprintf('FireflyIII\\Models\\%s', $data['attachable_type']) $model = !str_contains($data['attachable_type'], 'FireflyIII') ? sprintf('FireflyIII\Models\%s', $data['attachable_type'])
: $data['attachable_type']; : $data['attachable_type'];
// get journal instead of transaction. // get journal instead of transaction.

2
app/Repositories/Attachment/AttachmentRepository.php
View File

@ -146,7 +146,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
// should be validated already: // should be validated already:
if (array_key_exists('attachable_type', $data) && array_key_exists('attachable_id', $data)) { if (array_key_exists('attachable_type', $data) && array_key_exists('attachable_id', $data)) {
$attachment->attachable_id = (int)$data['attachable_id']; $attachment->attachable_id = (int)$data['attachable_id'];
$attachment->attachable_type = sprintf('FireflyIII\\Models\\%s', $data['attachable_type']); $attachment->attachable_type = sprintf('FireflyIII\Models\%s', $data['attachable_type']);
} }
$attachment->save(); $attachment->save();

2
app/Transformers/AttachmentTransformer.php
View File

@ -53,7 +53,7 @@ class AttachmentTransformer extends AbstractTransformer
'created_at' => $attachment->created_at->toAtomString(), 'created_at' => $attachment->created_at->toAtomString(),
'updated_at' => $attachment->updated_at->toAtomString(), 'updated_at' => $attachment->updated_at->toAtomString(),
'attachable_id' => (string)$attachment->attachable_id, 'attachable_id' => (string)$attachment->attachable_id,
'attachable_type' => str_replace('FireflyIII\\Models\\', '', $attachment->attachable_type), 'attachable_type' => str_replace('FireflyIII\Models\\', '', $attachment->attachable_type),
'md5' => $attachment->md5, 'md5' => $attachment->md5,
'filename' => $attachment->filename, 'filename' => $attachment->filename,
'download_url' => route('api.v1.attachments.download', [$attachment->id]), 'download_url' => route('api.v1.attachments.download', [$attachment->id]),

2
config/firefly.php
View File

@ -117,7 +117,7 @@ return [
'expression_engine' => false, 'expression_engine' => false,
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.1.17', 'version' => 'develop/2024-06-15',
'api_version' => '2.1.0', 'api_version' => '2.1.0',
'db_version' => 24, 'db_version' => 24,