From c0204c810c44c73cd7700b9cc10bbc32376b84ae Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:31:05 +0100 Subject: [PATCH] Auto commit for release 'develop' on 2025-02-18 --- .../Controllers/PiggyBank/IndexController.php | 26 +++++++++---------- app/Transformers/AccountTransformer.php | 2 +- composer.lock | 12 ++++----- config/firefly.php | 2 +- package-lock.json | 6 ++--- resources/assets/v1/src/locales/uk.json | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index 872568f9a7..0275b70f15 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -82,25 +82,25 @@ class IndexController extends Controller { $this->cleanupObjectGroups(); $this->piggyRepos->resetOrder(); - $collection = $this->piggyRepos->getPiggyBanks(); + $collection = $this->piggyRepos->getPiggyBanks(); /** @var Carbon $end */ - $end = session('end', today(config('app.timezone'))->endOfMonth()); + $end = session('end', today(config('app.timezone'))->endOfMonth()); // transform piggies using the transformer: - //$parameters = new ParameterBag(); - //$parameters->set('end', $end); + // $parameters = new ParameterBag(); + // $parameters->set('end', $end); - ///** @var AccountTransformer $accountTransformer */ - //$accountTransformer = app(AccountTransformer::class); - //$accountTransformer->setParameters($parameters); + // /** @var AccountTransformer $accountTransformer */ + // $accountTransformer = app(AccountTransformer::class); + // $accountTransformer->setParameters($parameters); // data - $piggyBanks = $this->groupPiggyBanks($collection); - $accounts = $this->collectAccounts($collection); - $accounts = $this->mergeAccountsAndPiggies($piggyBanks, $accounts); - $piggyBanks = $this->makeSums($piggyBanks); + $piggyBanks = $this->groupPiggyBanks($collection); + $accounts = $this->collectAccounts($collection); + $accounts = $this->mergeAccountsAndPiggies($piggyBanks, $accounts); + $piggyBanks = $this->makeSums($piggyBanks); ksort($piggyBanks); @@ -146,7 +146,7 @@ class IndexController extends Controller $accountTransformer->setParameters($parameters); // enrich each account. - $enrichment = new AccountEnrichment(); + $enrichment = new AccountEnrichment(); $return = []; @@ -156,7 +156,7 @@ class IndexController extends Controller /** @var Account $account */ foreach ($accounts as $account) { - $account = $enrichment->enrichSingle($account); + $account = $enrichment->enrichSingle($account); $array = $accountTransformer->transform($account); $accountId = (int) $array['id']; if (!array_key_exists($accountId, $return)) { diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index e30f495c18..e536f078c6 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -62,7 +62,7 @@ class AccountTransformer extends AbstractTransformer */ public function transform(Account $account): array { - if(null === $account->meta) { + if (null === $account->meta) { $account->meta = []; } diff --git a/composer.lock b/composer.lock index 46aebb40c7..cdb239e281 100644 --- a/composer.lock +++ b/composer.lock @@ -11743,16 +11743,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.7", + "version": "11.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d" + "reference": "c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e1cb706f019e2547039ca2c839898cd5f557ee5d", - "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049", + "reference": "c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049", "shasum": "" }, "require": { @@ -11824,7 +11824,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.7" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.8" }, "funding": [ { @@ -11840,7 +11840,7 @@ "type": "tidelift" } ], - "time": "2025-02-06T16:10:05+00:00" + "time": "2025-02-18T06:26:59+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/firefly.php b/config/firefly.php index 864e452362..c5648cb96c 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -81,7 +81,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-02-17', + 'version' => 'develop/2025-02-18', 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 25, diff --git a/package-lock.json b/package-lock.json index 10e9303445..29d84889fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5677,9 +5677,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.101", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.101.tgz", - "integrity": "sha512-L0ISiQrP/56Acgu4/i/kfPwWSgrzYZUnQrC0+QPFuhqlLP1Ir7qzPPDVS9BcKIyWTRU8+o6CC8dKw38tSWhYIA==", + "version": "1.5.102", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz", + "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==", "dev": true, "license": "ISC" }, diff --git a/resources/assets/v1/src/locales/uk.json b/resources/assets/v1/src/locales/uk.json index 1b3bca3b71..fc9c1bef7c 100644 --- a/resources/assets/v1/src/locales/uk.json +++ b/resources/assets/v1/src/locales/uk.json @@ -30,7 +30,7 @@ "apply_rules_checkbox": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u043f\u0440\u0430\u0432\u0438\u043b\u0430", "fire_webhooks_checkbox": "\u041f\u043e\u0436\u0435\u0436\u043d\u0456 \u0432\u0435\u0431\u0433\u0430\u043a\u0438", "no_budget_pointer": "\u0417\u0434\u0430\u0454\u0442\u044c\u0441\u044f, \u043d\u0435 \u0441\u0442\u0432\u043e\u0440\u0438\u043b\u0438 \u0436\u043e\u0434\u043d\u043e\u0433\u043e \u0431\u044e\u0434\u0436\u0435\u0442\u0443. \u0421\u0442\u0432\u043e\u0440\u0456\u0442\u044c \u043e\u0434\u0438\u043d \u043d\u0430 \u0441\u0442\u043e\u0440\u0456\u043d\u0446\u0456 \u0431\u044e\u0434\u0436\u0435\u0442\u0456\u0432<\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u0438 \u043c\u043e\u0436\u0443\u0442\u044c \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0442\u0438 \u0432\u0430\u043c \u0441\u0442\u0435\u0436\u0438\u0442\u0438 \u0437\u0430 \u0432\u0438\u0442\u0440\u0430\u0442\u0430\u043c\u0438.", - "no_bill_pointer": "You seem to have no subscription yet. You should create some on the subscription<\/a>-page. Subscriptions can help you keep track of expenses.", + "no_bill_pointer": "\u0421\u0445\u043e\u0436\u0435, \u0443 \u0432\u0430\u0441 \u0449\u0435 \u043d\u0435\u043c\u0430\u0454 \u043f\u0456\u0434\u043f\u0438\u0441\u043a\u0438. \u0421\u0442\u0432\u043e\u0440\u0456\u0442\u044c \u0457\u0457 \u043d\u0430 \u0441\u0442\u043e\u0440\u0456\u043d\u0446\u0456 \u043f\u0456\u0434\u043f\u0438\u0441\u043e\u043a<\/a>. \u041f\u0456\u0434\u043f\u0438\u0441\u043a\u0438 \u0434\u043e\u043f\u043e\u043c\u043e\u0436\u0443\u0442\u044c \u0432\u0430\u043c \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0443\u0432\u0430\u0442\u0438 \u0432\u0438\u0442\u0440\u0430\u0442\u0438.", "source_account": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u0440\u0430\u0445\u0443\u043d\u043e\u043a", "hidden_fields_preferences": "\u0412\u0438 \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u0431\u0456\u043b\u044c\u0448\u0435 \u043e\u043f\u0446\u0456\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457 \u0443 \u0432\u0430\u0448\u043e\u043c\u0443 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f<\/a>.", "destination_account": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a \u043f\u0440\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f",