mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-29 06:34:37 +00:00 
			
		
		
		
	Clean up code and comments.
This commit is contained in:
		| @@ -58,7 +58,6 @@ class TransactionTypeController extends Controller | |||||||
|      * @param  AutocompleteRequest  $request |      * @param  AutocompleteRequest  $request | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactionTypes(AutocompleteRequest $request): JsonResponse |     public function transactionTypes(AutocompleteRequest $request): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -63,7 +63,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  Account  $account |      * @param  Account  $account | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      */ |      */ | ||||||
|     public function destroy(Account $account): JsonResponse |     public function destroy(Account $account): JsonResponse | ||||||
|   | |||||||
| @@ -76,7 +76,6 @@ class ListController extends Controller | |||||||
|      * @param  Account  $account |      * @param  Account  $account | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      */ |      */ | ||||||
|     public function attachments(Account $account): JsonResponse |     public function attachments(Account $account): JsonResponse | ||||||
| @@ -110,7 +109,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function piggyBanks(Account $account): JsonResponse |     public function piggyBanks(Account $account): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -145,7 +143,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * Show all transaction groups related to the account. |      * Show all transaction groups related to the account. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @param  Request  $request |      * @param  Request  $request | ||||||
|      * @param  Account  $account |      * @param  Account  $account | ||||||
|   | |||||||
| @@ -75,7 +75,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(Request $request): JsonResponse |     public function index(Request $request): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -64,7 +64,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * Remove the specified resource from storage. |      * Remove the specified resource from storage. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @param  Attachment  $attachment |      * @param  Attachment  $attachment | ||||||
|      * |      * | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  Attachment  $attachment |      * @param  Attachment  $attachment | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return LaravelResponse |      * @return LaravelResponse | ||||||
|      * @throws   FireflyException |      * @throws   FireflyException | ||||||
|      */ |      */ | ||||||
| @@ -118,7 +117,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -95,7 +95,6 @@ class StoreController extends Controller | |||||||
|     /** |     /** | ||||||
|      * Upload an attachment. |      * Upload an attachment. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @param  Request  $request |      * @param  Request  $request | ||||||
|      * @param  Attachment  $attachment |      * @param  Attachment  $attachment | ||||||
|   | |||||||
| @@ -70,7 +70,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -110,7 +109,6 @@ class ShowController extends Controller | |||||||
|      * @param  AvailableBudget  $availableBudget |      * @param  AvailableBudget  $availableBudget | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(AvailableBudget $availableBudget): JsonResponse |     public function show(AvailableBudget $availableBudget): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -62,7 +62,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Bill  $bill |      * @param  Bill  $bill | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Bill $bill): JsonResponse |     public function destroy(Bill $bill): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -76,7 +76,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(Bill $bill): JsonResponse |     public function attachments(Bill $bill): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -111,7 +110,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function rules(Bill $bill): JsonResponse |     public function rules(Bill $bill): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -150,7 +148,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Bill $bill): JsonResponse |     public function transactions(Request $request, Bill $bill): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -67,7 +67,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -98,7 +97,6 @@ class ShowController extends Controller | |||||||
|      * @param  Bill  $bill |      * @param  Bill  $bill | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Bill $bill): JsonResponse |     public function show(Bill $bill): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -62,7 +62,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Budget  $budget |      * @param  Budget  $budget | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Budget $budget): JsonResponse |     public function destroy(Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -78,7 +78,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(Budget $budget): JsonResponse |     public function attachments(Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -113,7 +112,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function budgetLimits(Budget $budget): JsonResponse |     public function budgetLimits(Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -147,7 +145,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Budget $budget): JsonResponse |     public function transactions(Request $request, Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -211,7 +208,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function withoutBudget(Request $request): JsonResponse |     public function withoutBudget(Request $request): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -71,7 +71,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -105,7 +104,6 @@ class ShowController extends Controller | |||||||
|      * @param  Budget  $budget |      * @param  Budget  $budget | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Budget $budget): JsonResponse |     public function show(Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -69,7 +69,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse |     public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -77,7 +77,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse |     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -80,7 +80,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(Request $request, Budget $budget): JsonResponse |     public function index(Request $request, Budget $budget): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -113,7 +112,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function indexAll(DateRequest $request): JsonResponse |     public function indexAll(DateRequest $request): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -62,7 +62,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Category  $category |      * @param  Category  $category | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Category $category): JsonResponse |     public function destroy(Category $category): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(Category $category): JsonResponse |     public function attachments(Category $category): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -110,7 +109,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Category $category): JsonResponse |     public function transactions(Request $request, Category $category): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -67,7 +67,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -103,7 +102,6 @@ class ShowController extends Controller | |||||||
|      * @param  Category  $category |      * @param  Category  $category | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Category $category): JsonResponse |     public function show(Category $category): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -64,7 +64,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  ObjectGroup  $objectGroup |      * @param  ObjectGroup  $objectGroup | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      */ |      */ | ||||||
|     public function destroy(ObjectGroup $objectGroup): JsonResponse |     public function destroy(ObjectGroup $objectGroup): JsonResponse | ||||||
|   | |||||||
| @@ -72,7 +72,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function bills(ObjectGroup $objectGroup): JsonResponse |     public function bills(ObjectGroup $objectGroup): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -108,7 +107,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function piggyBanks(ObjectGroup $objectGroup): JsonResponse |     public function piggyBanks(ObjectGroup $objectGroup): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(Request $request): JsonResponse |     public function index(Request $request): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -62,7 +62,6 @@ class DestroyController extends Controller | |||||||
|      * @param  PiggyBank  $piggyBank |      * @param  PiggyBank  $piggyBank | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(PiggyBank $piggyBank): JsonResponse |     public function destroy(PiggyBank $piggyBank): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -67,7 +67,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(PiggyBank $piggyBank): JsonResponse |     public function attachments(PiggyBank $piggyBank): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -102,7 +101,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse |     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -67,7 +67,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -103,7 +102,6 @@ class ShowController extends Controller | |||||||
|      * @param  PiggyBank  $piggyBank |      * @param  PiggyBank  $piggyBank | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(PiggyBank $piggyBank): JsonResponse |     public function show(PiggyBank $piggyBank): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -62,7 +62,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Recurrence  $recurrence |      * @param  Recurrence  $recurrence | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Recurrence $recurrence): JsonResponse |     public function destroy(Recurrence $recurrence): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -74,7 +74,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Recurrence $recurrence): JsonResponse |     public function transactions(Request $request, Recurrence $recurrence): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -67,7 +67,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -104,7 +103,6 @@ class ShowController extends Controller | |||||||
|      * @param  Recurrence  $recurrence |      * @param  Recurrence  $recurrence | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Recurrence $recurrence): JsonResponse |     public function show(Recurrence $recurrence): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -66,7 +66,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Rule  $rule |      * @param  Rule  $rule | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Rule $rule): JsonResponse |     public function destroy(Rule $rule): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -71,7 +71,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -108,7 +107,6 @@ class ShowController extends Controller | |||||||
|      * @param  Rule  $rule |      * @param  Rule  $rule | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Rule $rule): JsonResponse |     public function show(Rule $rule): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -66,7 +66,6 @@ class DestroyController extends Controller | |||||||
|      * @param  RuleGroup  $ruleGroup |      * @param  RuleGroup  $ruleGroup | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(RuleGroup $ruleGroup): JsonResponse |     public function destroy(RuleGroup $ruleGroup): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -70,7 +70,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function rules(RuleGroup $group): JsonResponse |     public function rules(RuleGroup $group): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -70,7 +70,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -106,7 +105,6 @@ class ShowController extends Controller | |||||||
|      * @param  RuleGroup  $ruleGroup |      * @param  RuleGroup  $ruleGroup | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(RuleGroup $ruleGroup): JsonResponse |     public function show(RuleGroup $ruleGroup): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -66,7 +66,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Tag  $tag |      * @param  Tag  $tag | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Tag $tag): JsonResponse |     public function destroy(Tag $tag): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -76,7 +76,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(Tag $tag): JsonResponse |     public function attachments(Tag $tag): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -112,7 +111,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, Tag $tag): JsonResponse |     public function transactions(Request $request, Tag $tag): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -71,7 +71,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -107,7 +106,6 @@ class ShowController extends Controller | |||||||
|      * @param  Tag  $tag |      * @param  Tag  $tag | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Tag $tag): JsonResponse |     public function show(Tag $tag): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -76,7 +76,6 @@ class DestroyController extends Controller | |||||||
|      * @param  TransactionGroup  $transactionGroup |      * @param  TransactionGroup  $transactionGroup | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(TransactionGroup $transactionGroup): JsonResponse |     public function destroy(TransactionGroup $transactionGroup): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -116,7 +115,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  TransactionJournal  $transactionJournal |      * @param  TransactionJournal  $transactionJournal | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      */ |      */ | ||||||
|     public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse |     public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse | ||||||
|   | |||||||
| @@ -74,7 +74,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function attachments(TransactionGroup $transactionGroup): JsonResponse |     public function attachments(TransactionGroup $transactionGroup): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -110,7 +109,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse |     public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -149,7 +147,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse |     public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -55,7 +55,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(Request $request): JsonResponse |     public function index(Request $request): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -107,7 +106,6 @@ class ShowController extends Controller | |||||||
|      * @param  TransactionJournal  $transactionJournal |      * @param  TransactionJournal  $transactionJournal | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function showJournal(TransactionJournal $transactionJournal): JsonResponse |     public function showJournal(TransactionJournal $transactionJournal): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -123,7 +121,6 @@ class ShowController extends Controller | |||||||
|      * @param  TransactionGroup  $transactionGroup |      * @param  TransactionGroup  $transactionGroup | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(TransactionGroup $transactionGroup): JsonResponse |     public function show(TransactionGroup $transactionGroup): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -70,7 +70,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(TransactionCurrency $currency): JsonResponse |     public function destroy(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -41,7 +41,6 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; | |||||||
| use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; | use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; | ||||||
| use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; | use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; | ||||||
| use FireflyIII\Repositories\Rule\RuleRepositoryInterface; | use FireflyIII\Repositories\Rule\RuleRepositoryInterface; | ||||||
| use FireflyIII\Repositories\User\UserRepositoryInterface; |  | ||||||
| use FireflyIII\Support\Http\Api\AccountFilter; | use FireflyIII\Support\Http\Api\AccountFilter; | ||||||
| use FireflyIII\Support\Http\Api\TransactionFilter; | use FireflyIII\Support\Http\Api\TransactionFilter; | ||||||
| use FireflyIII\Transformers\AccountTransformer; | use FireflyIII\Transformers\AccountTransformer; | ||||||
| @@ -67,6 +66,7 @@ class ListController extends Controller | |||||||
|     use TransactionFilter; |     use TransactionFilter; | ||||||
|  |  | ||||||
|     private CurrencyRepositoryInterface $repository; |     private CurrencyRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * CurrencyRepository constructor. |      * CurrencyRepository constructor. | ||||||
|      * |      * | ||||||
| @@ -95,7 +95,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse |     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -149,7 +148,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function availableBudgets(TransactionCurrency $currency): JsonResponse |     public function availableBudgets(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -188,7 +186,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function bills(TransactionCurrency $currency): JsonResponse |     public function bills(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -232,7 +229,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function budgetLimits(TransactionCurrency $currency): JsonResponse |     public function budgetLimits(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -267,7 +263,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function recurrences(TransactionCurrency $currency): JsonResponse |     public function recurrences(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -320,7 +315,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function rules(TransactionCurrency $currency): JsonResponse |     public function rules(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -374,7 +368,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse |     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -75,7 +75,6 @@ class ShowController extends Controller | |||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -111,7 +110,6 @@ class ShowController extends Controller | |||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(TransactionCurrency $currency): JsonResponse |     public function show(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -137,7 +135,6 @@ class ShowController extends Controller | |||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function showDefault(): JsonResponse |     public function showDefault(): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest; | |||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Models\TransactionCurrency; | use FireflyIII\Models\TransactionCurrency; | ||||||
| use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; | use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; | ||||||
| use FireflyIII\Repositories\User\UserRepositoryInterface; |  | ||||||
| use FireflyIII\Support\Http\Api\AccountFilter; | use FireflyIII\Support\Http\Api\AccountFilter; | ||||||
| use FireflyIII\Support\Http\Api\TransactionFilter; | use FireflyIII\Support\Http\Api\TransactionFilter; | ||||||
| use FireflyIII\Transformers\CurrencyTransformer; | use FireflyIII\Transformers\CurrencyTransformer; | ||||||
| @@ -76,7 +75,6 @@ class UpdateController extends Controller | |||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function disable(TransactionCurrency $currency): JsonResponse |     public function disable(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -109,7 +107,6 @@ class UpdateController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function makeDefault(TransactionCurrency $currency): JsonResponse |     public function makeDefault(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -142,7 +139,6 @@ class UpdateController extends Controller | |||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function enable(TransactionCurrency $currency): JsonResponse |     public function enable(TransactionCurrency $currency): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -65,7 +65,6 @@ class DestroyController extends Controller | |||||||
|      * @param  TransactionJournalLink  $link |      * @param  TransactionJournalLink  $link | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(TransactionJournalLink $link): JsonResponse |     public function destroy(TransactionJournalLink $link): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(Request $request): JsonResponse |     public function index(Request $request): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -114,7 +113,6 @@ class ShowController extends Controller | |||||||
|      * @param  TransactionJournalLink  $journalLink |      * @param  TransactionJournalLink  $journalLink | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(TransactionJournalLink $journalLink): JsonResponse |     public function show(TransactionJournalLink $journalLink): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException; | |||||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||||
| use FireflyIII\Models\LinkType; | use FireflyIII\Models\LinkType; | ||||||
| use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; | use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; | ||||||
| use FireflyIII\Repositories\User\UserRepositoryInterface; |  | ||||||
| use FireflyIII\Support\Http\Api\TransactionFilter; | use FireflyIII\Support\Http\Api\TransactionFilter; | ||||||
| use FireflyIII\Transformers\TransactionGroupTransformer; | use FireflyIII\Transformers\TransactionGroupTransformer; | ||||||
| use FireflyIII\User; | use FireflyIII\User; | ||||||
| @@ -76,7 +75,6 @@ class ListController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function transactions(Request $request, LinkType $linkType): JsonResponse |     public function transactions(Request $request, LinkType $linkType): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller; | |||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Models\LinkType; | use FireflyIII\Models\LinkType; | ||||||
| use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; | use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; | ||||||
| use FireflyIII\Repositories\User\UserRepositoryInterface; |  | ||||||
| use FireflyIII\Support\Http\Api\TransactionFilter; | use FireflyIII\Support\Http\Api\TransactionFilter; | ||||||
| use FireflyIII\Transformers\LinkTypeTransformer; | use FireflyIII\Transformers\LinkTypeTransformer; | ||||||
| use FireflyIII\User; | use FireflyIII\User; | ||||||
| @@ -74,7 +73,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -110,7 +108,6 @@ class ShowController extends Controller | |||||||
|      * @param  LinkType  $linkType |      * @param  LinkType  $linkType | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(LinkType $linkType): JsonResponse |     public function show(LinkType $linkType): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -360,7 +360,9 @@ class BasicController extends Controller | |||||||
|         /** @var NetWorthInterface $netWorthHelper */ |         /** @var NetWorthInterface $netWorthHelper */ | ||||||
|         $netWorthHelper = app(NetWorthInterface::class); |         $netWorthHelper = app(NetWorthInterface::class); | ||||||
|         $netWorthHelper->setUser($user); |         $netWorthHelper->setUser($user); | ||||||
|         $allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]); |         $allAccounts = $this->accountRepository->getActiveAccountsByType( | ||||||
|  |             [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT] | ||||||
|  |         ); | ||||||
|  |  | ||||||
|         // filter list on preference of being included. |         // filter list on preference of being included. | ||||||
|         $filtered = $allAccounts->filter( |         $filtered = $allAccounts->filter( | ||||||
|   | |||||||
| @@ -33,7 +33,6 @@ use League\Fractal\Resource\Item; | |||||||
| /** | /** | ||||||
|  * Returns basic information about this installation. |  * Returns basic information about this installation. | ||||||
|  * |  * | ||||||
|  |  | ||||||
|  * Class AboutController. |  * Class AboutController. | ||||||
|  */ |  */ | ||||||
| class AboutController extends Controller | class AboutController extends Controller | ||||||
|   | |||||||
| @@ -72,7 +72,6 @@ class UserController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(User $user): JsonResponse |     public function destroy(User $user): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -98,7 +97,6 @@ class UserController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -135,7 +133,6 @@ class UserController extends Controller | |||||||
|      * @param  User  $user |      * @param  User  $user | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(User $user): JsonResponse |     public function show(User $user): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -52,7 +52,6 @@ class PreferencesController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -85,7 +84,6 @@ class PreferencesController extends Controller | |||||||
|      * @param  Preference  $preference |      * @param  Preference  $preference | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function show(Preference $preference): JsonResponse |     public function show(Preference $preference): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -45,7 +45,6 @@ class AttemptController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -40,7 +40,6 @@ class DestroyController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
| @@ -64,7 +63,6 @@ class DestroyController extends Controller | |||||||
|      * @param  Webhook  $webhook |      * @param  Webhook  $webhook | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroy(Webhook $webhook): JsonResponse |     public function destroy(Webhook $webhook): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -86,7 +84,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse |     public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse | ||||||
|     { |     { | ||||||
| @@ -114,7 +111,6 @@ class DestroyController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse |     public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -41,7 +41,6 @@ class MessageController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -24,9 +24,7 @@ declare(strict_types=1); | |||||||
| namespace FireflyIII\Api\V1\Controllers\Webhook; | namespace FireflyIII\Api\V1\Controllers\Webhook; | ||||||
|  |  | ||||||
| use FireflyIII\Api\V1\Controllers\Controller; | use FireflyIII\Api\V1\Controllers\Controller; | ||||||
| use FireflyIII\Enums\WebhookTrigger; |  | ||||||
| use FireflyIII\Events\RequestedSendWebhookMessages; | use FireflyIII\Events\RequestedSendWebhookMessages; | ||||||
| use FireflyIII\Events\StoredTransactionGroup; |  | ||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Generator\Webhook\MessageGeneratorInterface; | use FireflyIII\Generator\Webhook\MessageGeneratorInterface; | ||||||
| use FireflyIII\Models\TransactionGroup; | use FireflyIII\Models\TransactionGroup; | ||||||
| @@ -49,7 +47,6 @@ class ShowController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
| @@ -72,7 +69,6 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function index(): JsonResponse |     public function index(): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -39,7 +39,6 @@ class StoreController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -37,7 +37,6 @@ class SubmitController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
| @@ -59,7 +58,6 @@ class SubmitController extends Controller | |||||||
|      * @param  Webhook  $webhook |      * @param  Webhook  $webhook | ||||||
|      * |      * | ||||||
|      * @return JsonResponse |      * @return JsonResponse | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function submit(Webhook $webhook): JsonResponse |     public function submit(Webhook $webhook): JsonResponse | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -39,7 +39,6 @@ class UpdateController extends Controller | |||||||
|     private WebhookRepositoryInterface $repository; |     private WebhookRepositoryInterface $repository; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -23,7 +23,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Api\V1\Requests\Data\Export; | namespace FireflyIII\Api\V1\Requests\Data\Export; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use FireflyIII\Models\AccountType; | use FireflyIII\Models\AccountType; | ||||||
| use FireflyIII\Repositories\Account\AccountRepositoryInterface; | use FireflyIII\Repositories\Account\AccountRepositoryInterface; | ||||||
| use FireflyIII\Support\Request\ChecksLogin; | use FireflyIII\Support\Request\ChecksLogin; | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes; | |||||||
| use Illuminate\Foundation\Http\FormRequest; | use Illuminate\Foundation\Http\FormRequest; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  |  | ||||||
|  * Class StoreRequest |  * Class StoreRequest | ||||||
|  */ |  */ | ||||||
| class StoreRequest extends FormRequest | class StoreRequest extends FormRequest | ||||||
|   | |||||||
| @@ -30,7 +30,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes; | |||||||
| use Illuminate\Foundation\Http\FormRequest; | use Illuminate\Foundation\Http\FormRequest; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  |  | ||||||
|  * Class UpdateRequest |  * Class UpdateRequest | ||||||
|  */ |  */ | ||||||
| class UpdateRequest extends FormRequest | class UpdateRequest extends FormRequest | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Api\V1\Requests\System; | namespace FireflyIII\Api\V1\Requests\System; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use FireflyIII\Support\Request\ConvertsDataTypes; | use FireflyIII\Support\Request\ConvertsDataTypes; | ||||||
| use Illuminate\Foundation\Http\FormRequest; | use Illuminate\Foundation\Http\FormRequest; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -26,7 +26,6 @@ namespace FireflyIII\Api\V2\Controllers; | |||||||
|  |  | ||||||
| use FireflyIII\Api\V2\Request\Generic\SingleDateRequest; | use FireflyIII\Api\V2\Request\Generic\SingleDateRequest; | ||||||
| use FireflyIII\Helpers\Report\NetWorthInterface; | use FireflyIII\Helpers\Report\NetWorthInterface; | ||||||
| use FireflyIII\Repositories\Account\AccountRepositoryInterface; |  | ||||||
| use FireflyIII\Support\Http\Api\ConvertsExchangeRates; | use FireflyIII\Support\Http\Api\ConvertsExchangeRates; | ||||||
| use Illuminate\Http\JsonResponse; | use Illuminate\Http\JsonResponse; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -27,7 +27,6 @@ use Exception; | |||||||
| use FireflyIII\Models\Transaction; | use FireflyIII\Models\Transaction; | ||||||
| use FireflyIII\Models\TransactionJournal; | use FireflyIII\Models\TransactionJournal; | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
| use Illuminate\Database\QueryException; |  | ||||||
| use Log; | use Log; | ||||||
| use stdClass; | use stdClass; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Correction; | |||||||
| use FireflyIII\Models\Transaction; | use FireflyIII\Models\Transaction; | ||||||
| use FireflyIII\Models\TransactionJournal; | use FireflyIII\Models\TransactionJournal; | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
| use Illuminate\Database\QueryException; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Class DeleteZeroAmount |  * Class DeleteZeroAmount | ||||||
|   | |||||||
| @@ -30,6 +30,7 @@ use FireflyIII\Models\Transaction; | |||||||
| use FireflyIII\Models\TransactionJournal; | use FireflyIII\Models\TransactionJournal; | ||||||
| use FireflyIII\Models\TransactionType; | use FireflyIII\Models\TransactionType; | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
|  | use JsonException; | ||||||
| use Log; | use Log; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -166,7 +167,7 @@ class FixAccountTypes extends Command | |||||||
|      * @param  Transaction  $dest |      * @param  Transaction  $dest | ||||||
|      * |      * | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws \JsonException |      * @throws JsonException | ||||||
|      */ |      */ | ||||||
|     private function fixJournal(TransactionJournal $journal, string $type, Transaction $source, Transaction $dest): void |     private function fixJournal(TransactionJournal $journal, string $type, Transaction $source, Transaction $dest): void | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Upgrade; | |||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Models\BudgetLimit; | use FireflyIII\Models\BudgetLimit; | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
| use JsonException; |  | ||||||
| use Psr\Container\ContainerExceptionInterface; | use Psr\Container\ContainerExceptionInterface; | ||||||
| use Psr\Container\NotFoundExceptionInterface; | use Psr\Container\NotFoundExceptionInterface; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException; | |||||||
| use FireflyIII\Models\Note; | use FireflyIII\Models\Note; | ||||||
| use FireflyIII\Models\TransactionJournalMeta; | use FireflyIII\Models\TransactionJournalMeta; | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
| use Illuminate\Database\QueryException; |  | ||||||
| use Log; | use Log; | ||||||
| use Psr\Container\ContainerExceptionInterface; | use Psr\Container\ContainerExceptionInterface; | ||||||
| use Psr\Container\NotFoundExceptionInterface; | use Psr\Container\NotFoundExceptionInterface; | ||||||
|   | |||||||
| @@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException; | |||||||
| use FireflyIII\Models\Transaction; | use FireflyIII\Models\Transaction; | ||||||
| use FireflyIII\Models\TransactionJournal; | use FireflyIII\Models\TransactionJournal; | ||||||
| use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; | use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; | ||||||
| use FireflyIII\Repositories\Journal\JournalRepositoryInterface; |  | ||||||
| use Illuminate\Console\Command; | use Illuminate\Console\Command; | ||||||
| use Illuminate\Database\QueryException; | use Illuminate\Database\QueryException; | ||||||
| use Log; | use Log; | ||||||
|   | |||||||
| @@ -237,7 +237,6 @@ class TransferCurrenciesCorrections extends Command | |||||||
|      * @param  TransactionJournal  $transfer |      * @param  TransactionJournal  $transfer | ||||||
|      * |      * | ||||||
|      * @return bool |      * @return bool | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function isSplitJournal(TransactionJournal $transfer): bool |     private function isSplitJournal(TransactionJournal $transfer): bool | ||||||
|     { |     { | ||||||
| @@ -262,7 +261,6 @@ class TransferCurrenciesCorrections extends Command | |||||||
|      * @param  TransactionJournal  $transfer |      * @param  TransactionJournal  $transfer | ||||||
|      * |      * | ||||||
|      * @return Transaction|null |      * @return Transaction|null | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function getSourceTransaction(TransactionJournal $transfer): ?Transaction |     private function getSourceTransaction(TransactionJournal $transfer): ?Transaction | ||||||
|     { |     { | ||||||
| @@ -312,7 +310,6 @@ class TransferCurrenciesCorrections extends Command | |||||||
|      * @param  TransactionJournal  $transfer |      * @param  TransactionJournal  $transfer | ||||||
|      * |      * | ||||||
|      * @return Transaction|null |      * @return Transaction|null | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction |     private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction | ||||||
|     { |     { | ||||||
| @@ -323,7 +320,6 @@ class TransferCurrenciesCorrections extends Command | |||||||
|      * Is either the source or destination transaction NULL? |      * Is either the source or destination transaction NULL? | ||||||
|      * |      * | ||||||
|      * @return bool |      * @return bool | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function isEmptyTransactions(): bool |     private function isEmptyTransactions(): bool | ||||||
|     { |     { | ||||||
| @@ -334,7 +330,6 @@ class TransferCurrenciesCorrections extends Command | |||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @return bool |      * @return bool | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function isNoCurrencyPresent(): bool |     private function isNoCurrencyPresent(): bool | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -159,6 +159,90 @@ class UpgradeLiabilitiesEight extends Command | |||||||
|         Log::debug(sprintf('Done upgrading liability #%d ("%s")', $account->id, $account->name)); |         Log::debug(sprintf('Done upgrading liability #%d ("%s")', $account->id, $account->name)); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @param  Account  $account | ||||||
|  |      * @return bool | ||||||
|  |      */ | ||||||
|  |     private function hasBadOpening(Account $account): bool | ||||||
|  |     { | ||||||
|  |         $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); | ||||||
|  |         $liabilityType      = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first(); | ||||||
|  |         $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') | ||||||
|  |                                                 ->where('transactions.account_id', $account->id) | ||||||
|  |                                                 ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) | ||||||
|  |                                                 ->first(['transaction_journals.*']); | ||||||
|  |         if (null === $openingJournal) { | ||||||
|  |             Log::debug('Account has no opening balance and can be skipped.'); | ||||||
|  |             return false; | ||||||
|  |         } | ||||||
|  |         $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') | ||||||
|  |                                               ->where('transactions.account_id', $account->id) | ||||||
|  |                                               ->where('transaction_journals.transaction_type_id', $liabilityType->id) | ||||||
|  |                                               ->first(['transaction_journals.*']); | ||||||
|  |         if (null === $liabilityJournal) { | ||||||
|  |             Log::debug('Account has no liability credit and can be skipped.'); | ||||||
|  |             return false; | ||||||
|  |         } | ||||||
|  |         if (!$openingJournal->date->isSameDay($liabilityJournal->date)) { | ||||||
|  |             Log::debug('Account has opening/credit not on the same day.'); | ||||||
|  |             return false; | ||||||
|  |         } | ||||||
|  |         Log::debug('Account has bad opening balance data.'); | ||||||
|  |  | ||||||
|  |         return true; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @param  Account  $account | ||||||
|  |      * @return void | ||||||
|  |      */ | ||||||
|  |     private function deleteCreditTransaction(Account $account): void | ||||||
|  |     { | ||||||
|  |         Log::debug('Will delete credit transaction.'); | ||||||
|  |         $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first(); | ||||||
|  |         $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') | ||||||
|  |                                               ->where('transactions.account_id', $account->id) | ||||||
|  |                                               ->where('transaction_journals.transaction_type_id', $liabilityType->id) | ||||||
|  |                                               ->first(['transaction_journals.*']); | ||||||
|  |         if (null !== $liabilityJournal) { | ||||||
|  |             $group   = $liabilityJournal->transactionGroup; | ||||||
|  |             $service = new TransactionGroupDestroyService(); | ||||||
|  |             $service->destroy($group); | ||||||
|  |             Log::debug(sprintf('Deleted liability credit group #%d', $group->id)); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         Log::debug('No liability credit journal found.'); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @param  Account  $account | ||||||
|  |      * @return void | ||||||
|  |      */ | ||||||
|  |     private function reverseOpeningBalance(Account $account): void | ||||||
|  |     { | ||||||
|  |         $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); | ||||||
|  |         /** @var TransactionJournal $openingJournal */ | ||||||
|  |         $openingJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') | ||||||
|  |                                             ->where('transactions.account_id', $account->id) | ||||||
|  |                                             ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) | ||||||
|  |                                             ->first(['transaction_journals.*']); | ||||||
|  |         /** @var Transaction|null $source */ | ||||||
|  |         $source = $openingJournal->transactions()->where('amount', '<', 0)->first(); | ||||||
|  |         /** @var Transaction|null $dest */ | ||||||
|  |         $dest = $openingJournal->transactions()->where('amount', '>', 0)->first(); | ||||||
|  |         if ($source && $dest) { | ||||||
|  |             $sourceId           = $source->account_id; | ||||||
|  |             $destId             = $dest->account_id; | ||||||
|  |             $dest->account_id   = $sourceId; | ||||||
|  |             $source->account_id = $destId; | ||||||
|  |             $source->save(); | ||||||
|  |             $dest->save(); | ||||||
|  |             Log::debug(sprintf('Opening balance transaction journal #%d reversed.', $openingJournal->id)); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         Log::warning('Did not find opening balance.'); | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @param $account |      * @param $account | ||||||
|      * @return int |      * @return int | ||||||
| @@ -204,29 +288,6 @@ class UpgradeLiabilitiesEight extends Command | |||||||
|         return $count; |         return $count; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @param  Account  $account |  | ||||||
|      * @return void |  | ||||||
|      */ |  | ||||||
|     private function deleteCreditTransaction(Account $account): void |  | ||||||
|     { |  | ||||||
|         Log::debug('Will delete credit transaction.'); |  | ||||||
|         $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first(); |  | ||||||
|         $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |  | ||||||
|                                               ->where('transactions.account_id', $account->id) |  | ||||||
|                                               ->where('transaction_journals.transaction_type_id', $liabilityType->id) |  | ||||||
|                                               ->first(['transaction_journals.*']); |  | ||||||
|         if (null !== $liabilityJournal) { |  | ||||||
|             $group   = $liabilityJournal->transactionGroup; |  | ||||||
|             $service = new TransactionGroupDestroyService(); |  | ||||||
|             $service->destroy($group); |  | ||||||
|             Log::debug(sprintf('Deleted liability credit group #%d', $group->id)); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|         Log::debug('No liability credit journal found.'); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * |      * | ||||||
|      */ |      */ | ||||||
| @@ -234,66 +295,4 @@ class UpgradeLiabilitiesEight extends Command | |||||||
|     { |     { | ||||||
|         app('fireflyconfig')->set(self::CONFIG_NAME, true); |         app('fireflyconfig')->set(self::CONFIG_NAME, true); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @param  Account  $account |  | ||||||
|      * @return bool |  | ||||||
|      */ |  | ||||||
|     private function hasBadOpening(Account $account): bool |  | ||||||
|     { |  | ||||||
|         $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); |  | ||||||
|         $liabilityType      = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first(); |  | ||||||
|         $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |  | ||||||
|                                                 ->where('transactions.account_id', $account->id) |  | ||||||
|                                                 ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) |  | ||||||
|                                                 ->first(['transaction_journals.*']); |  | ||||||
|         if (null === $openingJournal) { |  | ||||||
|             Log::debug('Account has no opening balance and can be skipped.'); |  | ||||||
|             return false; |  | ||||||
|         } |  | ||||||
|         $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |  | ||||||
|                                               ->where('transactions.account_id', $account->id) |  | ||||||
|                                               ->where('transaction_journals.transaction_type_id', $liabilityType->id) |  | ||||||
|                                               ->first(['transaction_journals.*']); |  | ||||||
|         if (null === $liabilityJournal) { |  | ||||||
|             Log::debug('Account has no liability credit and can be skipped.'); |  | ||||||
|             return false; |  | ||||||
|         } |  | ||||||
|         if (!$openingJournal->date->isSameDay($liabilityJournal->date)) { |  | ||||||
|             Log::debug('Account has opening/credit not on the same day.'); |  | ||||||
|             return false; |  | ||||||
|         } |  | ||||||
|         Log::debug('Account has bad opening balance data.'); |  | ||||||
|  |  | ||||||
|         return true; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @param  Account  $account |  | ||||||
|      * @return void |  | ||||||
|      */ |  | ||||||
|     private function reverseOpeningBalance(Account $account): void |  | ||||||
|     { |  | ||||||
|         $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); |  | ||||||
|         /** @var TransactionJournal $openingJournal */ |  | ||||||
|         $openingJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') |  | ||||||
|                                             ->where('transactions.account_id', $account->id) |  | ||||||
|                                             ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) |  | ||||||
|                                             ->first(['transaction_journals.*']); |  | ||||||
|         /** @var Transaction|null $source */ |  | ||||||
|         $source = $openingJournal->transactions()->where('amount', '<', 0)->first(); |  | ||||||
|         /** @var Transaction|null $dest */ |  | ||||||
|         $dest = $openingJournal->transactions()->where('amount', '>', 0)->first(); |  | ||||||
|         if ($source && $dest) { |  | ||||||
|             $sourceId           = $source->account_id; |  | ||||||
|             $destId             = $dest->account_id; |  | ||||||
|             $dest->account_id   = $sourceId; |  | ||||||
|             $source->account_id = $destId; |  | ||||||
|             $source->save(); |  | ||||||
|             $dest->save(); |  | ||||||
|             Log::debug(sprintf('Opening balance transaction journal #%d reversed.', $openingJournal->id)); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|         Log::warning('Did not find opening balance.'); |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -30,6 +30,7 @@ use FireflyIII\Services\Internal\Support\RecurringTransactionTrait; | |||||||
| use FireflyIII\Services\Internal\Support\TransactionTypeTrait; | use FireflyIII\Services\Internal\Support\TransactionTypeTrait; | ||||||
| use FireflyIII\User; | use FireflyIII\User; | ||||||
| use Illuminate\Support\MessageBag; | use Illuminate\Support\MessageBag; | ||||||
|  | use JsonException; | ||||||
| use Log; | use Log; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -58,7 +59,7 @@ class RecurrenceFactory | |||||||
|      * |      * | ||||||
|      * @return Recurrence |      * @return Recurrence | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws \JsonException |      * @throws JsonException | ||||||
|      */ |      */ | ||||||
|     public function create(array $data): Recurrence |     public function create(array $data): Recurrence | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -42,11 +42,11 @@ use Validator; | |||||||
| class TransactionFactory | class TransactionFactory | ||||||
| { | { | ||||||
|     private Account              $account; |     private Account              $account; | ||||||
|  |     private array                $accountInformation; | ||||||
|     private TransactionCurrency  $currency; |     private TransactionCurrency  $currency; | ||||||
|     private ?TransactionCurrency $foreignCurrency; |     private ?TransactionCurrency $foreignCurrency; | ||||||
|     private TransactionJournal   $journal; |     private TransactionJournal   $journal; | ||||||
|     private bool                 $reconciled; |     private bool                 $reconciled; | ||||||
|     private array                $accountInformation; |  | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Constructor. |      * Constructor. | ||||||
| @@ -140,6 +140,38 @@ class TransactionFactory | |||||||
|         return $result; |         return $result; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @return void | ||||||
|  |      * @throws FireflyException | ||||||
|  |      */ | ||||||
|  |     private function updateAccountInformation(): void | ||||||
|  |     { | ||||||
|  |         if (!array_key_exists('iban', $this->accountInformation)) { | ||||||
|  |             Log::debug('No IBAN information in array, will not update.'); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         if ('' !== (string)$this->account->iban) { | ||||||
|  |             Log::debug('Account already has IBAN information, will not update.'); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         if ($this->account->iban === $this->accountInformation['iban']) { | ||||||
|  |             Log::debug('Account already has this IBAN, will not update.'); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         // validate info: | ||||||
|  |         $validator = Validator::make(['iban' => $this->accountInformation['iban']], [ | ||||||
|  |             'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)], | ||||||
|  |         ]); | ||||||
|  |         if ($validator->fails()) { | ||||||
|  |             Log::debug('Invalid or non-unique IBAN, will not update.'); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         Log::debug('Will update account with IBAN information.'); | ||||||
|  |         $service = app(AccountUpdateService::class); | ||||||
|  |         $service->update($this->account, ['iban' => $this->accountInformation['iban']]); | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Create transaction with positive amount (for destination accounts). |      * Create transaction with positive amount (for destination accounts). | ||||||
|      * |      * | ||||||
| @@ -171,6 +203,14 @@ class TransactionFactory | |||||||
|         $this->account = $account; |         $this->account = $account; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @param  array  $accountInformation | ||||||
|  |      */ | ||||||
|  |     public function setAccountInformation(array $accountInformation): void | ||||||
|  |     { | ||||||
|  |         $this->accountInformation = $accountInformation; | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @param  TransactionCurrency  $currency |      * @param  TransactionCurrency  $currency | ||||||
|      * |      * | ||||||
| @@ -220,45 +260,4 @@ class TransactionFactory | |||||||
|     { |     { | ||||||
|         // empty function. |         // empty function. | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @param  array  $accountInformation |  | ||||||
|      */ |  | ||||||
|     public function setAccountInformation(array $accountInformation): void |  | ||||||
|     { |  | ||||||
|         $this->accountInformation = $accountInformation; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @return void |  | ||||||
|      * @throws FireflyException |  | ||||||
|      */ |  | ||||||
|     private function updateAccountInformation(): void |  | ||||||
|     { |  | ||||||
|         if (!array_key_exists('iban', $this->accountInformation)) { |  | ||||||
|             Log::debug('No IBAN information in array, will not update.'); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|         if ('' !== (string)$this->account->iban) { |  | ||||||
|             Log::debug('Account already has IBAN information, will not update.'); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|         if ($this->account->iban === $this->accountInformation['iban']) { |  | ||||||
|             Log::debug('Account already has this IBAN, will not update.'); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|         // validate info: |  | ||||||
|         $validator = Validator::make(['iban' => $this->accountInformation['iban']], [ |  | ||||||
|             'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)], |  | ||||||
|         ]); |  | ||||||
|         if ($validator->fails()) { |  | ||||||
|             Log::debug('Invalid or non-unique IBAN, will not update.'); |  | ||||||
|             return; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         Log::debug('Will update account with IBAN information.'); |  | ||||||
|         $service = app(AccountUpdateService::class); |  | ||||||
|         $service->update($this->account, ['iban' => $this->accountInformation['iban']]); |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ class TransactionJournalFactory | |||||||
|      * Constructor. |      * Constructor. | ||||||
|      * |      * | ||||||
|      * @throws Exception |      * @throws Exception | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function __construct() |     public function __construct() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -25,7 +25,6 @@ namespace FireflyIII\Factory; | |||||||
|  |  | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use FireflyIII\Models\TransactionJournalMeta; | use FireflyIII\Models\TransactionJournalMeta; | ||||||
| use Illuminate\Database\QueryException; |  | ||||||
| use Log; | use Log; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -50,7 +50,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @return string |      * @return string | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws JsonException |      * @throws JsonException | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function generate(): string |     public function generate(): string | ||||||
|     { |     { | ||||||
| @@ -186,7 +185,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Collection  $accounts |      * @param  Collection  $accounts | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setAccounts(Collection $accounts): ReportGeneratorInterface |     public function setAccounts(Collection $accounts): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -201,7 +199,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Collection  $budgets |      * @param  Collection  $budgets | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setBudgets(Collection $budgets): ReportGeneratorInterface |     public function setBudgets(Collection $budgets): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -214,7 +211,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Collection  $categories |      * @param  Collection  $categories | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setCategories(Collection $categories): ReportGeneratorInterface |     public function setCategories(Collection $categories): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -227,7 +223,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Carbon  $date |      * @param  Carbon  $date | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setEndDate(Carbon $date): ReportGeneratorInterface |     public function setEndDate(Carbon $date): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -242,7 +237,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Collection  $expense |      * @param  Collection  $expense | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setExpense(Collection $expense): ReportGeneratorInterface |     public function setExpense(Collection $expense): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -256,7 +250,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Carbon  $date |      * @param  Carbon  $date | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setStartDate(Carbon $date): ReportGeneratorInterface |     public function setStartDate(Carbon $date): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
| @@ -271,7 +264,6 @@ class MonthReportGenerator implements ReportGeneratorInterface | |||||||
|      * @param  Collection  $tags |      * @param  Collection  $tags | ||||||
|      * |      * | ||||||
|      * @return ReportGeneratorInterface |      * @return ReportGeneratorInterface | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function setTags(Collection $tags): ReportGeneratorInterface |     public function setTags(Collection $tags): ReportGeneratorInterface | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -46,12 +46,6 @@ interface MessageGeneratorInterface | |||||||
|      */ |      */ | ||||||
|     public function setObjects(Collection $objects): void; |     public function setObjects(Collection $objects): void; | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * @param  Collection  $webhooks |  | ||||||
|      * @return void |  | ||||||
|      */ |  | ||||||
|     public function setWebhooks(Collection $webhooks): void; |  | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @param  int  $trigger |      * @param  int  $trigger | ||||||
|      */ |      */ | ||||||
| @@ -61,4 +55,10 @@ interface MessageGeneratorInterface | |||||||
|      * @param  User  $user |      * @param  User  $user | ||||||
|      */ |      */ | ||||||
|     public function setUser(User $user): void; |     public function setUser(User $user): void; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @param  Collection  $webhooks | ||||||
|  |      * @return void | ||||||
|  |      */ | ||||||
|  |     public function setWebhooks(Collection $webhooks): void; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Handlers\Events; | namespace FireflyIII\Handlers\Events; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use FireflyIII\Events\ChangedPiggyBankAmount; | use FireflyIII\Events\ChangedPiggyBankAmount; | ||||||
| use FireflyIII\Models\PiggyBankEvent; | use FireflyIII\Models\PiggyBankEvent; | ||||||
| use Illuminate\Support\Facades\Log; | use Illuminate\Support\Facades\Log; | ||||||
|   | |||||||
| @@ -69,7 +69,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|     /** |     /** | ||||||
|      * Returns the content of an attachment. |      * Returns the content of an attachment. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @param  Attachment  $attachment |      * @param  Attachment  $attachment | ||||||
|      * |      * | ||||||
| @@ -93,7 +92,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|      * |      * | ||||||
|      * @param  Attachment  $attachment |      * @param  Attachment  $attachment | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return string |      * @return string | ||||||
|      */ |      */ | ||||||
|     public function getAttachmentLocation(Attachment $attachment): string |     public function getAttachmentLocation(Attachment $attachment): string | ||||||
| @@ -104,7 +102,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|     /** |     /** | ||||||
|      * Get all attachments. |      * Get all attachments. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * @return Collection |      * @return Collection | ||||||
|      */ |      */ | ||||||
|     public function getAttachments(): Collection |     public function getAttachments(): Collection | ||||||
| @@ -116,7 +113,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|      * Get all errors. |      * Get all errors. | ||||||
|      * |      * | ||||||
|      * @return MessageBag |      * @return MessageBag | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function getErrors(): MessageBag |     public function getErrors(): MessageBag | ||||||
|     { |     { | ||||||
| @@ -127,7 +123,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|      * Get all messages. |      * Get all messages. | ||||||
|      * |      * | ||||||
|      * @return MessageBag |      * @return MessageBag | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     public function getMessages(): MessageBag |     public function getMessages(): MessageBag | ||||||
|     { |     { | ||||||
| @@ -336,7 +331,6 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|     /** |     /** | ||||||
|      * Verify if the size of a file is valid. |      * Verify if the size of a file is valid. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @param  UploadedFile  $file |      * @param  UploadedFile  $file | ||||||
|      * |      * | ||||||
| @@ -377,7 +371,8 @@ class AttachmentHelper implements AttachmentHelperInterface | |||||||
|             $count = $model->account->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); |             $count = $model->account->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); | ||||||
|         } |         } | ||||||
|         if ($model instanceof PiggyBank) { |         if ($model instanceof PiggyBank) { | ||||||
|             $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); // @phpstan-ignore-line |             $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count( | ||||||
|  |             ); // @phpstan-ignore-line | ||||||
|         } |         } | ||||||
|         $result = false; |         $result = false; | ||||||
|         if ($count > 0) { |         if ($count > 0) { | ||||||
|   | |||||||
| @@ -196,6 +196,19 @@ trait MetaCollection | |||||||
|         return $this; |         return $this; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Join table to get tag information. | ||||||
|  |      */ | ||||||
|  |     protected function joinMetaDataTables(): void | ||||||
|  |     { | ||||||
|  |         if (false === $this->hasJoinedMetaTables) { | ||||||
|  |             $this->hasJoinedMetaTables = true; | ||||||
|  |             $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id'); | ||||||
|  |             $this->fields[] = 'journal_meta.name as meta_name'; | ||||||
|  |             $this->fields[] = 'journal_meta.data as meta_data'; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @inheritDoc |      * @inheritDoc | ||||||
|      */ |      */ | ||||||
| @@ -245,19 +258,6 @@ trait MetaCollection | |||||||
|         return $this; |         return $this; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * Join table to get tag information. |  | ||||||
|      */ |  | ||||||
|     protected function joinMetaDataTables(): void |  | ||||||
|     { |  | ||||||
|         if (false === $this->hasJoinedMetaTables) { |  | ||||||
|             $this->hasJoinedMetaTables = true; |  | ||||||
|             $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id'); |  | ||||||
|             $this->fields[] = 'journal_meta.name as meta_name'; |  | ||||||
|             $this->fields[] = 'journal_meta.data as meta_data'; |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @inheritDoc |      * @inheritDoc | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ declare(strict_types=1); | |||||||
| namespace FireflyIII\Helpers\Collector; | namespace FireflyIII\Helpers\Collector; | ||||||
|  |  | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use Carbon\Exceptions\InvalidDateException; |  | ||||||
| use Carbon\Exceptions\InvalidFormatException; | use Carbon\Exceptions\InvalidFormatException; | ||||||
| use Closure; | use Closure; | ||||||
| use Exception; | use Exception; | ||||||
|   | |||||||
| @@ -32,7 +32,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; | |||||||
| use FireflyIII\Support\CacheProperties; | use FireflyIII\Support\CacheProperties; | ||||||
| use FireflyIII\User; | use FireflyIII\User; | ||||||
| use Illuminate\Support\Collection; | use Illuminate\Support\Collection; | ||||||
| use Illuminate\Support\Facades\Log; |  | ||||||
| use JsonException; | use JsonException; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -112,7 +111,6 @@ class NetWorth implements NetWorthInterface | |||||||
|                 $netWorth[$currencyId] = '0'; |                 $netWorth[$currencyId] = '0'; | ||||||
|             } |             } | ||||||
|             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]); |             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]); | ||||||
|  |  | ||||||
| //            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId])); | //            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId])); | ||||||
|         } |         } | ||||||
|         ksort($netWorth); |         ksort($netWorth); | ||||||
| @@ -184,7 +182,9 @@ class NetWorth implements NetWorthInterface | |||||||
|      */ |      */ | ||||||
|     private function getAccounts(): Collection |     private function getAccounts(): Collection | ||||||
|     { |     { | ||||||
|         $accounts = $this->accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]); |         $accounts = $this->accountRepository->getAccountsByType( | ||||||
|  |             [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE] | ||||||
|  |         ); | ||||||
|         $filtered = new Collection(); |         $filtered = new Collection(); | ||||||
|         /** @var Account $account */ |         /** @var Account $account */ | ||||||
|         foreach ($accounts as $account) { |         foreach ($accounts as $account) { | ||||||
|   | |||||||
| @@ -23,7 +23,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Http\Controllers\Admin; | namespace FireflyIII\Http\Controllers\Admin; | ||||||
|  |  | ||||||
| use FireflyIII\Exceptions\FireflyException; |  | ||||||
| use FireflyIII\Helpers\Update\UpdateTrait; | use FireflyIII\Helpers\Update\UpdateTrait; | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Http\Middleware\IsDemoUser; | use FireflyIII\Http\Middleware\IsDemoUser; | ||||||
|   | |||||||
| @@ -109,7 +109,6 @@ class ForgotPasswordController extends Controller | |||||||
|     /** |     /** | ||||||
|      * Show form for email recovery. |      * Show form for email recovery. | ||||||
|      * |      * | ||||||
|  |  | ||||||
|      * |      * | ||||||
|      * @return Factory|View |      * @return Factory|View | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ declare(strict_types=1); | |||||||
| namespace FireflyIII\Http\Controllers\Bill; | namespace FireflyIII\Http\Controllers\Bill; | ||||||
|  |  | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use FireflyIII\Exceptions\FireflyException; |  | ||||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Models\Attachment; | use FireflyIII\Models\Attachment; | ||||||
|   | |||||||
| @@ -37,7 +37,6 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview; | |||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
| use Illuminate\View\View; | use Illuminate\View\View; | ||||||
| use JsonException; |  | ||||||
| use Psr\Container\ContainerExceptionInterface; | use Psr\Container\ContainerExceptionInterface; | ||||||
| use Psr\Container\NotFoundExceptionInterface; | use Psr\Container\NotFoundExceptionInterface; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,7 +23,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Http\Controllers\Category; | namespace FireflyIII\Http\Controllers\Category; | ||||||
|  |  | ||||||
| use FireflyIII\Exceptions\FireflyException; |  | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Models\Category; | use FireflyIII\Models\Category; | ||||||
| use FireflyIII\Repositories\Category\CategoryRepositoryInterface; | use FireflyIII\Repositories\Category\CategoryRepositoryInterface; | ||||||
|   | |||||||
| @@ -34,7 +34,6 @@ use Illuminate\Contracts\View\Factory; | |||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
| use Illuminate\Support\Collection; | use Illuminate\Support\Collection; | ||||||
| use Illuminate\View\View; | use Illuminate\View\View; | ||||||
| use JsonException; |  | ||||||
| use Psr\Container\ContainerExceptionInterface; | use Psr\Container\ContainerExceptionInterface; | ||||||
| use Psr\Container\NotFoundExceptionInterface; | use Psr\Container\NotFoundExceptionInterface; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,7 +23,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Http\Controllers\Chart; | namespace FireflyIII\Http\Controllers\Chart; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Generator\Chart\Basic\GeneratorInterface; | use FireflyIII\Generator\Chart\Basic\GeneratorInterface; | ||||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||||
|   | |||||||
| @@ -25,7 +25,6 @@ declare(strict_types=1); | |||||||
| namespace FireflyIII\Http\Controllers\Chart; | namespace FireflyIII\Http\Controllers\Chart; | ||||||
|  |  | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use FireflyIII\Exceptions\FireflyException; |  | ||||||
| use FireflyIII\Generator\Chart\Basic\GeneratorInterface; | use FireflyIII\Generator\Chart\Basic\GeneratorInterface; | ||||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
|   | |||||||
| @@ -31,8 +31,6 @@ use FireflyIII\Models\Account; | |||||||
| use FireflyIII\Models\TransactionCurrency; | use FireflyIII\Models\TransactionCurrency; | ||||||
| use FireflyIII\Models\TransactionType; | use FireflyIII\Models\TransactionType; | ||||||
| use FireflyIII\Repositories\Account\AccountRepositoryInterface; | use FireflyIII\Repositories\Account\AccountRepositoryInterface; | ||||||
| use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; |  | ||||||
| use FireflyIII\Repositories\Journal\JournalRepositoryInterface; |  | ||||||
| use Illuminate\Http\JsonResponse; | use Illuminate\Http\JsonResponse; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
| use Illuminate\Support\Collection; | use Illuminate\Support\Collection; | ||||||
|   | |||||||
| @@ -32,6 +32,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; | |||||||
| use FireflyIII\Transformers\PiggyBankTransformer; | use FireflyIII\Transformers\PiggyBankTransformer; | ||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\View\View; | use Illuminate\View\View; | ||||||
|  | use JsonException; | ||||||
| use Symfony\Component\HttpFoundation\ParameterBag; | use Symfony\Component\HttpFoundation\ParameterBag; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -69,7 +70,7 @@ class ShowController extends Controller | |||||||
|      * |      * | ||||||
|      * @return Factory|View |      * @return Factory|View | ||||||
|      * @throws FireflyException |      * @throws FireflyException | ||||||
|      * @throws \JsonException |      * @throws JsonException | ||||||
|      */ |      */ | ||||||
|     public function show(PiggyBank $piggyBank) |     public function show(PiggyBank $piggyBank) | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers; | |||||||
|  |  | ||||||
| use Auth; | use Auth; | ||||||
| use DB; | use DB; | ||||||
|  | use Exception; | ||||||
| use FireflyIII\Events\UserChangedEmail; | use FireflyIII\Events\UserChangedEmail; | ||||||
| use FireflyIII\Exceptions\FireflyException; | use FireflyIII\Exceptions\FireflyException; | ||||||
| use FireflyIII\Exceptions\ValidationException; | use FireflyIII\Exceptions\ValidationException; | ||||||
| @@ -641,7 +642,7 @@ class ProfileController extends Controller | |||||||
|      * @param  Request  $request |      * @param  Request  $request | ||||||
|      * |      * | ||||||
|      * @return RedirectResponse|Redirector |      * @return RedirectResponse|Redirector | ||||||
|      * @throws \Exception |      * @throws Exception | ||||||
|      */ |      */ | ||||||
|     public function regenerate(Request $request) |     public function regenerate(Request $request) | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -23,7 +23,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Http\Controllers\Recurring; | namespace FireflyIII\Http\Controllers\Recurring; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Http\Requests\TriggerRecurrenceRequest; | use FireflyIII\Http\Requests\TriggerRecurrenceRequest; | ||||||
| use FireflyIII\Jobs\CreateRecurringTransactions; | use FireflyIII\Jobs\CreateRecurringTransactions; | ||||||
|   | |||||||
| @@ -36,7 +36,6 @@ use FireflyIII\Support\Report\Category\CategoryReportGenerator; | |||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\Support\Collection; | use Illuminate\Support\Collection; | ||||||
| use Illuminate\View\View; | use Illuminate\View\View; | ||||||
| use JsonException; |  | ||||||
| use Log; | use Log; | ||||||
| use Throwable; | use Throwable; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -239,7 +239,6 @@ class MassController extends Controller | |||||||
|      * @param  string  $key |      * @param  string  $key | ||||||
|      * |      * | ||||||
|      * @return Carbon|null |      * @return Carbon|null | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon |     private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon | ||||||
|     { |     { | ||||||
| @@ -267,7 +266,6 @@ class MassController extends Controller | |||||||
|      * @param  string  $string |      * @param  string  $string | ||||||
|      * |      * | ||||||
|      * @return string|null |      * @return string|null | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string |     private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string | ||||||
|     { |     { | ||||||
| @@ -288,7 +286,6 @@ class MassController extends Controller | |||||||
|      * @param  string  $string |      * @param  string  $string | ||||||
|      * |      * | ||||||
|      * @return int|null |      * @return int|null | ||||||
|  |  | ||||||
|      */ |      */ | ||||||
|     private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int |     private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -25,10 +25,9 @@ namespace FireflyIII\Http\Controllers\Webhooks; | |||||||
|  |  | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Models\Webhook; | use FireflyIII\Models\Webhook; | ||||||
|  | use Illuminate\Contracts\Foundation\Application; | ||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\Http\RedirectResponse; | use Illuminate\Contracts\View\View; | ||||||
| use Illuminate\Routing\Redirector; |  | ||||||
| use Illuminate\View\View; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Class DeleteController |  * Class DeleteController | ||||||
| @@ -62,7 +61,7 @@ class DeleteController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  Webhook  $webhook |      * @param  Webhook  $webhook | ||||||
|      * |      * | ||||||
|      * @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View |      * @return Factory|Application|View | ||||||
|      */ |      */ | ||||||
|     public function index(Webhook $webhook) |     public function index(Webhook $webhook) | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -25,10 +25,9 @@ namespace FireflyIII\Http\Controllers\Webhooks; | |||||||
|  |  | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use FireflyIII\Models\Webhook; | use FireflyIII\Models\Webhook; | ||||||
|  | use Illuminate\Contracts\Foundation\Application; | ||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\Http\RedirectResponse; | use Illuminate\Contracts\View\View; | ||||||
| use Illuminate\Routing\Redirector; |  | ||||||
| use Illuminate\View\View; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Class EditController |  * Class EditController | ||||||
| @@ -61,7 +60,7 @@ class EditController extends Controller | |||||||
|      * |      * | ||||||
|      * @param  Webhook  $webhook |      * @param  Webhook  $webhook | ||||||
|      * |      * | ||||||
|      * @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View |      * @return Factory|Application|View | ||||||
|      */ |      */ | ||||||
|     public function index(Webhook $webhook) |     public function index(Webhook $webhook) | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ declare(strict_types=1); | |||||||
|  |  | ||||||
| namespace FireflyIII\Http\Controllers\Webhooks; | namespace FireflyIII\Http\Controllers\Webhooks; | ||||||
|  |  | ||||||
| use FireflyIII\Exceptions\FireflyException; |  | ||||||
| use FireflyIII\Http\Controllers\Controller; | use FireflyIII\Http\Controllers\Controller; | ||||||
| use Illuminate\Contracts\View\Factory; | use Illuminate\Contracts\View\Factory; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user