Merge pull request #11340 from firefly-iii/release-1765124558

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-12-07
2025-12-10 13:21:21 +00:00 · 2025-12-07 17:22:47 +01:00 · 2025-12-07 17:22:38 +01:00 · 2025-12-07 16:47:04 +01:00
9 changed files with 96 additions and 79 deletions
--- a/app/Console/Commands/Integrity/ValidatesFilePermissions.php
+++ b/app/Console/Commands/Integrity/ValidatesFilePermissions.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
 * ValidatesFilePermissions.php
 * Copyright (c) 2025 james@firefly-iii.org
@@ -33,7 +35,7 @@ class ValidatesFilePermissions extends Command
     *
     * @var string
     */
-    protected $signature = 'integrity:file-permissions';
+    protected $signature   = 'integrity:file-permissions';

    /**
     * The console command description.
@@ -48,12 +50,14 @@ class ValidatesFilePermissions extends Command
    public function handle(): int
    {
        $directories = [storage_path('upload')];
-        $errors = false;
+        $errors      = false;
+
        /** @var string $directory */
        foreach ($directories as $directory) {
            if (!is_dir($directory)) {
                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $uploadDir));
                $errors = true;
+
                continue;
            }
            if (!is_writable($directory)) {
@@ -61,7 +65,7 @@ class ValidatesFilePermissions extends Command
                $errors = true;
            }
        }
-        if(false === $errors) {
+        if (false === $errors) {
            $this->friendlyInfo('All necessary file paths seem to exist, and are writeable.');
        }

--- a/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php
+++ b/app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
 * TriggeredStoredTransactionGroup.php
 * Copyright (c) 2025 james@firefly-iii.org
--- a/app/Handlers/Events/StoredGroupEventHandler.php
+++ b/app/Handlers/Events/StoredGroupEventHandler.php
@@ -70,14 +70,14 @@ class StoredGroupEventHandler
        }
        Log::debug('Now in StoredGroupEventHandler::processRules()');

-        $journals = $storedGroupEvent->transactionGroup->transactionJournals;
-        $array    = [];
+        $journals            = $storedGroupEvent->transactionGroup->transactionJournals;
+        $array               = [];

        /** @var TransactionJournal $journal */
        foreach ($journals as $journal) {
            $array[] = $journal->id;
        }
-        $journalIds = implode(',', $array);
+        $journalIds          = implode(',', $array);
        Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));

        // collect rules:
@@ -86,10 +86,10 @@ class StoredGroupEventHandler

        // add the groups to the rule engine.
        // it should run the rules in the group and cancel the group if necessary.
-        $groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');
+        $groups              = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');

        // create and fire rule engine.
-        $newRuleEngine = app(RuleEngineInterface::class);
+        $newRuleEngine       = app(RuleEngineInterface::class);
        $newRuleEngine->setUser($storedGroupEvent->transactionGroup->user);
        $newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalIds]);
        $newRuleEngine->setRuleGroups($groups);
