From 789935cf1c272afced09b009f52934a7bc14abca Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2023 07:23:57 +0100 Subject: [PATCH] Clean up code. --- app/Api/V1/Controllers/Controller.php | 1 + .../Models/Bill/ShowController.php | 6 +-- .../Models/Bill/StoreController.php | 2 +- .../Models/Bill/UpdateController.php | 2 +- .../Models/Budget/StoreController.php | 2 +- .../Models/Budget/UpdateController.php | 2 +- .../Models/BudgetLimit/UpdateController.php | 2 +- .../Models/Category/DestroyController.php | 4 +- .../Models/Category/ListController.php | 6 +-- .../Models/Category/ShowController.php | 6 +-- .../Models/ObjectGroup/DestroyController.php | 4 +- .../Models/ObjectGroup/ShowController.php | 4 +- .../Models/ObjectGroup/UpdateController.php | 2 +- .../Models/PiggyBank/StoreController.php | 2 +- .../Models/PiggyBank/UpdateController.php | 2 +- .../Models/Rule/ShowController.php | 6 +-- .../Models/RuleGroup/ListController.php | 4 +- .../Models/RuleGroup/StoreController.php | 2 +- .../Models/Tag/DestroyController.php | 4 +- .../Controllers/Models/Tag/ListController.php | 6 +-- .../TransactionCurrency/ShowController.php | 8 ++-- .../TransactionCurrency/UpdateController.php | 8 ++-- .../TransactionLink/DestroyController.php | 4 +- .../Models/TransactionLink/ShowController.php | 6 +-- .../TransactionLinkType/DestroyController.php | 8 +--- .../TransactionLinkType/ListController.php | 4 +- .../TransactionLinkType/ShowController.php | 6 +-- .../TransactionLinkType/StoreController.php | 2 +- .../Controllers/Webhook/MessageController.php | 2 +- app/Api/V2/Controllers/Controller.php | 1 + .../Commands/Correction/FixAccountOrder.php | 2 +- app/Console/Commands/CreateFirstUser.php | 2 +- .../Commands/Upgrade/MigrateToRules.php | 2 +- .../Upgrade/UpgradeLiabilitiesEight.php | 6 +-- app/Exceptions/GracefulNotFoundHandler.php | 2 +- app/Factory/TransactionFactory.php | 14 +++--- app/Factory/TransactionJournalFactory.php | 2 +- .../Controllers/Account/IndexController.php | 2 +- .../Account/ReconcileController.php | 2 +- .../Controllers/Account/ShowController.php | 2 +- .../Controllers/Budget/CreateController.php | 2 +- .../Chart/CategoryReportController.php | 2 +- .../Chart/ExpenseReportController.php | 2 +- app/Http/Controllers/Controller.php | 2 +- .../Controllers/Json/BudgetController.php | 2 +- .../Controllers/Json/RecurrenceController.php | 2 +- .../ObjectGroup/IndexController.php | 2 +- .../Controllers/PiggyBank/IndexController.php | 2 +- .../Recurring/CreateController.php | 2 +- .../Controllers/Recurring/ShowController.php | 2 +- .../Report/OperationsController.php | 2 +- .../Controllers/Rule/CreateController.php | 2 +- .../Controllers/RuleGroup/EditController.php | 2 +- .../Transaction/MassController.php | 8 ++-- app/Models/CurrencyExchangeRate.php | 6 +-- app/Models/RecurrenceRepetition.php | 2 +- app/Models/RecurrenceTransaction.php | 14 +++--- app/Models/RecurrenceTransactionMeta.php | 2 +- app/Models/TransactionType.php | 10 ++-- app/Models/Webhook.php | 4 +- app/Rules/IsAssetAccountId.php | 2 +- app/Rules/IsBoolean.php | 2 +- .../Internal/Support/JournalServiceTrait.php | 14 +++--- app/Support/Search/OperatorQuerySearch.php | 16 +++---- app/Transformers/BillTransformer.php | 2 +- app/Transformers/V2/BudgetTransformer.php | 2 +- app/User.php | 46 +++++++++---------- 67 files changed, 154 insertions(+), 156 deletions(-) diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 952a7c1e2d..69dea0db2e 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -97,6 +97,7 @@ abstract class Controller extends BaseController // some date fields: $dates = ['start', 'end', 'date']; foreach ($dates as $field) { + $date = null; try { $date = request()->query->get($field); } catch (BadRequestException $e) { diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.php index b1d0406aa1..02d9a57f09 100644 --- a/app/Api/V1/Controllers/Models/Bill/ShowController.php +++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * BillController constructor. * - + */ public function __construct() { @@ -67,7 +67,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(): JsonResponse { @@ -98,7 +98,7 @@ class ShowController extends Controller * @param Bill $bill * * @return JsonResponse - + */ public function show(Bill $bill): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Bill/StoreController.php b/app/Api/V1/Controllers/Models/Bill/StoreController.php index 3696579dd2..373f49851e 100644 --- a/app/Api/V1/Controllers/Models/Bill/StoreController.php +++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php @@ -44,7 +44,7 @@ class StoreController extends Controller /** * BillController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.php index aa30846941..e249231510 100644 --- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * BillController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Budget/StoreController.php b/app/Api/V1/Controllers/Models/Budget/StoreController.php index 2651c0f086..cc413fc3d2 100644 --- a/app/Api/V1/Controllers/Models/Budget/StoreController.php +++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * StoreController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php index 289cb3a93f..c9e97f6dea 100644 --- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * UpdateController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php index dc4e1a479f..1ccbfbebbd 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php @@ -47,7 +47,7 @@ class UpdateController extends Controller * * BudgetLimitController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Category/DestroyController.php b/app/Api/V1/Controllers/Models/Category/DestroyController.php index 7fce95e517..84ce43eca9 100644 --- a/app/Api/V1/Controllers/Models/Category/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Category/DestroyController.php @@ -38,7 +38,7 @@ class DestroyController extends Controller /** * CategoryController constructor. * - + */ public function __construct() { @@ -62,7 +62,7 @@ class DestroyController extends Controller * @param Category $category * * @return JsonResponse - + */ public function destroy(Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.php index fb41e24a69..aca21976c9 100644 --- a/app/Api/V1/Controllers/Models/Category/ListController.php +++ b/app/Api/V1/Controllers/Models/Category/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * CategoryController constructor. * - + */ public function __construct() { @@ -73,7 +73,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function attachments(Category $category): JsonResponse { @@ -110,7 +110,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function transactions(Request $request, Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Category/ShowController.php b/app/Api/V1/Controllers/Models/Category/ShowController.php index 1340441396..01b36dbe4c 100644 --- a/app/Api/V1/Controllers/Models/Category/ShowController.php +++ b/app/Api/V1/Controllers/Models/Category/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * CategoryController constructor. * - + */ public function __construct() { @@ -67,7 +67,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(): JsonResponse { @@ -103,7 +103,7 @@ class ShowController extends Controller * @param Category $category * * @return JsonResponse - + */ public function show(Category $category): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php index df49cef449..1cac08ed80 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * ObjectGroupController constructor. * - + */ public function __construct() { @@ -64,7 +64,7 @@ class DestroyController extends Controller * * @param ObjectGroup $objectGroup * - + * @return JsonResponse */ public function destroy(ObjectGroup $objectGroup): JsonResponse diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php index a086788374..3f4d8d6e01 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php @@ -46,7 +46,7 @@ class ShowController extends Controller /** * ObjectGroupController constructor. * - + */ public function __construct() { @@ -73,7 +73,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(Request $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php index 5416af4cbb..b1ba8f8cb7 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php @@ -42,7 +42,7 @@ class UpdateController extends Controller /** * ObjectGroupController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php index 8bc03cf685..25850bb4d8 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends Controller /** * Constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php index becf1c67b8..08ff2fe971 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php @@ -41,7 +41,7 @@ class UpdateController extends Controller /** * Constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.php index 43eac5f7a5..2c60911989 100644 --- a/app/Api/V1/Controllers/Models/Rule/ShowController.php +++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php @@ -45,7 +45,7 @@ class ShowController extends Controller /** * RuleController constructor. * - + */ public function __construct() { @@ -71,7 +71,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(): JsonResponse { @@ -108,7 +108,7 @@ class ShowController extends Controller * @param Rule $rule * * @return JsonResponse - + */ public function show(Rule $rule): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php index 6a29746630..8147b7cba9 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php @@ -44,7 +44,7 @@ class ListController extends Controller /** * RuleGroupController constructor. * - + */ public function __construct() { @@ -70,7 +70,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function rules(RuleGroup $group): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php index c28164e6da..eaa7de0ee2 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php @@ -43,7 +43,7 @@ class StoreController extends Controller /** * RuleGroupController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Models/Tag/DestroyController.php b/app/Api/V1/Controllers/Models/Tag/DestroyController.php index c0ec7a1168..fdd6279af5 100644 --- a/app/Api/V1/Controllers/Models/Tag/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Tag/DestroyController.php @@ -39,7 +39,7 @@ class DestroyController extends Controller /** * TagController constructor. * - + */ public function __construct() { @@ -66,7 +66,7 @@ class DestroyController extends Controller * @param Tag $tag * * @return JsonResponse - + */ public function destroy(Tag $tag): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.php index 5447ef3bcd..6c0b24a542 100644 --- a/app/Api/V1/Controllers/Models/Tag/ListController.php +++ b/app/Api/V1/Controllers/Models/Tag/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * TagController constructor. * - + */ public function __construct() { @@ -76,7 +76,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function attachments(Tag $tag): JsonResponse { @@ -112,7 +112,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function transactions(Request $request, Tag $tag): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php index fd952821ca..f2f8106738 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller /** * CurrencyRepository constructor. * - + */ public function __construct() { @@ -75,7 +75,7 @@ class ShowController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - + */ public function index(): JsonResponse { @@ -111,7 +111,7 @@ class ShowController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - + */ public function show(TransactionCurrency $currency): JsonResponse { @@ -137,7 +137,7 @@ class ShowController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - + */ public function showDefault(): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index 216b820eff..f749a2b925 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -50,7 +50,7 @@ class UpdateController extends Controller /** * CurrencyRepository constructor. * - + */ public function __construct() { @@ -76,7 +76,7 @@ class UpdateController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - + */ public function disable(TransactionCurrency $currency): JsonResponse { @@ -109,7 +109,7 @@ class UpdateController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function makeDefault(TransactionCurrency $currency): JsonResponse { @@ -142,7 +142,7 @@ class UpdateController extends Controller * @return JsonResponse * @throws FireflyException * @throws JsonException - + */ public function enable(TransactionCurrency $currency): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php index 83c855105a..c09fade3da 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php @@ -37,7 +37,7 @@ class DestroyController extends Controller /** * TransactionLinkController constructor. * - + */ public function __construct() { @@ -65,7 +65,7 @@ class DestroyController extends Controller * @param TransactionJournalLink $link * * @return JsonResponse - + */ public function destroy(TransactionJournalLink $link): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php index 1440dcf899..44b5c32180 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php @@ -44,7 +44,7 @@ class ShowController extends Controller /** * TransactionLinkController constructor. * - + */ public function __construct() { @@ -73,7 +73,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(Request $request): JsonResponse { @@ -114,7 +114,7 @@ class ShowController extends Controller * @param TransactionJournalLink $journalLink * * @return JsonResponse - + */ public function show(TransactionJournalLink $journalLink): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php index 21367a145a..48f3f57dc0 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php @@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\LinkType; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; -use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -41,7 +40,6 @@ class DestroyController extends Controller use TransactionFilter; private LinkTypeRepositoryInterface $repository; - private UserRepositoryInterface $userRepository; /** * LinkTypeController constructor. @@ -54,9 +52,8 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); - $this->repository = app(LinkTypeRepositoryInterface::class); - $this->userRepository = app(UserRepositoryInterface::class); + $user = auth()->user(); + $this->repository = app(LinkTypeRepositoryInterface::class); $this->repository->setUser($user); return $next($request); @@ -74,7 +71,6 @@ class DestroyController extends Controller * * @return JsonResponse * @throws FireflyException - */ public function destroy(LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php index 1728ddd369..872e1f5c60 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller /** * LinkTypeController constructor. * - + */ public function __construct() { @@ -76,7 +76,7 @@ class ListController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function transactions(Request $request, LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php index 776ae50dc9..c23a2f15d9 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php @@ -50,7 +50,7 @@ class ShowController extends Controller /** * LinkTypeController constructor. * - + */ public function __construct() { @@ -74,7 +74,7 @@ class ShowController extends Controller * * @return JsonResponse * @throws FireflyException - + */ public function index(): JsonResponse { @@ -110,7 +110,7 @@ class ShowController extends Controller * @param LinkType $linkType * * @return JsonResponse - + */ public function show(LinkType $linkType): JsonResponse { diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php index 5662a66c6d..1694e03c85 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php @@ -49,7 +49,7 @@ class StoreController extends Controller /** * LinkTypeController constructor. * - + */ public function __construct() { diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php index 93261f851c..d94a936c4f 100644 --- a/app/Api/V1/Controllers/Webhook/MessageController.php +++ b/app/Api/V1/Controllers/Webhook/MessageController.php @@ -41,7 +41,7 @@ class MessageController extends Controller private WebhookRepositoryInterface $repository; /** - + */ public function __construct() { diff --git a/app/Api/V2/Controllers/Controller.php b/app/Api/V2/Controllers/Controller.php index d7a57e4c26..d34d2c3c0b 100644 --- a/app/Api/V2/Controllers/Controller.php +++ b/app/Api/V2/Controllers/Controller.php @@ -92,6 +92,7 @@ class Controller extends BaseController // some date fields: foreach ($dates as $field) { + $date = null; try { $date = request()->query->get($field); } catch (BadRequestException $e) { diff --git a/app/Console/Commands/Correction/FixAccountOrder.php b/app/Console/Commands/Correction/FixAccountOrder.php index a45a522159..b2b214e7f8 100644 --- a/app/Console/Commands/Correction/FixAccountOrder.php +++ b/app/Console/Commands/Correction/FixAccountOrder.php @@ -74,7 +74,7 @@ class FixAccountOrder extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/CreateFirstUser.php b/app/Console/Commands/CreateFirstUser.php index bce7692625..5f8d5152a5 100644 --- a/app/Console/Commands/CreateFirstUser.php +++ b/app/Console/Commands/CreateFirstUser.php @@ -92,7 +92,7 @@ class CreateFirstUser extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index 244b4fe9d1..a07e0d312d 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -108,7 +108,7 @@ class MigrateToRules extends Command * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should * be called from the handle method instead of using the constructor to initialize the command. * - + */ private function stupidLaravel(): void { diff --git a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php index 1233391940..1757c975cc 100644 --- a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php +++ b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php @@ -160,7 +160,7 @@ class UpgradeLiabilitiesEight extends Command /** * @param $account - * @return void + * @return int */ private function deleteTransactions($account): int { @@ -279,9 +279,9 @@ class UpgradeLiabilitiesEight extends Command ->where('transactions.account_id', $account->id) ->where('transaction_journals.transaction_type_id', $openingBalanceType->id) ->first(['transaction_journals.*']); - /** @var Transaction $source */ + /** @var Transaction|null $source */ $source = $openingJournal->transactions()->where('amount', '<', 0)->first(); - /** @var Transaction $dest */ + /** @var Transaction|null $dest */ $dest = $openingJournal->transactions()->where('amount', '>', 0)->first(); if ($source && $dest) { $sourceId = $source->account_id; diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php index 7b444427e2..33bbf0cf17 100644 --- a/app/Exceptions/GracefulNotFoundHandler.php +++ b/app/Exceptions/GracefulNotFoundHandler.php @@ -221,7 +221,7 @@ class GracefulNotFoundHandler extends ExceptionHandler $user = auth()->user(); $route = $request->route(); $attachmentId = (int)$route->parameter('attachment'); - /** @var Attachment $attachment */ + /** @var Attachment|null $attachment */ $attachment = $user->attachments()->withTrashed()->find($attachmentId); if (null === $attachment) { Log::error(sprintf('Could not find attachment %d, so give big fat error.', $attachmentId)); diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 83ca42b367..d2781b3e18 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -47,7 +47,7 @@ class TransactionFactory /** * Constructor. * - + */ public function __construct() { @@ -156,7 +156,7 @@ class TransactionFactory /** * @param Account $account * - + */ public function setAccount(Account $account): void { @@ -166,7 +166,7 @@ class TransactionFactory /** * @param TransactionCurrency $currency * - + */ public function setCurrency(TransactionCurrency $currency): void { @@ -176,7 +176,7 @@ class TransactionFactory /** * @param TransactionCurrency|null $foreignCurrency |null * - + */ public function setForeignCurrency(?TransactionCurrency $foreignCurrency): void { @@ -186,7 +186,7 @@ class TransactionFactory /** * @param TransactionJournal $journal * - + */ public function setJournal(TransactionJournal $journal): void { @@ -196,7 +196,7 @@ class TransactionFactory /** * @param bool $reconciled * - + */ public function setReconciled(bool $reconciled): void { @@ -206,7 +206,7 @@ class TransactionFactory /** * @param User $user * - + */ public function setUser(User $user): void { diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 67d09d8af0..9044d79525 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -73,7 +73,7 @@ class TransactionJournalFactory * Constructor. * * @throws Exception - + */ public function __construct() { diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index ca4daa95ed..6d52d29b25 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller /** * IndexController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 98b11e5dbc..98d9651e6e 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -55,7 +55,7 @@ class ReconcileController extends Controller /** * ReconcileController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 2896bd7dc5..f51028f9e7 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -53,7 +53,7 @@ class ShowController extends Controller /** * ShowController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 344d13a77e..0ae5c47199 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -45,7 +45,7 @@ class CreateController extends Controller /** * CreateController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index 5c2cace6b6..8884796ef2 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -51,7 +51,7 @@ class CategoryReportController extends Controller /** * CategoryReportController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index b4a7c35ed9..eb31f4aed9 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -53,7 +53,7 @@ class ExpenseReportController extends Controller /** * ExpenseReportController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 1219bb95ac..cc51f90b53 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -51,7 +51,7 @@ abstract class Controller extends BaseController /** * Controller constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index ef9fcff715..08ad5062a6 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -47,7 +47,7 @@ class BudgetController extends Controller /** * IndexController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 72ad17bb3c..72a566be14 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -44,7 +44,7 @@ class RecurrenceController extends Controller /** * RecurrenceController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index a363187fff..c970054544 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -43,7 +43,7 @@ class IndexController extends Controller /** * IndexController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index 3aa4dc4651..47c240c952 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller /** * PiggyBankController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 262a5981f6..aebb15bfd7 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -53,7 +53,7 @@ class CreateController extends Controller /** * CreateController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php index 2952423b45..6d4c1a60f7 100644 --- a/app/Http/Controllers/Recurring/ShowController.php +++ b/app/Http/Controllers/Recurring/ShowController.php @@ -48,7 +48,7 @@ class ShowController extends Controller /** * IndexController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 8c931bec12..3621aab212 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -43,7 +43,7 @@ class OperationsController extends Controller /** * OperationsController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index bb3eba121c..e74afa10d1 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -52,7 +52,7 @@ class CreateController extends Controller /** * RuleController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index ebb23bc9c6..20c7d5873a 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -44,7 +44,7 @@ class EditController extends Controller /** * EditController constructor. * - + */ public function __construct() { diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index be94ba2fa6..aa1297252c 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -54,7 +54,7 @@ class MassController extends Controller /** * MassController constructor. * - + */ public function __construct() { @@ -239,7 +239,7 @@ class MassController extends Controller * @param string $key * * @return Carbon|null - + */ private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon { @@ -267,7 +267,7 @@ class MassController extends Controller * @param string $string * * @return string|null - + */ private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string { @@ -288,7 +288,7 @@ class MassController extends Controller * @param string $string * * @return int|null - + */ private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int { diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 5667745445..7be23bd662 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -79,7 +79,7 @@ class CurrencyExchangeRate extends Model protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate']; /** - + * @return BelongsTo */ public function fromCurrency(): BelongsTo @@ -88,7 +88,7 @@ class CurrencyExchangeRate extends Model } /** - + * @return BelongsTo */ public function toCurrency(): BelongsTo @@ -97,7 +97,7 @@ class CurrencyExchangeRate extends Model } /** - + * @return BelongsTo */ public function user(): BelongsTo diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index c1a710d78b..240e2c9d20 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -91,7 +91,7 @@ class RecurrenceRepetition extends Model /** * @return BelongsTo - + */ public function recurrence(): BelongsTo { diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index c29f57376a..ba09af0f26 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -112,7 +112,7 @@ class RecurrenceTransaction extends Model protected $table = 'recurrences_transactions'; /** - + * @return BelongsTo */ public function destinationAccount(): BelongsTo @@ -121,7 +121,7 @@ class RecurrenceTransaction extends Model } /** - + * @return BelongsTo */ public function foreignCurrency(): BelongsTo @@ -131,7 +131,7 @@ class RecurrenceTransaction extends Model /** * @return BelongsTo - + */ public function recurrence(): BelongsTo { @@ -140,7 +140,7 @@ class RecurrenceTransaction extends Model /** * @return HasMany - + */ public function recurrenceTransactionMeta(): HasMany { @@ -148,7 +148,7 @@ class RecurrenceTransaction extends Model } /** - + * @return BelongsTo */ public function sourceAccount(): BelongsTo @@ -157,7 +157,7 @@ class RecurrenceTransaction extends Model } /** - + * @return BelongsTo */ public function transactionCurrency(): BelongsTo @@ -166,7 +166,7 @@ class RecurrenceTransaction extends Model } /** - + * @return BelongsTo */ public function transactionType(): BelongsTo diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index b582eade6f..43085d48f5 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -80,7 +80,7 @@ class RecurrenceTransactionMeta extends Model /** * @return BelongsTo - + */ public function recurrenceTransaction(): BelongsTo { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 7b18c7a5f8..53d3eae91b 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -96,7 +96,7 @@ class TransactionType extends Model } /** - + * @return bool */ public function isDeposit(): bool @@ -105,7 +105,7 @@ class TransactionType extends Model } /** - + * @return bool */ public function isOpeningBalance(): bool @@ -114,7 +114,7 @@ class TransactionType extends Model } /** - + * @return bool */ public function isTransfer(): bool @@ -123,7 +123,7 @@ class TransactionType extends Model } /** - + * @return bool */ public function isWithdrawal(): bool @@ -132,7 +132,7 @@ class TransactionType extends Model } /** - + * @return HasMany */ public function transactionJournals(): HasMany diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index d74e54b225..66f2463374 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -195,7 +195,7 @@ class Webhook extends Model } /** - + * @return BelongsTo */ public function user(): BelongsTo @@ -204,7 +204,7 @@ class Webhook extends Model } /** - + * @return HasMany */ public function webhookMessages(): HasMany diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index 0b2d7e8730..ef7b5bb41d 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -37,7 +37,7 @@ class IsAssetAccountId implements Rule * Get the validation error message. This is not translated because only the API uses it. * * @return string - + */ public function message(): string { diff --git a/app/Rules/IsBoolean.php b/app/Rules/IsBoolean.php index 07f05a2fc6..0a68b4854e 100644 --- a/app/Rules/IsBoolean.php +++ b/app/Rules/IsBoolean.php @@ -34,7 +34,7 @@ class IsBoolean implements Rule /** * Get the validation error message. * - + * @return string */ public function message(): string diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index 5f73e9c314..6ac8f3b8c8 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -54,7 +54,7 @@ trait JournalServiceTrait * @param array $data * * @return Account|null - + * @throws FireflyException */ protected function getAccount(string $transactionType, string $direction, array $data): ?Account @@ -329,7 +329,7 @@ trait JournalServiceTrait * * @return string * @throws FireflyException - + */ protected function getAmount(string $amount): string { @@ -348,7 +348,7 @@ trait JournalServiceTrait * @param string|null $amount * * @return string|null - + */ protected function getForeignAmount(?string $amount): ?string { @@ -376,7 +376,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param NullArrayObject $data * - + */ protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void { @@ -400,7 +400,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param NullArrayObject $data * - + */ protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void { @@ -419,7 +419,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param string|null $notes * - + */ protected function storeNotes(TransactionJournal $journal, ?string $notes): void { @@ -448,7 +448,7 @@ trait JournalServiceTrait * @param TransactionJournal $journal * @param array|null $tags * - + */ protected function storeTags(TransactionJournal $journal, ?array $tags): void { diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index a27168563c..1bdc440ad4 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -83,7 +83,7 @@ class OperatorQuerySearch implements SearchInterface /** * OperatorQuerySearch constructor. * - + */ public function __construct() { @@ -115,7 +115,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function getModifiers(): Collection { @@ -124,7 +124,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function getOperators(): Collection { @@ -133,7 +133,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function getWordsAsString(): string { @@ -142,7 +142,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function hasModifiers(): bool { @@ -1992,7 +1992,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function searchTime(): float { @@ -2029,7 +2029,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function setPage(int $page): void { @@ -2039,7 +2039,7 @@ class OperatorQuerySearch implements SearchInterface /** * @inheritDoc - + */ public function setUser(User $user): void { diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index d12ab67752..09129156db 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -42,7 +42,7 @@ class BillTransformer extends AbstractTransformer /** * BillTransformer constructor. * - + */ public function __construct() { diff --git a/app/Transformers/V2/BudgetTransformer.php b/app/Transformers/V2/BudgetTransformer.php index 7b9e4b6dee..e7f0331e93 100644 --- a/app/Transformers/V2/BudgetTransformer.php +++ b/app/Transformers/V2/BudgetTransformer.php @@ -38,7 +38,7 @@ class BudgetTransformer extends AbstractTransformer /** * BudgetTransformer constructor. * - + */ public function __construct() { diff --git a/app/User.php b/app/User.php index 40dbbe3720..cc8878c38f 100644 --- a/app/User.php +++ b/app/User.php @@ -218,7 +218,7 @@ class User extends Authenticatable } /** - + * Link to accounts. * * @return HasMany @@ -229,7 +229,7 @@ class User extends Authenticatable } /** - + * Link to attachments * * @return HasMany @@ -240,7 +240,7 @@ class User extends Authenticatable } /** - + * Link to available budgets * * @return HasMany @@ -251,7 +251,7 @@ class User extends Authenticatable } /** - + * Link to bills. * * @return HasMany @@ -262,7 +262,7 @@ class User extends Authenticatable } /** - + * Link to budgets. * * @return HasMany @@ -273,7 +273,7 @@ class User extends Authenticatable } /** - + * Link to categories * * @return HasMany @@ -284,7 +284,7 @@ class User extends Authenticatable } /** - + * Link to currency exchange rates * * @return HasMany @@ -295,7 +295,7 @@ class User extends Authenticatable } /** - + * Generates access token. * * @return string @@ -353,7 +353,7 @@ class User extends Authenticatable } /** - + * * @return HasMany */ @@ -378,7 +378,7 @@ class User extends Authenticatable } /** - + * Link to object groups. * * @return HasMany @@ -389,7 +389,7 @@ class User extends Authenticatable } /** - + * Link to piggy banks. * * @return HasManyThrough @@ -400,7 +400,7 @@ class User extends Authenticatable } /** - + * Link to preferences. * * @return HasMany @@ -411,7 +411,7 @@ class User extends Authenticatable } /** - + * Link to recurring transactions. * * @return HasMany @@ -462,7 +462,7 @@ class User extends Authenticatable } /** - + * Link to roles. * * @return BelongsToMany @@ -497,7 +497,7 @@ class User extends Authenticatable } /** - + * Link to rule groups. * * @return HasMany @@ -508,7 +508,7 @@ class User extends Authenticatable } /** - + * Link to rules. * * @return HasMany @@ -519,7 +519,7 @@ class User extends Authenticatable } /** - + * Send the password reset notification. * * @param string $token @@ -559,7 +559,7 @@ class User extends Authenticatable } /** - + * Link to tags. * * @return HasMany @@ -570,7 +570,7 @@ class User extends Authenticatable } /** - + * Link to transaction groups. * * @return HasMany @@ -581,7 +581,7 @@ class User extends Authenticatable } /** - + * Link to transaction journals. * * @return HasMany @@ -592,7 +592,7 @@ class User extends Authenticatable } /** - + * Link to transactions. * * @return HasManyThrough @@ -603,7 +603,7 @@ class User extends Authenticatable } /** - + * @return BelongsTo */ public function userGroup(): BelongsTo @@ -612,7 +612,7 @@ class User extends Authenticatable } /** - + * * Link to webhooks *