diff --git a/.ci/rector.php b/.ci/rector.php index 79d475e59a..eb36d34d69 100644 --- a/.ci/rector.php +++ b/.ci/rector.php @@ -57,26 +57,26 @@ return RectorConfig::configure() // uncomment to reach your current PHP version ->withPhpSets() ->withPreparedSets( + deadCode: true, + codeQuality: true, codingStyle: false, // leave false + typeDeclarations: true, + typeDeclarationDocblocks: false, privatization: false, // leave false. naming: false, // leave false instanceOf: true, earlyReturn: true, - strictBooleans: true, + // strictBooleans: true, // has a new thingie. carbon: true, rectorPreset: true, phpunitCodeQuality: true, doctrineCodeQuality: true, symfonyCodeQuality: true, - symfonyConfigs: true - + symfonyConfigs: true, ) ->withComposerBased( twig: true, doctrine: true, phpunit: true, symfony: true) - ->withTypeCoverageLevel(0) - ->withDeadCodeLevel(0) - ->withCodeQualityLevel(0) ->withImportNames(removeUnusedImports: true);// import statements instead of full classes. diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 45ada44542..d9b39c0e7f 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -154,8 +154,8 @@ class EditController extends Controller $array['repeat_until'] = substr((string) $array['repeat_until'], 0, 10); $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []); $array['transactions'][0]['amount'] = round((float) $array['transactions'][0]['amount'], $array['transactions'][0]['currency_decimal_places']); - if (null !== $array['transactions'][0]['foreign_amount']) { - $array['transactions'][0]['foreign_amount'] = round((float) $array['transactions'][0]['foreign_amount'], $array['transactions'][0]['foreign_currency_decimal_places']); + if (null !== $array['transactions'][0]['foreign_amount'] && '' !== $array['transactions'][0]['foreign_amount']) { + $array['transactions'][0]['foreign_amount'] = round((float) $array['transactions'][0]['foreign_amount'], $array['transactions'][0]['foreign_currency_decimal_places'] ?? 2); } return view( diff --git a/changelog.md b/changelog.md index 5683dbc248..7949699439 100644 --- a/changelog.md +++ b/changelog.md @@ -3,7 +3,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## 6.4.5 - 2025-11-xx +## 6.4.6 - 2025-11-09 + +### Fixed + +- [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo +- [Issue 11166](https://github.com/firefly-iii/firefly-iii/issues/11166) (Optional transaction information field not saved when updating a recuring transaction) reported by @Old-Veeh +- [Issue 11185](https://github.com/firefly-iii/firefly-iii/issues/11185) (Internal server error after apply rule) reported by @Citroene +- #11196 + +## 6.4.5 - 2025-11-09 ### Fixed