From a1a8968e98749a7c2b69b9f568fbdc2f97a1b6ca Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:16:40 +0200 Subject: [PATCH] Auto commit for release 'develop' on 2024-06-15 --- .ci/php-cs-fixer/composer.lock | 12 ++++++------ .../V1/Requests/Models/Attachment/StoreRequest.php | 2 +- .../V1/Requests/Models/Attachment/UpdateRequest.php | 2 +- .../Commands/Integrity/UpdateGroupInformation.php | 2 +- app/Console/Commands/System/ForceDecimalSize.php | 4 ++-- app/Factory/AttachmentFactory.php | 2 +- app/Repositories/Attachment/AttachmentRepository.php | 2 +- app/Transformers/AttachmentTransformer.php | 2 +- config/firefly.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci/php-cs-fixer/composer.lock b/.ci/php-cs-fixer/composer.lock index 651e8a1aef..6a2ddf72dc 100644 --- a/.ci/php-cs-fixer/composer.lock +++ b/.ci/php-cs-fixer/composer.lock @@ -398,16 +398,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.58.1", + "version": "v3.59.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff" + "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff", - "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/756fa7852c2e961cba4ea39e3e510e1c020f2123", + "reference": "756fa7852c2e961cba4ea39e3e510e1c020f2123", "shasum": "" }, "require": { @@ -486,7 +486,7 @@ ], "support": { "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": [ { @@ -494,7 +494,7 @@ "type": "github" } ], - "time": "2024-05-29T16:39:07+00:00" + "time": "2024-06-15T12:19:07+00:00" }, { "name": "psr/container", diff --git a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php index 174cd2f543..649cf8dea0 100644 --- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php @@ -58,7 +58,7 @@ class StoreRequest extends FormRequest $models = config('firefly.valid_attachment_models'); $models = array_map( static function (string $className) { - return str_replace('FireflyIII\\Models\\', '', $className); + return str_replace('FireflyIII\Models\\', '', $className); }, $models ); diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php index 0ec07affd5..1fd804ca0a 100644 --- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php @@ -60,7 +60,7 @@ class UpdateRequest extends FormRequest $models = config('firefly.valid_attachment_models'); $models = array_map( static function (string $className) { - return str_replace('FireflyIII\\Models\\', '', $className); + return str_replace('FireflyIII\Models\\', '', $className); }, $models ); diff --git a/app/Console/Commands/Integrity/UpdateGroupInformation.php b/app/Console/Commands/Integrity/UpdateGroupInformation.php index e3e8c5eaef..57df0f52a6 100644 --- a/app/Console/Commands/Integrity/UpdateGroupInformation.php +++ b/app/Console/Commands/Integrity/UpdateGroupInformation.php @@ -115,7 +115,7 @@ class UpdateGroupInformation extends Command return; } 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))); } } } diff --git a/app/Console/Commands/System/ForceDecimalSize.php b/app/Console/Commands/System/ForceDecimalSize.php index 6fc97cde7f..1bd0aa5a0a 100644 --- a/app/Console/Commands/System/ForceDecimalSize.php +++ b/app/Console/Commands/System/ForceDecimalSize.php @@ -111,7 +111,7 @@ class ForceDecimalSize extends Command { // switch stuff based on database connection: $this->operator = 'REGEXP'; - $this->regularExpression = '\'\\\\.[\\\\d]{%d}[1-9]+\''; + $this->regularExpression = '\'\\\.[\\\d]{%d}[1-9]+\''; $this->cast = 'CHAR'; if ('pgsql' === config('database.default')) { $this->operator = 'SIMILAR TO'; @@ -119,7 +119,7 @@ class ForceDecimalSize extends Command $this->cast = 'TEXT'; } if ('sqlite' === config('database.default')) { - $this->regularExpression = '"\\.[\d]{%d}[1-9]+"'; + $this->regularExpression = '"\.[\d]{%d}[1-9]+"'; } } diff --git a/app/Factory/AttachmentFactory.php b/app/Factory/AttachmentFactory.php index 75b60e8738..a9e58eccf3 100644 --- a/app/Factory/AttachmentFactory.php +++ b/app/Factory/AttachmentFactory.php @@ -43,7 +43,7 @@ class AttachmentFactory public function create(array $data): ?Attachment { // 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']; // get journal instead of transaction. diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 98d0af2961..e9e69d1f1d 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -146,7 +146,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface // should be validated already: if (array_key_exists('attachable_type', $data) && array_key_exists('attachable_id', $data)) { $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(); diff --git a/app/Transformers/AttachmentTransformer.php b/app/Transformers/AttachmentTransformer.php index e8b162bcd1..3ae2d84f49 100644 --- a/app/Transformers/AttachmentTransformer.php +++ b/app/Transformers/AttachmentTransformer.php @@ -53,7 +53,7 @@ class AttachmentTransformer extends AbstractTransformer 'created_at' => $attachment->created_at->toAtomString(), 'updated_at' => $attachment->updated_at->toAtomString(), '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, 'filename' => $attachment->filename, 'download_url' => route('api.v1.attachments.download', [$attachment->id]), diff --git a/config/firefly.php b/config/firefly.php index 93879b2a69..1074d6623c 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -117,7 +117,7 @@ return [ 'expression_engine' => false, // see cer.php for exchange rates feature flag. ], - 'version' => '6.1.17', + 'version' => 'develop/2024-06-15', 'api_version' => '2.1.0', 'db_version' => 24,