Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
James Cole4222d8ffdd19
diff --cc app/Http/Controllers/ObjectGroup/EditController.phpindex 05f2a99b7a,0771583af9..b4b82f1fea--- a/app/Http/Controllers/ObjectGroup/EditController.php+++ b/app/Http/Controllers/ObjectGroup/EditController.php@@@ -77,9 -76,8 +76,8 @@@ final class EditController extends Cont/*** Update a piggy bank.- **/- public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup): Redirector|RedirectResponse+ public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup): RedirectResponse{$data = $request->getObjectGroupData();$piggyBank = $this->repository->update($objectGroup, $data);diff --cc app/Http/Controllers/ProfileController.phpindex 7c20a92da7,932414f182..fe37c93acb--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@@ -342,10 -341,9 +341,9 @@@ final class ProfileController extends C}/**- ** @throws AuthenticationException*/- public function postLogoutOtherSessions(Request $request): Redirector|RedirectResponse+ public function postLogoutOtherSessions(Request $request): RedirectResponse{if (!$this->internalAuth) {session()->flash('info', (string) trans('firefly.external_auth_disabled'));diff --cc app/Http/Controllers/Transaction/MassController.phpindex 2bd51a051c,d875800819..23796e3cee--- a/app/Http/Controllers/Transaction/MassController.php+++ b/app/Http/Controllers/Transaction/MassController.php@@@ -85,11 -84,11 +84,11 @@@ final class MassController extends Contreturn view('transactions.mass.delete', ['journals' => $journals, 'subTitle' => $subTitle]);}- public function destroy(MassDeleteJournalRequest $request): Redirector|RedirectResponse+ public function destroy(MassDeleteJournalRequest $request): RedirectResponse{Log::debug(sprintf('Now in %s', __METHOD__));- $ids = $request->input('confirm_mass_delete');- $count = 0;+ $ids = $request->input('confirm_mass_delete');+ $count = 0;$objects = new TransactionGroupEventObjects();