Auto commit for release 'develop' on 2025-01-03

2025-02-25 18:45:27 -06:00 · 2025-01-03 07:01:02 +01:00 · 2025-01-03 07:01:02 +01:00 · 58e2ef187d
commit 58e2ef187d
parent e878d5ce07
7 changed files with 52 additions and 45 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@ -734,33 +734,33 @@
        },
        {
            "name": "react/child-process",
-            "version": "v0.6.5",
+            "version": "v0.6.6",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/child-process.git",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
                "shasum": ""
            },
            "require": {
                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                "php": ">=5.3.0",
                "react/event-loop": "^1.2",
-                "react/stream": "^1.2"
+                "react/stream": "^1.4"
            },
            "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-                "react/socket": "^1.8",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "React\\ChildProcess\\": "src"
+                    "React\\ChildProcess\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -797,19 +797,15 @@
            ],
            "support": {
                "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
            },
            "funding": [
                {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                }
            ],
-            "time": "2022-09-16T13:41:56+00:00"
+            "time": "2025-01-01T16:37:48+00:00"
        },
        {
            "name": "react/dns",
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@ -154,22 +154,22 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface

        /** @var Transaction $destination */
        $destination     = $journal->transactions()->with(['account'])->where('amount', '>', 0)->first();
-        $hits = 0;
-        foreach($piggyBank->accounts as $account) {
+        $hits            = 0;
+        foreach ($piggyBank->accounts as $account) {

            // matches source, which means amount will be removed from piggy:
-            if($account->id === $source->account_id) {
+            if ($account->id === $source->account_id) {
                $operator = 'negative';
                $currency = $accountRepos->getAccountCurrency($source->account) ?? $defaultCurrency;
                app('log')->debug(sprintf('Currency will draw money out of piggy bank. Source currency is %s', $currency->code));
-                $hits++;
+                ++$hits;
            }
            // matches destination, which means amount will be added to piggy.
            if ($account->id === $destination->account_id) {
                $operator = 'positive';
                $currency = $accountRepos->getAccountCurrency($destination->account) ?? $defaultCurrency;
                app('log')->debug(sprintf('Currency will add money to piggy bank. Destination currency is %s', $currency->code));
-                $hits++;
+                ++$hits;
            }
        }
        if ($hits > 1) {
--- a/app/Rules/BelongsUser.php
+++ b/app/Rules/BelongsUser.php
@ -84,8 +84,7 @@ class BelongsUser implements ValidationRule



-        $count = PiggyBank
-            ::leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id','=','piggy_banks.id')
+        $count = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
            ->where('piggy_banks.id', '=', $value)
            ->where('accounts.user_id', '=', auth()->user()->id)->count()
@ -96,14 +95,13 @@ class BelongsUser implements ValidationRule

    private function validatePiggyBankName(string $value): bool
    {
-        $count = PiggyBank
-            ::leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id','=','piggy_banks.id')
+        $count = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
            ->where('piggy_banks.name', '=', $value)
            ->where('accounts.user_id', '=', auth()->user()->id)->count()
        ;

-        return $count>0;
+        return $count > 0;
    }

    protected function countField(string $class, string $field, string $value): int
--- a/composer.lock
+++ b/composer.lock
@ -1874,16 +1874,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.36.1",
+            "version": "v11.37.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "df06f5163f4550641fdf349ebc04916a61135a64"
+                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
-                "reference": "df06f5163f4550641fdf349ebc04916a61135a64",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
+                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
                "shasum": ""
            },
            "require": {
@ -1933,7 +1933,6 @@
                "voku/portable-ascii": "^2.0.2"
            },
            "conflict": {
-                "mockery/mockery": "1.6.8",
                "tightenco/collect": "<5.5.33"
            },
            "provide": {
@ -2085,7 +2084,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-12-17T22:32:08+00:00"
+            "time": "2025-01-02T20:10:21+00:00"
        },
        {
            "name": "laravel/passport",
--- 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-01-01',
+    'version'                      => 'develop/2025-01-03',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@ -3133,9 +3133,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.10.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.3.tgz",
-            "integrity": "sha512-DifAyw4BkrufCILvD3ucnuN8eydUfc/C1GlyrnI+LK6543w5/L3VeVgf05o3B4fqSXP1dKYLOZsKfutpxPzZrw==",
+            "version": "22.10.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.4.tgz",
+            "integrity": "sha512-99l6wv4HEzBQhvaU/UGoeBoCK61SCROQaCCGyQSgX2tEQ3rKkNZ2S7CEWnS/4s1LV+8ODdK21UeyR1fHP2mXug==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@ -6450,22 +6450,22 @@
            }
        },
        "node_modules/get-intrinsic": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
-            "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+            "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "call-bind-apply-helpers": "^1.0.1",
-                "dunder-proto": "^1.0.0",
                "es-define-property": "^1.0.1",
                "es-errors": "^1.3.0",
                "es-object-atoms": "^1.0.0",
                "function-bind": "^1.1.2",
+                "get-proto": "^1.0.0",
                "gopd": "^1.2.0",
                "has-symbols": "^1.1.0",
                "hasown": "^2.0.2",
-                "math-intrinsics": "^1.0.0"
+                "math-intrinsics": "^1.1.0"
            },
            "engines": {
                "node": ">= 0.4"
@ -6474,6 +6474,20 @@
                "url": "https://github.com/sponsors/ljharb"
            }
        },
+        "node_modules/get-proto": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dunder-proto": "^1.0.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
        "node_modules/get-stream": {
            "version": "6.0.1",
            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@ -11273,9 +11287,9 @@
            }
        },
        "node_modules/vite": {
-            "version": "6.0.6",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz",
-            "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==",
+            "version": "6.0.7",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
+            "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/resources/assets/v1/src/locales/fi.json
+++ b/resources/assets/v1/src/locales/fi.json
@ -101,7 +101,7 @@
        "webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
        "webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
        "webhook_response_TRANSACTIONS": "Transaction details",
-        "webhook_response_ACCOUNTS": "Account details",
+        "webhook_response_ACCOUNTS": "Tilin tiedot",
        "webhook_response_none_NONE": "No details",
        "webhook_delivery_JSON": "JSON",
        "actions": "Toiminnot",