@@ -98,7 +98,7 @@ class StoredGroupEventHandler

    private function recalculateCredit(StoredTransactionGroup $event): void
    {
-        $group = $event->transactionGroup;
+        $group  = $event->transactionGroup;

        /** @var CreditRecalculateService $object */
        $object = app(CreditRecalculateService::class);
@@ -114,10 +114,10 @@ class StoredGroupEventHandler
        /** @var TransactionJournal $journal */
        foreach ($event->transactionGroup->transactionJournals as $journal) {
            /** @var null|Transaction $source */
-            $source = $journal->transactions()->where('amount', '<', '0')->first();
+            $source     = $journal->transactions()->where('amount', '<', '0')->first();

            /** @var null|Transaction $dest */
-            $dest = $journal->transactions()->where('amount', '>', '0')->first();
+            $dest       = $journal->transactions()->where('amount', '>', '0')->first();

            if (null !== $source) {
                $repository->deleteStatisticsForModel($source->account, $journal->date);
@@ -152,14 +152,14 @@ class StoredGroupEventHandler
    private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
    {
        Log::debug(__METHOD__);
-        $group = $storedGroupEvent->transactionGroup;
+        $group  = $storedGroupEvent->transactionGroup;
        if (false === $storedGroupEvent->fireWebhooks) {
            Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));

            return;
        }

-        $user = $group->user;
+        $user   = $group->user;

        /** @var MessageGeneratorInterface $engine */
        $engine = app(MessageGeneratorInterface::class);
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -71,8 +71,9 @@ class ExecutionController extends Controller
    public function execute(SelectTransactionsRequest $request, RuleGroup $ruleGroup): RedirectResponse
    {
        // Get parameters specified by the user
-        $accounts = $request->get('accounts');
-        $set      = $this->repository->getAccountsById($accounts);
+        $accounts  = $request->get('accounts');
+        $set       = $this->repository->getAccountsById($accounts);
+
        /** @var GroupCollectorInterface $collector */
        $collector = app(GroupCollectorInterface::class);
        $collector->setAccounts($set);
@@ -85,12 +86,13 @@ class ExecutionController extends Controller
            $endDate = new Carbon($request->get('end'));
            $collector->setEnd($endDate);
        }
-        $final = $collector->getGroups();
-        $ids   = $final->pluck('id')->toArray();
+        $final     = $collector->getGroups();
+        $ids       = $final->pluck('id')->toArray();
        Log::debug(sprintf('Found %d groups collected from %d account(s)', $final->count(), $set->count()));
        foreach (array_chunk($ids, 1337) as $setOfIds) {
            Log::debug(sprintf('Now processing %d groups', count($setOfIds)));
            $groups = TransactionGroup::whereIn('id', $setOfIds)->get();
+
            /** @var TransactionGroup $group */
            foreach ($groups as $group) {
                Log::debug(sprintf('Processing group #%d.', $group->id));
@@ -109,7 +111,7 @@ class ExecutionController extends Controller
     *
     * @return Factory|View
     */
-    public function selectTransactions(RuleGroup $ruleGroup): Factory | \Illuminate\Contracts\View\View
+    public function selectTransactions(RuleGroup $ruleGroup): Factory|\Illuminate\Contracts\View\View
    {
        $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);

--- a/app/Services/Internal/Update/GroupUpdateService.php
+++ b/app/Services/Internal/Update/GroupUpdateService.php
@@ -78,9 +78,7 @@ class GroupUpdateService
        if (1 === count($transactions) && 1 === $transactionGroup->transactionJournals()->count()) {
            /** @var TransactionJournal $first */
            $first = $transactionGroup->transactionJournals()->first();
-            Log::debug(
-                sprintf('Will now update journal #%d (only journal in group #%d)', $first->id, $transactionGroup->id)
-            );
+            Log::debug(sprintf('Will now update journal #%d (only journal in group #%d)', $first->id, $transactionGroup->id));
            $this->updateTransactionJournal($transactionGroup, $first, reset($transactions));
            $transactionGroup->touch();
            $transactionGroup->refresh();
--- a/app/Services/Internal/Update/JournalUpdateService.php
+++ b/app/Services/Internal/Update/JournalUpdateService.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Services\Internal\Update;

-use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
@@ -47,6 +46,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
 use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Validation\AccountValidator;
 use Illuminate\Support\Facades\Log;
@@ -60,34 +60,36 @@ class JournalUpdateService
 {
    use JournalServiceTrait;

-    private BillRepositoryInterface $billRepository;
-    private CurrencyRepositoryInterface $currencyRepository;
+    private BillRepositoryInterface             $billRepository;
+    private CurrencyRepositoryInterface         $currencyRepository;
    private TransactionGroupRepositoryInterface $transactionGroupRepository;
-    private array $data;
-    private ?Account $destinationAccount            = null;
-    private ?Transaction $destinationTransaction    = null;
-    private array $metaDate                         = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date',
-        'invoice_date', ];
-    private array $metaString                       = [
-        'sepa_cc',
-        'sepa_ct_op',
-        'sepa_ct_id',
-        'sepa_db',
-        'sepa_country',
-        'sepa_ep',
-        'sepa_ci',
-        'sepa_batch_id',
-        'recurrence_id',
-        'internal_reference',
-        'bunq_payment_id',
-        'external_id',
-        'external_url',
-    ];
-    private ?Account $sourceAccount                 = null;
-    private ?Transaction $sourceTransaction         = null;
-    private ?TransactionGroup $transactionGroup     = null;
-    private ?TransactionJournal $transactionJournal = null;
-    private string $startCompareHash                = '';
+    private array                               $data;
+    private ?Account                            $destinationAccount     = null;
+    private ?Transaction                        $destinationTransaction = null;
+    private array                               $metaDate
+                                                                        = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date',
+            'invoice_date', ];
+    private array                               $metaString
+                                                                        = [
+            'sepa_cc',
+            'sepa_ct_op',
+            'sepa_ct_id',
+            'sepa_db',
+            'sepa_country',
+            'sepa_ep',
+            'sepa_ci',
+            'sepa_batch_id',
+            'recurrence_id',
+            'internal_reference',
+            'bunq_payment_id',
+            'external_id',
+            'external_url',
+        ];
+    private ?Account                            $sourceAccount          = null;
+    private ?Transaction                        $sourceTransaction      = null;
+    private ?TransactionGroup                   $transactionGroup       = null;
+    private ?TransactionJournal                 $transactionJournal     = null;
+    private string                              $startCompareHash       = '';

    /**
     * JournalUpdateService constructor.
@@ -492,15 +494,7 @@ class JournalUpdateService
                Log::debug(sprintf('Create date value from string "%s".', $value));
                $this->transactionJournal->date_tz = $value->format('e');
            }
-            event(
-                new TriggeredAuditLog(
-                    $this->transactionJournal->user,
-                    $this->transactionJournal,
-                    sprintf('update_%s', $fieldName),
-                    $this->transactionJournal->{$fieldName}, // @phpstan-ignore-line
-                    $value
-                )
-            );
+            event(new TriggeredAuditLog($this->transactionJournal->user, $this->transactionJournal, sprintf('update_%s', $fieldName), $this->transactionJournal->{$fieldName}, $value));

            $this->transactionJournal->{$fieldName} = $value; // @phpstan-ignore-line
            Log::debug(sprintf('Updated %s', $fieldName));
@@ -671,6 +665,7 @@ class JournalUpdateService
        $origSourceTransaction->balance_dirty = true;
        $origSourceTransaction->save();
        $destTransaction                      = $this->getDestinationTransaction();
+        $originalAmount                       = $destTransaction->amount;
        $destTransaction->amount              = app('steam')->positive($amount);
        $destTransaction->balance_dirty       = true;
        $destTransaction->save();
@@ -678,6 +673,23 @@ class JournalUpdateService
        $this->sourceTransaction->refresh();
        $this->destinationTransaction->refresh();
        Log::debug(sprintf('Updated amount to "%s"', $amount));
+
+        event(new TriggeredAuditLog(
+            $this->transactionGroup->user,
+            $this->transactionGroup,
+            'update_amount',
+            [
+                'currency_symbol' => $destTransaction->transactionCurrency->symbol,
+                'decimal_places'  => $destTransaction->transactionCurrency->decimal_places,
+                'amount'          => $originalAmount,
+            ],
+            [
+                'currency_symbol' => $destTransaction->transactionCurrency->symbol,
+                'decimal_places'  => $destTransaction->transactionCurrency->decimal_places,
+                'amount'          => $value,
+            ]
+        ));
+
    }

    private function updateForeignAmount(): void
@@ -697,7 +709,7 @@ class JournalUpdateService
        $newForeignId    = $this->data['foreign_currency_id'] ?? null;
        $newForeignCode  = $this->data['foreign_currency_code'] ?? null;
        $foreignCurrency = $this->currencyRepository->findCurrencyNull($newForeignId, $newForeignCode)
-            ?? $foreignCurrency;
+                           ?? $foreignCurrency;

        // not the same as normal currency
        if (null !== $foreignCurrency && $foreignCurrency->id === $this->transactionJournal->transaction_currency_id) {
--- a/composer.lock
+++ b/composer.lock
@@ -3543,22 +3543,22 @@
        },
        {
            "name": "mailersend/laravel-driver",
-            "version": "v2.9.1",
+            "version": "v2.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/mailersend/mailersend-laravel-driver.git",
-                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725"
+                "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/87fd5ab76808bbaac9221be0d306baef13e98725",
-                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725",
+                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/15e1ec41e29e65d3ca226929c65804190aaa93eb",
+                "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "illuminate/support": "^9.0 || ^10.0  || ^11.0 || ^12.0",
-                "mailersend/mailersend": "^0.31.0",
+                "mailersend/mailersend": "^0.35.0",
                "nyholm/psr7": "^1.5",
                "php": ">=8.0",
                "php-http/guzzle7-adapter": "^1.0",
@@ -3606,29 +3606,28 @@
            ],
            "support": {
                "issues": "https://github.com/mailersend/mailersend-laravel-driver/issues",
-                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.9.1"
+                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.12.0"
            },
-            "time": "2025-04-09T09:33:07+00:00"
+            "time": "2025-10-28T14:59:16+00:00"
        },
        {
            "name": "mailersend/mailersend",
-            "version": "v0.31.0",
+            "version": "v0.35.0",
            "source": {
                "type": "git",
                "url": "https://github.com/mailersend/mailersend-php.git",
-                "reference": "513ff83ee768526055ad52987cde401ea7218c67"
+                "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/513ff83ee768526055ad52987cde401ea7218c67",
-                "reference": "513ff83ee768526055ad52987cde401ea7218c67",
+                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/f1696cf9e727e9503fbc5882d2a111bd966ad276",
+                "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276",
                "shasum": ""
            },
            "require": {
                "beberlei/assert": "^3.2",
                "ext-json": "*",
-                "illuminate/collections": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
-                "php": "^7.4|^8.0",
+                "php": "^7.4 || ^8.0 <8.5",
                "php-http/client-common": "^2.2",
                "php-http/discovery": "^1.9",
                "php-http/httplug": "^2.1",
@@ -3673,9 +3672,9 @@
            ],
            "support": {
                "issues": "https://github.com/mailersend/mailersend-php/issues",
-                "source": "https://github.com/mailersend/mailersend-php/tree/v0.31.0"
+                "source": "https://github.com/mailersend/mailersend-php/tree/v0.35.0"
            },
-            "time": "2025-04-03T12:16:11+00:00"
+            "time": "2025-10-28T13:11:43+00:00"
        },
        {
            "name": "monolog/monolog",
--- 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-12-06',
-    'build_time'                           => 1765004025,
+    'version'                              => 'develop/2025-12-07',
+    'build_time'                           => 1765124451,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
@@ -4075,9 +4075,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.9.3",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.3.tgz",
-            "integrity": "sha512-8QdH6czo+G7uBsNo0GiUfouPN1lRzKdJTGnKXwe12gkFbnnOUaUKGN55dMkfy+mnxmvjwl9zcI4VncczcVXDhA==",
+            "version": "2.9.4",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.4.tgz",
+            "integrity": "sha512-ZCQ9GEWl73BVm8bu5Fts8nt7MHdbt5vY9bP6WGnUh+r3l8M7CgfyTlwsgCbMC66BNxPr6Xoce3j66Ms5YUQTNA==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
Author	SHA1	Message	Date
github-actions[bot]	7eab4834c8	Merge pull request #11340 from firefly-iii/release-1765124558 🤖 Automatically merge the PR into the develop branch.	2025-12-07 17:22:47 +01:00
JC5	d1332eb592	🤖 Auto commit for release 'develop' on 2025-12-07	2025-12-07 17:22:38 +01:00
James Cole	346f2dfaea	Add amount event.	2025-12-07 16:47:04 +01:00