Merge pull request #922 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

Author: github-actions[bot]

.ci/php-cs-fixer/composer.lock

@@ -4,6 +4,8 @@ Over time, many people have contributed to the Firefly III Data Importer. Their
 Please find below all the people who contributed to the Firefly III Data Importer code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- Robin Appelman
+- Martijn Klene
 - DrEthan
 - Tamás Varga
 - Odd Stråbø

THANKS.md

@@ -45,26 +45,37 @@ private function processAmount(array $transaction): array
     {
         Log::debug(sprintf('Now at the start of processAmount("%s")', $transaction['amount']));
         $amount                = null;
-        if ($this->validAmount((string) $transaction['amount'])) {
+        if ($this->validAmount((string)$transaction['amount'])) {
             Log::debug('Transaction["amount"] value is not NULL, assume this is the correct value.');
             $amount = $transaction['amount'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_debit'])) {
-            Log::debug(sprintf('Transaction["amount_debit"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_debit']));
+        if (null === $amount && $this->validAmount((string)$transaction['amount_debit'])) {
+            Log::debug(
+                sprintf(
+                    'Transaction["amount_debit"] value is not NULL ("%s"), assume this is the correct value.',
+                    $transaction['amount_debit'],
+                ),
+            );
             $amount = $transaction['amount_debit'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_credit'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount_credit'])) {
             Log::debug(
-                sprintf('Transaction["amount_credit"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_credit'])
+                sprintf(
+                    'Transaction["amount_credit"] value is not NULL ("%s"), assume this is the correct value.',
+                    $transaction['amount_credit'],
+                ),
             );
             $amount = $transaction['amount_credit'];
         }
 
-        if (null === $amount && $this->validAmount((string) $transaction['amount_negated'])) {
+        if (null === $amount && $this->validAmount((string)$transaction['amount_negated'])) {
             Log::debug(
-                sprintf('Transaction["amount_negated"] value is not NULL ("%s"), assume this is the correct value.', $transaction['amount_negated'])
+                sprintf(
+                    'Transaction["amount_negated"] value is not NULL ("%s"), assume this is the correct value.',
+                    $transaction['amount_negated'],
+                ),
             );
             $amount = $transaction['amount_negated'];
         }
@@ -74,23 +85,23 @@ private function processAmount(array $transaction): array
             $transaction['amount_modifier'] = '1';
         }
         if (array_key_exists('foreign_amount', $transaction)) {
-            $transaction['foreign_amount'] = (string) $transaction['foreign_amount'];
+            $transaction['foreign_amount'] = (string)$transaction['foreign_amount'];
         }
-        $amount                = (string) $amount;
+        $amount                = (string)$amount;
         if ('' === $amount) {
             Log::error('Amount is EMPTY. This will give problems further ahead.', $transaction);
             unset($transaction['amount_modifier']);
 
             return $transaction;
         }
         // modify amount:
-        $amount                = bcmul($amount, $transaction['amount_modifier']);
+        $amount                = bcmul($amount, (string) $transaction['amount_modifier']);
 
         Log::debug(sprintf('Amount is now %s.', $amount));
 
         // modify foreign amount
         if (array_key_exists('foreign_amount', $transaction)) {
-            $transaction['foreign_amount'] = bcmul($transaction['foreign_amount'], $transaction['amount_modifier']);
+            $transaction['foreign_amount'] = bcmul((string) $transaction['foreign_amount'], (string) $transaction['amount_modifier']);
             Log::debug(sprintf('FOREIGN amount is now %s.', $transaction['foreign_amount']));
         }
 

app/Services/CSV/Conversion/Task/Amount.php

@@ -52,6 +52,7 @@ public function convert(mixed $value): int
             'dbit', // https://subsembly.com/index.html (Banking4 App)
             'charge', // not sure which bank but it's insane.
             '(-)', // Banco Bolivariano in Ecuador (same opinion as above)
+            'out', // Wise
         ];
 
         // Lowercase the value and trim it for comparison.

app/Services/CSV/Converter/BankDebitCredit.php

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.7.9 - 2025-07-31
+
+### Added
+- [PR 917](https://github.com/firefly-iii/data-importer/pull/917) (Add OUT as debit indicator) by @icewind1991
+
+### Fixed
+- [Issue 10643](https://github.com/firefly-iii/firefly-iii/issues/10643) (Importer failing on an import of ING) reported by @MTijn
+
 ## v1.7.8 - 2025-07-20
 
 >  ⚠️ Some changes in this release may unexpectedly lead to duplicate transactions. This is caused by changes in the data handling routines. This is unfortunate, but a result of new insights, changed APIs and other minor fixes. My apologies for any inconvenience. I try to avoid these kinds of changes, but it can't always be helped.
@@ -13,7 +21,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [PR 901](https://github.com/firefly-iii/data-importer/pull/901) by @TomVarga for issue 10609
 - [PR 905](https://github.com/firefly-iii/data-importer/pull/905) by @DrEthan77 (This PR fixes issue 10599)
 
-
 ## v1.7.7 - 2025-07-16
 
 ### Changed

changelog.md

@@ -85,7 +85,7 @@
         "genkgo/camt": ">=2.10.0"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.15",
+        "barryvdh/laravel-debugbar": "^3.16",
         "barryvdh/laravel-ide-helper": "^3.5",
         "driftingly/rector-laravel": "^2.0",
         "ergebnis/phpstan-rules": "^2.10",