Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

This commit is contained in:
James Cole
2024-12-15 19:51:37 +01:00
2 changed files with 9 additions and 8 deletions

View File

@@ -270,7 +270,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
*/ */
public function getPiggyBanksWithAmount(): Collection public function getPiggyBanksWithAmount(): Collection
{ {
$set = $this->getPiggyBanks(); $set = $this->getPiggyBanks();
/** @var PiggyBank $piggy */ /** @var PiggyBank $piggy */
foreach ($set as $piggy) { foreach ($set as $piggy) {
$currentAmount = $this->getCurrentAmount($piggy); $currentAmount = $this->getCurrentAmount($piggy);

14
composer.lock generated
View File

@@ -6596,16 +6596,16 @@
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": {
"dev-master": "0.14-dev"
},
"laravel": { "laravel": {
"providers": [
"TwigBridge\\ServiceProvider"
],
"aliases": { "aliases": {
"Twig": "TwigBridge\\Facade\\Twig" "Twig": "TwigBridge\\Facade\\Twig"
} },
"providers": [
"TwigBridge\\ServiceProvider"
]
},
"branch-alias": {
"dev-master": "0.14-dev"
} }
}, },
"autoload": { "autoload": {