From 2852a36712a0dee600f770f395b75f8855b83b00 Mon Sep 17 00:00:00 2001 From: JC5 Date: Mon, 3 Nov 2025 04:30:12 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-11-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Account/ListController.php | 5 ++--- .../Models/AvailableBudget/ShowController.php | 6 +++--- .../Controllers/Models/Bill/ListController.php | 5 ++--- .../Controllers/Models/Bill/ShowController.php | 1 - app/Api/V1/Requests/AggregateFormRequest.php | 1 - .../Autocomplete/AutocompleteApiRequest.php | 1 - .../Requests/Generic/ObjectTypeApiRequest.php | 9 ++++++++- .../Generic/PaginationDateRangeRequest.php | 2 ++ app/Factory/CategoryFactory.php | 1 + app/Factory/PiggyBankFactory.php | 1 + app/Handlers/Events/AdminEventHandler.php | 1 - app/Handlers/Events/UserEventHandler.php | 1 - app/Handlers/Observer/AccountObserver.php | 1 - app/Handlers/Observer/BillObserver.php | 1 - app/Handlers/Observer/PiggyBankObserver.php | 1 - .../Observer/WebhookMessageObserver.php | 1 + app/Handlers/Observer/WebhookObserver.php | 1 + .../Extensions/AttachmentCollection.php | 1 + app/Helpers/Webhook/Sha3SignatureGenerator.php | 2 +- app/Models/BudgetLimit.php | 2 +- app/Rules/IsAllowedGroupAction.php | 8 ++++---- .../IsValidTransactionTypeList.php | 2 +- app/Support/Http/Api/TransactionFilter.php | 2 +- .../Http/Api/ValidatesUserGroupTrait.php | 1 - config/firefly.php | 4 ++-- package-lock.json | 18 +++++++++--------- 26 files changed, 41 insertions(+), 38 deletions(-) diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php index 3acdfbc6cf..5cf90ff2e6 100644 --- a/app/Api/V1/Controllers/Models/Account/ListController.php +++ b/app/Api/V1/Controllers/Models/Account/ListController.php @@ -38,7 +38,6 @@ use FireflyIII\Transformers\PiggyBankTransformer; use FireflyIII\Transformers\TransactionGroupTransformer; use FireflyIII\User; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use League\Fractal\Pagination\IlluminatePaginatorAdapter; @@ -144,8 +143,8 @@ class ListController extends Controller 'page' => $page, 'start' => $start, 'end' => $end, - 'types' => $types, - ] = $request->attributes->all(); + 'types' => $types, + ] = $request->attributes->all(); $manager = $this->getManager(); /** @var User $admin */ diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php index 624199c9fa..c621d3fbab 100644 --- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php +++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php @@ -75,9 +75,9 @@ class ShowController extends Controller 'limit' => $limit, 'offset' => $offset, 'page' => $page, - 'start' => $start, - 'end' => $end, - ] = $request->attributes->all(); + 'start' => $start, + 'end' => $end, + ] = $request->attributes->all(); // get list of available budgets. Count it and split it. $collection = $this->abRepository->getAvailableBudgetsByDate($start, $end); diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php index f3867841fc..7face940cf 100644 --- a/app/Api/V1/Controllers/Models/Bill/ListController.php +++ b/app/Api/V1/Controllers/Models/Bill/ListController.php @@ -37,7 +37,6 @@ use FireflyIII\Transformers\RuleTransformer; use FireflyIII\Transformers\TransactionGroupTransformer; use FireflyIII\User; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection as FractalCollection; @@ -141,10 +140,10 @@ class ListController extends Controller [ 'limit' => $limit, 'page' => $page, - 'types' => $types, + 'types' => $types, 'start' => $start, 'end' => $end, - ] = $request->attributes->all(); + ] = $request->attributes->all(); $manager = $this->getManager(); diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.php index cdcb67cf9a..873c8c8d4e 100644 --- a/app/Api/V1/Controllers/Models/Bill/ShowController.php +++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php @@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Bill; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\DateRangeRequest; use FireflyIII\Api\V1\Requests\Generic\PaginationDateRangeRequest; -use FireflyIII\Api\V1\Requests\PaginationRequest; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment; diff --git a/app/Api/V1/Requests/AggregateFormRequest.php b/app/Api/V1/Requests/AggregateFormRequest.php index eda707b798..59d0bf456d 100644 --- a/app/Api/V1/Requests/AggregateFormRequest.php +++ b/app/Api/V1/Requests/AggregateFormRequest.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; -use FireflyIII\Exceptions\FireflyException; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php index 7c0c3f40ac..448d4eb895 100644 --- a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php +++ b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php @@ -27,7 +27,6 @@ use FireflyIII\Api\V1\Requests\AggregateFormRequest; use FireflyIII\Api\V1\Requests\DateRequest; use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest; use FireflyIII\Api\V1\Requests\Generic\QueryRequest; -use FireflyIII\Api\V1\Requests\Models\Account\AccountTypesApiRequest; use FireflyIII\Api\V1\Requests\PaginationRequest; use FireflyIII\Models\Account; use Override; diff --git a/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php b/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php index cdc1837438..7fb642d72d 100644 --- a/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php +++ b/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php @@ -53,7 +53,7 @@ class ObjectTypeApiRequest extends ApiRequest public function rules(): array { - $rule = null; + $rule = null; if (Account::class === $this->objectType) { $rule = new IsValidAccountTypeList(); } @@ -66,6 +66,7 @@ class ObjectTypeApiRequest extends ApiRequest if ('' !== $this->required) { $rules['types'][] = $this->required; } + return $rules; } @@ -78,14 +79,20 @@ class ObjectTypeApiRequest extends ApiRequest } $type = $this->convertString('types', 'all'); $this->attributes->set('type', $type); + switch ($this->objectType) { default: $this->attributes->set('types', []); + + // no break case Account::class: $this->attributes->set('types', $this->mapAccountTypes($type)); + break; + case Transaction::class: $this->attributes->set('types', $this->mapTransactionTypes($type)); + break; } } diff --git a/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php b/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php index ed7e2cdd94..21a50f15fb 100644 --- a/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php +++ b/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php @@ -1,4 +1,6 @@ validateUserGroup((int)$value, $fail); } - private function validateUserGroup(int $userGroupId, Closure $fail): void { try { @@ -80,7 +79,8 @@ class IsAllowedGroupAction implements ValidationRule } catch (FireflyException $e) { Log::error($e->getTraceAsString()); } - die('here we are'); + + exit('here we are'); Log::debug(sprintf('validateUserGroup: %s', static::class)); if (!auth()->check()) { Log::debug('validateUserGroup: user is not logged in, return NULL.'); @@ -90,7 +90,7 @@ class IsAllowedGroupAction implements ValidationRule } /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); if (0 !== $userGroupId) { Log::debug(sprintf('validateUserGroup: user group submitted, search for memberships in group #%d.', $userGroupId)); } @@ -110,7 +110,7 @@ class IsAllowedGroupAction implements ValidationRule } // need to get the group from the membership: - $userGroup = $this->repository->getById($userGroupId); + $userGroup = $this->repository->getById($userGroupId); if (null === $userGroup) { Log::debug(sprintf('validateUserGroup: group #%d does not exist.', $userGroupId)); $fail('validation.belongs_user_or_user_group')->translate(); diff --git a/app/Rules/TransactionType/IsValidTransactionTypeList.php b/app/Rules/TransactionType/IsValidTransactionTypeList.php index 4f27b57f00..f0c68e2af5 100644 --- a/app/Rules/TransactionType/IsValidTransactionTypeList.php +++ b/app/Rules/TransactionType/IsValidTransactionTypeList.php @@ -45,7 +45,7 @@ class IsValidTransactionTypeList implements ValidationRule if (!is_array($values)) { $fail('validation.invalid_transaction_type_list')->translate(); } - $keys = array_keys($this->transactionTypes); + $keys = array_keys($this->transactionTypes); foreach ($values as $entry) { $entry = (string)$entry; if (!in_array($entry, $keys, true)) { diff --git a/app/Support/Http/Api/TransactionFilter.php b/app/Support/Http/Api/TransactionFilter.php index 74b8090468..45734abf75 100644 --- a/app/Support/Http/Api/TransactionFilter.php +++ b/app/Support/Http/Api/TransactionFilter.php @@ -70,7 +70,7 @@ trait TransactionFilter $return = []; $parts = explode(',', $type); foreach ($parts as $part) { - if(array_key_exists($part, $this->transactionTypes)) { + if (array_key_exists($part, $this->transactionTypes)) { $return = array_merge($return, $this->transactionTypes[$part]); } } diff --git a/app/Support/Http/Api/ValidatesUserGroupTrait.php b/app/Support/Http/Api/ValidatesUserGroupTrait.php index 2c9db16cb3..3d17a7b42c 100644 --- a/app/Support/Http/Api/ValidatesUserGroupTrait.php +++ b/app/Support/Http/Api/ValidatesUserGroupTrait.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; use FireflyIII\Enums\UserRoleEnum; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; use FireflyIII\User; diff --git a/config/firefly.php b/config/firefly.php index 634cf70045..68a8862a38 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-11-02', - 'build_time' => 1762056298, + 'version' => 'develop/2025-11-03', + 'build_time' => 1762140500, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used. diff --git a/package-lock.json b/package-lock.json index e7e72c82ed..d93e5609f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3173,9 +3173,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz", - "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==", + "version": "24.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz", + "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==", "dev": true, "license": "MIT", "dependencies": { @@ -4521,9 +4521,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001752", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001752.tgz", - "integrity": "sha512-vKUk7beoukxE47P5gcVNKkDRzXdVofotshHwfR9vmpeFKxmI5PBpgOMC18LUJUA/DvJ70Y7RveasIBraqsyO/g==", + "version": "1.0.30001753", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz", + "integrity": "sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==", "dev": true, "funding": [ { @@ -5820,9 +5820,9 @@ } }, "node_modules/envinfo": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.19.0.tgz", - "integrity": "sha512-DoSM9VyG6O3vqBf+p3Gjgr/Q52HYBBtO3v+4koAxt1MnWr+zEnxE+nke/yXS4lt2P4SYCHQ4V3f1i88LQVOpAw==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.20.0.tgz", + "integrity": "sha512-+zUomDcLXsVkQ37vUqWBvQwLaLlj8eZPSi61llaEFAVBY5mhcXdaSw1pSJVl4yTYD5g/gEfpNl28YYk4IPvrrg==", "dev": true, "license": "MIT", "bin": {