From f53923f16c1a6923e8690da819ecd5a7c793d740 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Oct 2022 14:24:28 +0100 Subject: [PATCH] Use PSR-12 code style --- .../Controllers/Chart/PiggyBankController.php | 4 +- .../Controllers/Chart/ReportController.php | 8 +-- .../Controllers/Chart/TagReportController.php | 3 +- .../Chart/TransactionController.php | 11 ++- .../Controllers/Export/IndexController.php | 2 - .../Json/AutoCompleteController.php | 2 - app/Http/Controllers/Json/BoxController.php | 5 +- .../Controllers/Json/BudgetController.php | 1 - .../Controllers/Json/FrontpageController.php | 2 - app/Http/Controllers/Json/IntroController.php | 3 - .../Controllers/Json/ReconcileController.php | 2 - .../Controllers/Json/RecurrenceController.php | 2 +- app/Http/Controllers/Json/RuleController.php | 3 - .../ObjectGroup/DeleteController.php | 1 - .../ObjectGroup/EditController.php | 2 - .../ObjectGroup/IndexController.php | 1 - .../PiggyBank/AmountController.php | 1 - .../PiggyBank/CreateController.php | 2 - .../PiggyBank/DeleteController.php | 1 - .../Controllers/PiggyBank/EditController.php | 3 - .../Controllers/PiggyBank/IndexController.php | 4 +- .../Controllers/PiggyBank/ShowController.php | 2 +- .../Recurring/DeleteController.php | 1 - .../Controllers/Recurring/EditController.php | 13 +++- .../Controllers/Recurring/IndexController.php | 4 +- .../Controllers/Recurring/ShowController.php | 2 +- .../Controllers/Report/AccountController.php | 4 +- .../Controllers/Report/BalanceController.php | 1 - .../Controllers/Report/BillController.php | 4 +- .../Controllers/Report/BudgetController.php | 5 +- .../Controllers/Report/CategoryController.php | 13 +--- .../Controllers/Report/DoubleController.php | 4 -- .../Report/OperationsController.php | 9 +-- app/Http/Controllers/Report/TagController.php | 4 -- .../Controllers/Rule/CreateController.php | 5 +- .../Controllers/Rule/DeleteController.php | 1 - app/Http/Controllers/Rule/EditController.php | 6 +- app/Http/Controllers/Rule/IndexController.php | 1 - .../Controllers/Rule/SelectController.php | 8 +-- .../RuleGroup/CreateController.php | 2 - .../RuleGroup/DeleteController.php | 1 - .../Controllers/RuleGroup/EditController.php | 3 - .../System/HealthcheckController.php | 2 - .../Controllers/System/InstallController.php | 2 +- .../Transaction/BulkController.php | 2 +- .../Transaction/ConvertController.php | 4 -- .../Transaction/DeleteController.php | 12 ++-- .../Transaction/EditController.php | 10 ++- .../Transaction/IndexController.php | 4 +- .../Transaction/MassController.php | 1 - .../Transaction/ShowController.php | 5 +- .../Controllers/Webhooks/CreateController.php | 2 - .../Controllers/Webhooks/DeleteController.php | 1 - .../Controllers/Webhooks/EditController.php | 1 - .../Controllers/Webhooks/IndexController.php | 3 - .../Controllers/Webhooks/ShowController.php | 1 - app/Http/Middleware/Authenticate.php | 9 +-- app/Http/Middleware/Installer.php | 4 +- app/Http/Middleware/InterestingMessage.php | 4 -- app/Http/Middleware/Range.php | 1 - app/Http/Requests/AccountFormRequest.php | 4 +- app/Http/Requests/AttachmentFormRequest.php | 3 +- app/Http/Requests/BillStoreRequest.php | 3 +- app/Http/Requests/BillUpdateRequest.php | 3 +- app/Http/Requests/BudgetFormStoreRequest.php | 5 +- app/Http/Requests/BudgetFormUpdateRequest.php | 4 +- app/Http/Requests/BulkEditJournalRequest.php | 4 +- app/Http/Requests/CategoryFormRequest.php | 3 +- app/Http/Requests/CurrencyFormRequest.php | 3 +- app/Http/Requests/EmailFormRequest.php | 3 +- app/Http/Requests/InviteUserFormRequest.php | 3 +- app/Http/Requests/JournalLinkRequest.php | 3 +- app/Http/Requests/LinkTypeFormRequest.php | 3 +- app/Http/Requests/NewUserFormRequest.php | 3 +- app/Http/Requests/ObjectGroupFormRequest.php | 3 +- app/Http/Requests/PiggyBankStoreRequest.php | 3 +- app/Http/Requests/PiggyBankUpdateRequest.php | 3 +- .../Requests/ReconciliationStoreRequest.php | 5 +- app/Http/Requests/RecurrenceFormRequest.php | 7 +- app/Http/Requests/ReportFormRequest.php | 10 +-- app/Http/Requests/RuleFormRequest.php | 4 +- app/Http/Requests/RuleGroupFormRequest.php | 5 +- app/Http/Requests/TagFormRequest.php | 5 +- app/Http/Requests/TestRuleFormRequest.php | 3 +- app/Http/Requests/UserFormRequest.php | 3 +- app/Jobs/CreateAutoBudgetLimits.php | 7 +- app/Jobs/CreateRecurringTransactions.php | 17 ++--- app/Jobs/DownloadExchangeRates.php | 8 ++- app/Jobs/MailError.php | 3 +- app/Jobs/SendWebhookMessage.php | 5 +- app/Jobs/WarnAboutBills.php | 7 +- app/Mail/AccessTokenCreatedMail.php | 4 +- app/Mail/AdminTestMail.php | 4 +- app/Mail/BillWarningMail.php | 3 +- app/Mail/ConfirmEmailChangeMail.php | 3 +- app/Mail/InvitationMail.php | 3 +- app/Mail/NewIPAddressWarningMail.php | 3 +- app/Mail/OAuthTokenCreatedMail.php | 3 +- app/Mail/RegisteredUser.php | 3 +- app/Mail/ReportNewJournalsMail.php | 3 +- app/Mail/RequestedNewPassword.php | 3 +- app/Mail/UndoEmailChangeMail.php | 3 +- app/Models/Account.php | 7 +- app/Models/Attachment.php | 2 +- app/Models/AutoBudget.php | 3 +- app/Models/AvailableBudget.php | 2 +- app/Models/Bill.php | 6 +- app/Models/Budget.php | 2 +- app/Models/BudgetLimit.php | 4 +- app/Models/Category.php | 2 +- app/Models/LinkType.php | 2 +- app/Models/Location.php | 2 - app/Models/ObjectGroup.php | 2 +- app/Models/PiggyBank.php | 2 +- app/Models/PiggyBankEvent.php | 2 +- app/Models/PiggyBankRepetition.php | 2 +- app/Models/Preference.php | 4 +- app/Models/Recurrence.php | 3 +- app/Models/RecurrenceMeta.php | 1 - app/Models/RecurrenceRepetition.php | 4 +- app/Models/RecurrenceTransactionMeta.php | 1 - app/Models/Rule.php | 2 +- app/Models/RuleGroup.php | 2 +- app/Models/Tag.php | 2 +- app/Models/Transaction.php | 7 +- app/Models/TransactionCurrency.php | 2 +- app/Models/TransactionGroup.php | 3 +- app/Models/TransactionJournal.php | 5 +- app/Models/TransactionJournalLink.php | 2 +- app/Models/TransactionType.php | 2 +- app/Models/Webhook.php | 2 +- app/Models/WebhookAttempt.php | 2 +- app/Models/WebhookMessage.php | 3 +- app/Notifications/Admin/TestNotification.php | 4 +- app/Notifications/Admin/UserInvitation.php | 4 +- app/Notifications/Admin/UserRegistration.php | 5 +- .../Admin/VersionCheckResult.php | 6 +- app/Notifications/User/BillReminder.php | 4 +- app/Notifications/User/NewAccessToken.php | 4 +- .../User/TransactionCreation.php | 2 +- app/Notifications/User/UserLogin.php | 6 +- app/Notifications/User/UserNewPassword.php | 2 +- app/Notifications/User/UserRegistration.php | 3 +- app/Providers/AppServiceProvider.php | 1 - app/Providers/AuthServiceProvider.php | 14 ++-- app/Providers/BudgetServiceProvider.php | 1 - app/Providers/EventServiceProvider.php | 4 +- app/Providers/FireflyServiceProvider.php | 20 +++--- app/Providers/RecurringServiceProvider.php | 1 - app/Providers/RouteServiceProvider.php | 3 - .../Account/AccountRepository.php | 14 ++-- .../Account/OperationsRepository.php | 70 ++++++++++++------- .../Account/OperationsRepositoryInterface.php | 42 ++++++++--- .../Attachment/AttachmentRepository.php | 2 +- .../AttachmentRepositoryInterface.php | 1 - .../AuditLogEntry/ALERepository.php | 2 +- app/Repositories/Bill/BillRepository.php | 18 ++--- .../Bill/BillRepositoryInterface.php | 1 - .../Budget/AvailableBudgetRepository.php | 4 +- .../AvailableBudgetRepositoryInterface.php | 2 - .../Budget/BudgetLimitRepository.php | 17 +++-- .../Budget/BudgetLimitRepositoryInterface.php | 2 - app/Repositories/Budget/BudgetRepository.php | 24 +++---- .../Budget/BudgetRepositoryInterface.php | 2 - .../Budget/NoBudgetRepository.php | 2 - .../Budget/NoBudgetRepositoryInterface.php | 1 - .../Budget/OperationsRepository.php | 13 ++-- .../Budget/OperationsRepositoryInterface.php | 9 ++- .../Category/CategoryRepository.php | 3 +- .../Category/CategoryRepositoryInterface.php | 1 - .../Category/NoCategoryRepository.php | 2 - .../Category/OperationsRepository.php | 4 -- .../Currency/CurrencyRepository.php | 5 +- .../Journal/JournalCLIRepository.php | 13 ++-- .../Journal/JournalCLIRepositoryInterface.php | 1 - .../Journal/JournalRepository.php | 4 +- .../LinkType/LinkTypeRepository.php | 12 ++-- .../ObjectGroup/ObjectGroupRepository.php | 1 - .../ObjectGroupRepositoryInterface.php | 1 - .../PiggyBank/ModifiesPiggyBanks.php | 7 +- .../PiggyBank/PiggyBankRepository.php | 4 +- .../Recurring/RecurringRepository.php | 30 ++++---- .../RecurringRepositoryInterface.php | 1 - app/Repositories/Rule/RuleRepository.php | 15 ++-- .../RuleGroupRepositoryInterface.php | 1 - app/Repositories/Tag/TagRepository.php | 4 +- .../Tag/TagRepositoryInterface.php | 1 - 187 files changed, 429 insertions(+), 482 deletions(-) diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index 44c45a5fc4..8a054f9ac9 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -69,7 +69,7 @@ class PiggyBankController extends Controller public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('chart.piggy-bank.history'); $cache->addProperty($piggyBank->id); if ($cache->has()) { @@ -84,7 +84,7 @@ class PiggyBankController extends Controller /** @var PiggyBankEvent $firstEvent */ $firstEvent = $set->first(); - $firstDate = null === $firstEvent ? new Carbon : $firstEvent->date; + $firstDate = null === $firstEvent ? new Carbon() : $firstEvent->date; // which ever is older: $oldest = $startDate->lt($firstDate) ? $startDate : $firstDate; diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index ed66a56852..40afb071fb 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -43,7 +43,8 @@ use Log; */ class ReportController extends Controller { - use BasicDataSupport, ChartGeneration; + use BasicDataSupport; + use ChartGeneration; /** @var GeneratorInterface Chart generation methods. */ protected $generator; @@ -74,7 +75,7 @@ class ReportController extends Controller public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('chart.report.net-worth'); $cache->addProperty($start); $cache->addProperty(implode(',', $accounts->pluck('id')->toArray())); @@ -125,7 +126,6 @@ class ReportController extends Controller ]; } $chartData[$currencyId]['entries'][$label] = $netWorthItem['balance']; - } $current->addDays(7); } @@ -149,7 +149,7 @@ class ReportController extends Controller public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('chart.report.operations'); $cache->addProperty($start); $cache->addProperty($accounts); diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index 479d9a2946..1828b887cb 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -37,7 +37,8 @@ use Illuminate\Support\Collection; */ class TagReportController extends Controller { - use AugumentData, TransactionCalculation; + use AugumentData; + use TransactionCalculation; /** @var GeneratorInterface Chart generation methods. */ protected $generator; diff --git a/app/Http/Controllers/Chart/TransactionController.php b/app/Http/Controllers/Chart/TransactionController.php index 6aae2bf3db..01be7f6fe8 100644 --- a/app/Http/Controllers/Chart/TransactionController.php +++ b/app/Http/Controllers/Chart/TransactionController.php @@ -39,7 +39,6 @@ use JsonException; */ class TransactionController extends Controller { - /** @var GeneratorInterface Chart generation methods. */ protected $generator; @@ -60,7 +59,7 @@ class TransactionController extends Controller */ public function budgets(Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('chart.transactions.budgets'); @@ -104,7 +103,7 @@ class TransactionController extends Controller */ public function categories(string $objectType, Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty($objectType); @@ -144,7 +143,6 @@ class TransactionController extends Controller 'currency_code' => $journal['currency_code'], ]; $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); - } $chart = $this->generator->multiCurrencyPieChart($data); $cache->store($chart); @@ -162,7 +160,7 @@ class TransactionController extends Controller */ public function destinationAccounts(string $objectType, Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty($objectType); @@ -219,7 +217,7 @@ class TransactionController extends Controller */ public function sourceAccounts(string $objectType, Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty($objectType); @@ -259,7 +257,6 @@ class TransactionController extends Controller 'currency_code' => $journal['currency_code'], ]; $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); - } $chart = $this->generator->multiCurrencyPieChart($data); $cache->store($chart); diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php index f21893777e..7d1a5fc1c9 100644 --- a/app/Http/Controllers/Export/IndexController.php +++ b/app/Http/Controllers/Export/IndexController.php @@ -38,7 +38,6 @@ use Illuminate\View\View; */ class IndexController extends Controller { - private JournalRepositoryInterface $journalRepository; /** @@ -112,5 +111,4 @@ class IndexController extends Controller { return view('export.index'); } - } diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 86bd5603b2..331514e7d2 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -29,6 +29,4 @@ use FireflyIII\Http\Controllers\Controller; */ class AutoCompleteController extends Controller { - - } diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 3c0873af56..15ea0675d0 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -67,7 +67,7 @@ class BoxController extends Controller $display = 2; // see method docs. $boxTitle = (string) trans('firefly.spent'); - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty($today); @@ -138,7 +138,7 @@ class BoxController extends Controller $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('box-balance'); @@ -261,5 +261,4 @@ class BoxController extends Controller return response()->json($return); } - } diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index 3d54ebd572..14e1129ffa 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -113,5 +113,4 @@ class BudgetController extends Controller ] ); } - } diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php index 1f6a0902f8..5ea174dd99 100644 --- a/app/Http/Controllers/Json/FrontpageController.php +++ b/app/Http/Controllers/Json/FrontpageController.php @@ -70,12 +70,10 @@ class FrontpageController extends Controller if (!empty($info)) { try { $html = view('json.piggy-banks', compact('info'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage())); $html = 'Could not render view.'; } - } return response()->json(['html' => $html]); diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 1c6c796bc5..f8791a6c9d 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -55,7 +55,6 @@ class IntroController extends Controller return response()->json($steps); } if ($this->hasOutroStep($route)) { - // save last step: $lastStep = $steps[count($steps) - 1]; // remove last step: @@ -63,7 +62,6 @@ class IntroController extends Controller // merge arrays and add last step again $steps = array_merge($steps, $specificSteps); $steps[] = $lastStep; - } if (!$this->hasOutroStep($route)) { $steps = array_merge($steps, $specificSteps); @@ -142,5 +140,4 @@ class IntroController extends Controller return response()->json(['result' => sprintf('Reported demo watched for route "%s" (%s): %s.', $route, $specialPage, $key)]); } - } diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 5968f060e4..7c8426f9ca 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -161,7 +161,6 @@ class ReconcileController extends Controller 'selectedIds' ) )->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('View error: %s', $e->getMessage())); $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage()); @@ -262,7 +261,6 @@ class ReconcileController extends Controller 'accounts.reconcile.transactions', compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd') )->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render: %s', $e->getMessage())); $html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage()); diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 01b5e56212..d5e56ccdfa 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -97,7 +97,7 @@ class RecurrenceController extends Controller $repetitionMoment = explode(',', $request->get('type'))[1] ?? '2018-01-01'; } $actualStart->startOfDay(); - $repetition = new RecurrenceRepetition; + $repetition = new RecurrenceRepetition(); $repetition->repetition_type = $repetitionType; $repetition->repetition_moment = $repetitionMoment; $repetition->repetition_skip = (int) $request->get('skip'); diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.php index 63d6f5487e..c41d856ec4 100644 --- a/app/Http/Controllers/Json/RuleController.php +++ b/app/Http/Controllers/Json/RuleController.php @@ -51,7 +51,6 @@ class RuleController extends Controller } try { $view = view('rules.partials.action', compact('actions', 'count'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage())); $view = 'Could not render view.'; @@ -74,7 +73,6 @@ class RuleController extends Controller $triggers = []; foreach ($operators as $key => $operator) { if ('user_action' !== $key && false === $operator['alias']) { - $triggers[$key] = (string) trans(sprintf('firefly.rule_trigger_%s_choice', $key)); } } @@ -89,5 +87,4 @@ class RuleController extends Controller return response()->json(['html' => $view]); } - } diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index 00b6f521b3..367ea85a53 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -92,5 +92,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUrl('object-groups.delete.url')); } - } diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index 7771052f50..55c0f21366 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -101,11 +101,9 @@ class EditController extends Controller $redirect = redirect($this->getPreviousUrl('object-groups.edit.url')); if (1 === (int) $request->get('return_to_edit')) { - session()->put('object-groups.edit.fromUpdate', true); $redirect = redirect(route('object-groups.edit', [$piggyBank->id])); - } return $redirect; diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index 918535cd13..def792d0df 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -88,5 +88,4 @@ class IndexController extends Controller return response()->json([]); } - } diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index 0489c76a12..8546255405 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -40,7 +40,6 @@ use Log; */ class AmountController extends Controller { - private AccountRepositoryInterface $accountRepos; private PiggyBankRepositoryInterface $piggyRepos; diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index 80a59610c7..c0da9bd1b7 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -118,11 +118,9 @@ class CreateController extends Controller $redirect = redirect($this->getPreviousUrl('piggy-banks.create.url')); if (1 === (int) $request->get('create_another')) { - session()->put('piggy-banks.create.fromStore', true); $redirect = redirect(route('piggy-banks.create'))->withInput(); - } return $redirect; diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index b4f374e7c5..4fdcf47e83 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -36,7 +36,6 @@ use Illuminate\View\View; */ class DeleteController extends Controller { - private PiggyBankRepositoryInterface $piggyRepos; /** diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index ad8337f00c..f9cbaf57f2 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -141,14 +141,11 @@ class EditController extends Controller $redirect = redirect($this->getPreviousUrl('piggy-banks.edit.url')); if (1 === (int) $request->get('return_to_edit')) { - session()->put('piggy-banks.edit.fromUpdate', true); $redirect = redirect(route('piggy-banks.edit', [$piggyBank->id])); - } return $redirect; } - } diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index b8b33b64a0..c931c108b4 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -88,7 +88,7 @@ class IndexController extends Controller $end = session('end', Carbon::now()->endOfMonth()); // transform piggies using the transformer: - $parameters = new ParameterBag; + $parameters = new ParameterBag(); $parameters->set('end', $end); // make piggy bank groups: @@ -96,7 +96,7 @@ class IndexController extends Controller /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); - $transformer->setParameters(new ParameterBag); + $transformer->setParameters(new ParameterBag()); /** @var AccountTransformer $accountTransformer */ $accountTransformer = app(AccountTransformer::class); diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php index 6aba89dfdd..a73b59f409 100644 --- a/app/Http/Controllers/PiggyBank/ShowController.php +++ b/app/Http/Controllers/PiggyBank/ShowController.php @@ -73,7 +73,7 @@ class ShowController extends Controller /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); // transform piggies using the transformer: - $parameters = new ParameterBag; + $parameters = new ParameterBag(); $parameters->set('end', $end); /** @var PiggyBankTransformer $transformer */ diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index 712555899f..8de42d9b6f 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -97,5 +97,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUrl('recurrences.delete.url')); } - } diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 52a3599d18..e9bd8982f5 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -97,7 +97,7 @@ class EditController extends Controller /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); - $transformer->setParameters(new ParameterBag); + $transformer->setParameters(new ParameterBag()); $array = $transformer->transform($recurrence); $budgets = app('expandedform')->makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets()); @@ -151,8 +151,15 @@ class EditController extends Controller return view( 'recurring.edit', compact( - 'recurrence', 'array', 'bills', - 'weekendResponses', 'budgets', 'preFilled', 'currentRepType', 'repetitionEnd', 'repetitionEnds' + 'recurrence', + 'array', + 'bills', + 'weekendResponses', + 'budgets', + 'preFilled', + 'currentRepType', + 'repetitionEnd', + 'repetitionEnds' ) ); } diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index fb980a7010..9f6260ac2c 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -92,12 +92,11 @@ class IndexController extends Controller /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); - $transformer->setParameters(new ParameterBag); + $transformer->setParameters(new ParameterBag()); $recurring = []; /** @var Recurrence $recurrence */ foreach ($recurrences as $recurrence) { - $year->addYear(); if ($recurrence->first_date > $today) { $today = clone $recurrence->first_date; @@ -128,5 +127,4 @@ class IndexController extends Controller return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total')); } - } diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php index 94b94afcd9..8c9ff0b250 100644 --- a/app/Http/Controllers/Recurring/ShowController.php +++ b/app/Http/Controllers/Recurring/ShowController.php @@ -80,7 +80,7 @@ class ShowController extends Controller { /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); - $transformer->setParameters(new ParameterBag); + $transformer->setParameters(new ParameterBag()); $array = $transformer->transform($recurrence); $groups = $this->recurring->getTransactions($recurrence); diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php index b3485536c8..03d73c7625 100644 --- a/app/Http/Controllers/Report/AccountController.php +++ b/app/Http/Controllers/Report/AccountController.php @@ -36,7 +36,6 @@ use Throwable; */ class AccountController extends Controller { - /** * Show partial overview for account balances. * @@ -49,7 +48,7 @@ class AccountController extends Controller public function general(Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('account-report'); @@ -63,7 +62,6 @@ class AccountController extends Controller $accountReport = $accountTasker->getAccountReport($accounts, $start, $end); try { $result = view('reports.partials.accounts', compact('accountReport'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage())); $result = 'Could not render view.'; diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index b4c6b37f7b..504a5715c1 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -137,7 +137,6 @@ class BalanceController extends Controller } try { $result = view('reports.partials.balance', compact('report'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage())); $result = 'Could not render view.'; diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.php index d374020f13..f9194c0b4d 100644 --- a/app/Http/Controllers/Report/BillController.php +++ b/app/Http/Controllers/Report/BillController.php @@ -46,7 +46,7 @@ class BillController extends Controller */ public function overview(Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('bill-report'); @@ -59,7 +59,6 @@ class BillController extends Controller $report = $helper->getBillReport($accounts, $start, $end); try { $result = view('reports.partials.bills', compact('report'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage())); $result = 'Could not render view.'; @@ -68,6 +67,5 @@ class BillController extends Controller $cache->store($result); return $result; - } } diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 331396c26d..0a09509915 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -198,7 +198,6 @@ class BudgetController extends Controller try { $result = view('reports.budget.partials.avg-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -312,7 +311,7 @@ class BudgetController extends Controller */ public function period(Collection $accounts, Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('budget-period-report'); @@ -354,7 +353,6 @@ class BudgetController extends Controller } try { $result = view('reports.partials.budget-period', compact('report', 'periods'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = 'Could not render view.'; @@ -406,7 +404,6 @@ class BudgetController extends Controller try { $result = view('reports.budget.partials.top-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 945b0868a7..39a2c1af6d 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -312,7 +312,6 @@ class CategoryController extends Controller try { $result = view('reports.category.partials.avg-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -364,7 +363,6 @@ class CategoryController extends Controller try { $result = view('reports.category.partials.avg-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -493,7 +491,7 @@ class CategoryController extends Controller */ public function expenses(Collection $accounts, Carbon $start, Carbon $end) { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('category-period-expenses-report'); @@ -549,7 +547,6 @@ class CategoryController extends Controller try { $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage()); @@ -574,7 +571,7 @@ class CategoryController extends Controller */ public function income(Collection $accounts, Carbon $start, Carbon $end): string { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('category-period-income-report'); @@ -629,7 +626,6 @@ class CategoryController extends Controller try { $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage()); @@ -653,7 +649,7 @@ class CategoryController extends Controller public function operations(Collection $accounts, Carbon $start, Carbon $end): string { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('category-report'); @@ -723,7 +719,6 @@ class CategoryController extends Controller try { $result = view('reports.category.partials.top-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -773,7 +768,6 @@ class CategoryController extends Controller try { $result = view('reports.category.partials.top-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -781,5 +775,4 @@ class CategoryController extends Controller return $result; } - } diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php index 2262dd1554..b46ca85d95 100644 --- a/app/Http/Controllers/Report/DoubleController.php +++ b/app/Http/Controllers/Report/DoubleController.php @@ -111,7 +111,6 @@ class DoubleController extends Controller try { $result = view('reports.double.partials.avg-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -163,7 +162,6 @@ class DoubleController extends Controller try { $result = view('reports.double.partials.avg-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -457,7 +455,6 @@ class DoubleController extends Controller try { $result = view('reports.double.partials.top-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -507,7 +504,6 @@ class DoubleController extends Controller try { $result = view('reports.double.partials.top-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index aba2fd000b..189338dbd4 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -36,7 +36,6 @@ use Throwable; */ class OperationsController extends Controller { - /** @var AccountTaskerInterface Some specific account things. */ private $tasker; @@ -71,7 +70,7 @@ class OperationsController extends Controller public function expenses(Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('expense-report'); @@ -83,7 +82,6 @@ class OperationsController extends Controller $type = 'expense-entry'; try { $result = view('reports.partials.income-expenses', compact('report', 'type'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage())); $result = 'Could not render view.'; @@ -106,7 +104,7 @@ class OperationsController extends Controller public function income(Collection $accounts, Carbon $start, Carbon $end): string { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('income-report'); @@ -118,7 +116,6 @@ class OperationsController extends Controller $type = 'income-entry'; try { $result = view('reports.partials.income-expenses', compact('report', 'type'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage())); $result = 'Could not render view.'; @@ -141,7 +138,7 @@ class OperationsController extends Controller public function operations(Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty('inc-exp-report'); diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php index bf263bb2a5..2e8ffdf93a 100644 --- a/app/Http/Controllers/Report/TagController.php +++ b/app/Http/Controllers/Report/TagController.php @@ -305,7 +305,6 @@ class TagController extends Controller try { $result = view('reports.tag.partials.avg-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -357,7 +356,6 @@ class TagController extends Controller try { $result = view('reports.tag.partials.avg-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -515,7 +513,6 @@ class TagController extends Controller try { $result = view('reports.tag.partials.top-expenses', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); @@ -565,7 +562,6 @@ class TagController extends Controller try { $result = view('reports.tag.partials.top-income', compact('result'))->render(); - } catch (Throwable $e) { // @phpstan-ignore-line Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); $result = sprintf('Could not render view: %s', $e->getMessage()); diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index 3f3ea7d123..b9cf7191bd 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -45,7 +45,8 @@ use Illuminate\View\View; */ class CreateController extends Controller { - use RuleManagement, ModelInformation; + use RuleManagement; + use ModelInformation; private RuleRepositoryInterface $ruleRepos; @@ -279,10 +280,8 @@ class CreateController extends Controller $redirect = redirect($this->getPreviousUrl('rules.create.url')); if (1 === (int) $request->get('create_another')) { - session()->put('rules.create.fromStore', true); $redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput(); - } return $redirect; diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index 6d8cf7471b..2a74e7555f 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -93,5 +93,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUrl('rules.delete.url')); } - } diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index 407c5694f3..995a2294e4 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -44,7 +44,8 @@ use Throwable; */ class EditController extends Controller { - use RuleManagement, RenderPartialViews; + use RuleManagement; + use RenderPartialViews; private RuleRepositoryInterface $ruleRepos; @@ -149,7 +150,6 @@ class EditController extends Controller $triggers = []; foreach ($operators as $key => $operator) { if ('user_action' !== $key && false === $operator['alias']) { - $triggers[$key] = (string) trans(sprintf('firefly.rule_trigger_%s_choice', $key)); } } @@ -196,11 +196,9 @@ class EditController extends Controller app('preferences')->mark(); $redirect = redirect($this->getPreviousUrl('rules.edit.url')); if (1 === (int) $request->get('return_to_edit')) { - session()->put('rules.edit.fromUpdate', true); $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); - } return $redirect; diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php index ee3f33ed3a..7323dec1c5 100644 --- a/app/Http/Controllers/Rule/IndexController.php +++ b/app/Http/Controllers/Rule/IndexController.php @@ -106,5 +106,4 @@ class IndexController extends Controller return redirect($route); } - } diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index 999b46343c..a3ff6c8e47 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -136,8 +136,8 @@ class SelectController extends Controller public function testTriggers(TestRuleFormRequest $request): JsonResponse { // build fake rule - $rule = new Rule; - $triggers = new Collection; + $rule = new Rule(); + $triggers = new Collection(); $rule->strict = '1' === $request->get('strict'); // build trigger array from response @@ -149,7 +149,7 @@ class SelectController extends Controller } foreach ($textTriggers as $textTrigger) { - $trigger = new RuleTrigger; + $trigger = new RuleTrigger(); $trigger->trigger_type = $textTrigger['type']; $trigger->trigger_value = $textTrigger['value']; $triggers->push($trigger); @@ -176,7 +176,6 @@ class SelectController extends Controller $view = 'ERROR, see logs.'; try { $view = view('list.journals-array-tiny', ['groups' => $collection])->render(); - } catch (Throwable $exception) { // @phpstan-ignore-line Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); @@ -219,7 +218,6 @@ class SelectController extends Controller $view = 'ERROR, see logs.'; try { $view = view('list.journals-array-tiny', ['groups' => $collection])->render(); - } catch (Throwable $exception) { // @phpstan-ignore-line Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php index f57446bec5..55c91fdd1f 100644 --- a/app/Http/Controllers/RuleGroup/CreateController.php +++ b/app/Http/Controllers/RuleGroup/CreateController.php @@ -96,11 +96,9 @@ class CreateController extends Controller $redirect = redirect($this->getPreviousUrl('rule-groups.create.url')); if (1 === (int) $request->get('create_another')) { - session()->put('rule-groups.create.fromStore', true); $redirect = redirect(route('rule-groups.create'))->withInput(); - } return $redirect; diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php index fbe0116b7b..fdc92c527c 100644 --- a/app/Http/Controllers/RuleGroup/DeleteController.php +++ b/app/Http/Controllers/RuleGroup/DeleteController.php @@ -99,5 +99,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUrl('rule-groups.delete.url')); } - } diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index a6bbf7ce67..1449fa1a5f 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -142,15 +142,12 @@ class EditController extends Controller app('preferences')->mark(); $redirect = redirect($this->getPreviousUrl('rule-groups.edit.url')); if (1 === (int) $request->get('return_to_edit')) { - session()->put('rule-groups.edit.fromUpdate', true); $redirect = redirect(route('rule-groups.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); - } // redirect to previous URL. return $redirect; } - } diff --git a/app/Http/Controllers/System/HealthcheckController.php b/app/Http/Controllers/System/HealthcheckController.php index dd5c24cf82..7455aa5cc4 100644 --- a/app/Http/Controllers/System/HealthcheckController.php +++ b/app/Http/Controllers/System/HealthcheckController.php @@ -39,6 +39,4 @@ class HealthcheckController extends Controller { return response('OK', 200); } - } - diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 652667857c..94d0257c84 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -229,7 +229,7 @@ class InstallController extends Controller if (class_exists(LegacyRSA::class)) { // PHP 7 Log::info('Will run PHP7 code.'); - $keys = (new LegacyRSA)->createKey(4096); + $keys = (new LegacyRSA())->createKey(4096); } if (!class_exists(LegacyRSA::class)) { diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index d857813938..e946b1b03c 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -104,7 +104,7 @@ class BulkController extends Controller $ignoreCategory = 1 === (int) $request->get('ignore_category'); $ignoreBudget = 1 === (int) $request->get('ignore_budget'); $tagsAction = $request->get('tags_action'); - $collection = new Collection; + $collection = new Collection(); $count = 0; foreach ($journalIds as $journalId) { diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 797645a4bb..31785e03a2 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -167,10 +167,8 @@ class ConvertController extends Controller $role = 'l_' . $account->accountType->type; } if (AccountType::CASH === $account->accountType->type) { - $role = 'cash_account'; $name = sprintf('(%s)', trans('firefly.cash')); - } if (AccountType::REVENUE === $account->accountType->type) { $role = 'revenue_account'; @@ -208,10 +206,8 @@ class ConvertController extends Controller $role = 'l_' . $account->accountType->type; } if (AccountType::CASH === $account->accountType->type) { - $role = 'cash_account'; $name = sprintf('(%s)', trans('firefly.cash')); - } if (AccountType::EXPENSE === $account->accountType->type) { $role = 'expense_account'; diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 4e26cef71e..7e36632269 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -83,7 +83,7 @@ class DeleteController extends Controller $journal = $group->transactionJournals->first(); if (null === $journal) { - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); $subTitle = (string) trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]); @@ -110,7 +110,7 @@ class DeleteController extends Controller $journal = $group->transactionJournals->first(); if (null === $journal) { - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); session()->flash('success', (string) trans('firefly.deleted_' . strtolower($objectType), ['description' => $group->title ?? $journal->description])); @@ -118,12 +118,12 @@ class DeleteController extends Controller // grab asset account(s) from group: $accounts = []; /** @var TransactionJournal $journal */ - foreach($group->transactionJournals as $journal) { + foreach ($group->transactionJournals as $journal) { /** @var Transaction $transaction */ - foreach($journal->transactions as $transaction) { + foreach ($journal->transactions as $transaction) { $type = $transaction->account->accountType->type; // if is valid liability, trigger event! - if(in_array($type, config('firefly.valid_liabilities'))) { + if (in_array($type, config('firefly.valid_liabilities'), true)) { $accounts[] = $transaction->account; } } @@ -135,7 +135,7 @@ class DeleteController extends Controller /** @var Account $account */ - foreach($accounts as $account) { + foreach ($accounts as $account) { Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); event(new UpdatedAccount($account)); } diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php index 03ae906813..6593c4f6fc 100644 --- a/app/Http/Controllers/Transaction/EditController.php +++ b/app/Http/Controllers/Transaction/EditController.php @@ -48,7 +48,6 @@ class EditController extends Controller // some useful repositories: $this->middleware( static function ($request, $next) { - app('view')->share('title', (string) trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-exchange'); @@ -88,10 +87,15 @@ class EditController extends Controller return view( 'transactions.edit', compact( - 'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency', + 'cash', + 'allowedSourceDests', + 'expectedSourceTypes', + 'transactionGroup', + 'allowedOpposingTypes', + 'accountToTypes', + 'defaultCurrency', 'previousUrl' ) ); } - } diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index 77808e48dd..dbd6dd594b 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -104,7 +104,7 @@ class IndexController extends Controller $subTitle = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]); $firstJournal = $this->repository->firstNull(); - $startPeriod = null === $firstJournal ? new Carbon : $firstJournal->date; + $startPeriod = null === $firstJournal ? new Carbon() : $firstJournal->date; $endPeriod = clone $end; $periods = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod); @@ -144,7 +144,7 @@ class IndexController extends Controller $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $path = route('transactions.index.all', [$objectType]); $first = $this->repository->firstNull(); - $start = null === $first ? new Carbon : $first->date; + $start = null === $first ? new Carbon() : $first->date; $last = $this->repository->getLast(); $end = $last ? $last->date : today(config('app.timezone')); $subTitle = (string) trans('firefly.all_' . $objectType); diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 0e68aecb63..cd7bc054fe 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -102,7 +102,6 @@ class MassController extends Controller if (is_array($ids)) { /** @var string $journalId */ foreach ($ids as $journalId) { - /** @var TransactionJournal $journal */ $journal = $this->repository->find((int) $journalId); if (null !== $journal && (int) $journalId === $journal->id) { diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php index 219af41d40..08bb352938 100644 --- a/app/Http/Controllers/Transaction/ShowController.php +++ b/app/Http/Controllers/Transaction/ShowController.php @@ -36,7 +36,6 @@ use Illuminate\Http\Request; use Illuminate\View\View; use Symfony\Component\HttpFoundation\ParameterBag; - /** * Class ShowController */ @@ -99,7 +98,7 @@ class ShowController extends Controller /** @var TransactionGroupTransformer $transformer */ $transformer = app(TransactionGroupTransformer::class); - $transformer->setParameters(new ParameterBag); + $transformer->setParameters(new ParameterBag()); $groupArray = $transformer->transformObject($transactionGroup); // do some calculations: @@ -112,7 +111,7 @@ class ShowController extends Controller // get audit log entries: $logEntries = []; - foreach($transactionGroup->transactionJournals as $journal) { + foreach ($transactionGroup->transactionJournals as $journal) { $logEntries[$journal->id] = $this->ALERepository->getForObject($journal); } diff --git a/app/Http/Controllers/Webhooks/CreateController.php b/app/Http/Controllers/Webhooks/CreateController.php index d2126ce7ad..daa58426f3 100644 --- a/app/Http/Controllers/Webhooks/CreateController.php +++ b/app/Http/Controllers/Webhooks/CreateController.php @@ -33,7 +33,6 @@ use Illuminate\View\View; */ class CreateController extends Controller { - /** * */ @@ -64,5 +63,4 @@ class CreateController extends Controller $previousUrl = $this->rememberPreviousUrl('webhooks.create.url'); return view('webhooks.create', compact('previousUrl')); } - } diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php index 28ccff6251..c3c57bfdcb 100644 --- a/app/Http/Controllers/Webhooks/DeleteController.php +++ b/app/Http/Controllers/Webhooks/DeleteController.php @@ -72,5 +72,4 @@ class DeleteController extends Controller return view('webhooks.delete', compact('webhook', 'subTitle')); } - } diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php index 829d7e45c3..f3cf0f80f2 100644 --- a/app/Http/Controllers/Webhooks/EditController.php +++ b/app/Http/Controllers/Webhooks/EditController.php @@ -73,5 +73,4 @@ class EditController extends Controller return view('webhooks.edit', compact('webhook', 'subTitle')); } - } diff --git a/app/Http/Controllers/Webhooks/IndexController.php b/app/Http/Controllers/Webhooks/IndexController.php index 76cbf4f3a2..801201ba7f 100644 --- a/app/Http/Controllers/Webhooks/IndexController.php +++ b/app/Http/Controllers/Webhooks/IndexController.php @@ -35,7 +35,6 @@ use Illuminate\View\View; */ class IndexController extends Controller { - /** * */ @@ -63,8 +62,6 @@ class IndexController extends Controller */ public function index(Request $request) { - return view('webhooks.index'); } - } diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php index 6437201f1f..344132dc69 100644 --- a/app/Http/Controllers/Webhooks/ShowController.php +++ b/app/Http/Controllers/Webhooks/ShowController.php @@ -72,5 +72,4 @@ class ShowController extends Controller return view('webhooks.show', compact('webhook', 'subTitle')); } - } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 67e3539bba..6c6402b496 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -87,12 +87,10 @@ class Authenticate */ protected function authenticate($request, array $guards) { - if (empty($guards)) { try { // go for default guard: if ($this->auth->check()) { - // do an extra check on user object. /** @var User $user */ $user = $this->auth->authenticate(); @@ -108,14 +106,14 @@ class Authenticate } } } catch (QueryException $e) { - throw new FireflyException( sprintf( 'It seems the database has not yet been initialized. Did you run the correct upgrade or installation commands? Error: %s', $e->getMessage() - ), 0, $e + ), + 0, + $e ); - } return $this->auth->authenticate(); @@ -129,6 +127,5 @@ class Authenticate } throw new AuthenticationException('Unauthenticated.', $guards); - } } diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index 4a25d79114..a8edae08ae 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -96,7 +96,9 @@ class Installer Log::error(sprintf('Error message trying to access users-table: %s', $message)); if ($this->isAccessDenied($message)) { throw new FireflyException( - 'It seems your database configuration is not correct. Please verify the username and password in your .env file.', 0, $e + 'It seems your database configuration is not correct. Please verify the username and password in your .env file.', + 0, + $e ); } if ($this->noTablesExist($message)) { diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.php index 23189cd724..88759d928f 100644 --- a/app/Http/Middleware/InterestingMessage.php +++ b/app/Http/Middleware/InterestingMessage.php @@ -100,7 +100,6 @@ class InterestingMessage */ private function handleGroupMessage(Request $request): void { - // get parameters from request. $transactionGroupId = $request->get('transaction_group_id'); $message = $request->get('message'); @@ -156,7 +155,6 @@ class InterestingMessage */ private function handleAccountMessage(Request $request): void { - // get parameters from request. $accountId = $request->get('account_id'); $message = $request->get('message'); @@ -210,7 +208,6 @@ class InterestingMessage */ private function handleBillMessage(Request $request): void { - // get parameters from request. $billId = $request->get('bill_id'); $message = $request->get('message'); @@ -234,7 +231,6 @@ class InterestingMessage */ private function handleWebhookMessage(Request $request): void { - // get parameters from request. $webhookId = $request->get('webhook_id'); $message = $request->get('message'); diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 45351ff4bf..8d1313f7a8 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -56,7 +56,6 @@ class Range // set more view variables: $this->configureList(); - } return $next($request); diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 2fe34b6dd8..af65b69f1d 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -35,7 +35,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class AccountFormRequest extends FormRequest { - use ConvertsDataTypes, AppendsLocationData, ChecksLogin; + use ConvertsDataTypes; + use AppendsLocationData; + use ChecksLogin; /** * Get all data. diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index dd03ba124b..11dfbcf69f 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class AttachmentFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index da1b3d9a6a..596bff95d8 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class BillStoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index f48cde128c..003feec81b 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class BillUpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index 065a607a4b..4dfa42224d 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -34,7 +34,9 @@ use Illuminate\Validation\Validator; */ class BudgetFormStoreRequest extends FormRequest { - use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin; + use ConvertsDataTypes; + use ValidatesAutoBudgetRequest; + use ChecksLogin; /** * Returns the data required by the controller. @@ -86,5 +88,4 @@ class BudgetFormStoreRequest extends FormRequest } ); } - } diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 700cbfff4a..803d9433d6 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -35,7 +35,9 @@ use Illuminate\Validation\Validator; */ class BudgetFormUpdateRequest extends FormRequest { - use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin; + use ConvertsDataTypes; + use ValidatesAutoBudgetRequest; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BulkEditJournalRequest.php b/app/Http/Requests/BulkEditJournalRequest.php index 4b33e75431..8457483917 100644 --- a/app/Http/Requests/BulkEditJournalRequest.php +++ b/app/Http/Requests/BulkEditJournalRequest.php @@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class BulkEditJournalRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Rules for this request. @@ -40,7 +41,6 @@ class BulkEditJournalRequest extends FormRequest */ public function rules(): array { - // fixed return [ 'journals.*' => 'required|belongsToUser:transaction_journals,id', diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 9ce60cbb11..d22cadddad 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class CategoryFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get information for the controller. diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index d2b1a8dc62..a3b50f5599 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class CurrencyFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/EmailFormRequest.php b/app/Http/Requests/EmailFormRequest.php index 4c73f45538..81df95ea18 100644 --- a/app/Http/Requests/EmailFormRequest.php +++ b/app/Http/Requests/EmailFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class EmailFormRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * Rules for this request. diff --git a/app/Http/Requests/InviteUserFormRequest.php b/app/Http/Requests/InviteUserFormRequest.php index 91afdd2391..d094472aa3 100644 --- a/app/Http/Requests/InviteUserFormRequest.php +++ b/app/Http/Requests/InviteUserFormRequest.php @@ -30,7 +30,8 @@ use Illuminate\Foundation\Http\FormRequest; class InviteUserFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Rules for this request. diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php index 2886cbb4d8..52996db13b 100644 --- a/app/Http/Requests/JournalLinkRequest.php +++ b/app/Http/Requests/JournalLinkRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class JournalLinkRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.php index b9ad77ff8d..3df1effbe3 100644 --- a/app/Http/Requests/LinkTypeFormRequest.php +++ b/app/Http/Requests/LinkTypeFormRequest.php @@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class LinkTypeFormRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * Rules for this request. diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index 387423e8d3..d965f4bbb5 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class NewUserFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Rules for this request. diff --git a/app/Http/Requests/ObjectGroupFormRequest.php b/app/Http/Requests/ObjectGroupFormRequest.php index bff7cebb8d..8b6c5fa6fb 100644 --- a/app/Http/Requests/ObjectGroupFormRequest.php +++ b/app/Http/Requests/ObjectGroupFormRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class ObjectGroupFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php index e71f83bd83..586f27c196 100644 --- a/app/Http/Requests/PiggyBankStoreRequest.php +++ b/app/Http/Requests/PiggyBankStoreRequest.php @@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class PiggyBankStoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php index d48268a5de..ec096a1ba8 100644 --- a/app/Http/Requests/PiggyBankUpdateRequest.php +++ b/app/Http/Requests/PiggyBankUpdateRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class PiggyBankUpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. diff --git a/app/Http/Requests/ReconciliationStoreRequest.php b/app/Http/Requests/ReconciliationStoreRequest.php index 9331c81469..a6f03ae9eb 100644 --- a/app/Http/Requests/ReconciliationStoreRequest.php +++ b/app/Http/Requests/ReconciliationStoreRequest.php @@ -34,7 +34,8 @@ use Log; */ class ReconciliationStoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Returns the data required by the controller. @@ -74,7 +75,7 @@ class ReconciliationStoreRequest extends FormRequest 'startBalance' => 'numeric|max:1000000000', 'endBalance' => 'numeric|max:1000000000', 'difference' => 'required|numeric|max:1000000000', - 'journals' => [new ValidJournals], + 'journals' => [new ValidJournals()], 'reconcile' => 'required|in:create,nothing', ]; } diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 39e9d8a742..439dd6e0ca 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -42,7 +42,8 @@ use Log; */ class RecurrenceFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get the data required by the controller. @@ -160,7 +161,7 @@ class RecurrenceFormRequest extends FormRequest } //monthly,17 //ndom,3,7 - if (in_array(substr($value, 0, 6), ['yearly', 'weekly'])) { + if (in_array(substr($value, 0, 6), ['yearly', 'weekly'], true)) { $return['type'] = substr($value, 0, 6); $return['moment'] = substr($value, 7); } @@ -191,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest // mandatory info for recurrence. 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', 'first_date' => 'required|date|after:' . $today->format('Y-m-d'), - 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'], + 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'between:1,20'], 'skip' => 'required|numeric|integer|gte:0|lte:31', // optional for recurrence: diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 01ad7ff42a..3b5274f3cd 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -52,7 +52,7 @@ class ReportFormRequest extends FormRequest /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); $set = $this->get('accounts'); - $collection = new Collection; + $collection = new Collection(); if (is_array($set)) { foreach ($set as $accountId) { $account = $repository->find((int) $accountId); @@ -75,7 +75,7 @@ class ReportFormRequest extends FormRequest /** @var BudgetRepositoryInterface $repository */ $repository = app(BudgetRepositoryInterface::class); $set = $this->get('budget'); - $collection = new Collection; + $collection = new Collection(); if (is_array($set)) { foreach ($set as $budgetId) { $budget = $repository->find((int) $budgetId); @@ -98,7 +98,7 @@ class ReportFormRequest extends FormRequest /** @var CategoryRepositoryInterface $repository */ $repository = app(CategoryRepositoryInterface::class); $set = $this->get('category'); - $collection = new Collection; + $collection = new Collection(); if (is_array($set)) { foreach ($set as $categoryId) { $category = $repository->find((int) $categoryId); @@ -121,7 +121,7 @@ class ReportFormRequest extends FormRequest /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); $set = $this->get('double'); - $collection = new Collection; + $collection = new Collection(); if (is_array($set)) { foreach ($set as $accountId) { $account = $repository->find((int) $accountId); @@ -213,7 +213,7 @@ class ReportFormRequest extends FormRequest /** @var TagRepositoryInterface $repository */ $repository = app(TagRepositoryInterface::class); $set = $this->get('tag'); - $collection = new Collection; + $collection = new Collection(); Log::debug('Set is:', $set ?? []); if (is_array($set)) { foreach ($set as $tagTag) { diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 8a71856f96..8007f071f9 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -33,7 +33,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class RuleFormRequest extends FormRequest { - use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin; + use ConvertsDataTypes; + use GetRuleConfiguration; + use ChecksLogin; /** * Get all data for controller. diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 5cb9b2c9be..89b37bf34f 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class RuleGroupFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data for controller. @@ -73,7 +74,7 @@ class RuleGroupFormRequest extends FormRequest return [ 'title' => $titleRule, 'description' => 'between:1,5000|nullable', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], ]; } } diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 61255d00ed..f63754c9a9 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -34,7 +34,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class TagFormRequest extends FormRequest { - use ConvertsDataTypes, AppendsLocationData, ChecksLogin; + use ConvertsDataTypes; + use AppendsLocationData; + use ChecksLogin; /** * Get all data for controller. @@ -50,7 +52,6 @@ class TagFormRequest extends FormRequest ]; return $this->appendLocationData($data, 'location'); - } /** diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index d6f681a700..e80042afc9 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class TestRuleFormRequest extends FormRequest { - use GetRuleConfiguration, ChecksLogin; + use GetRuleConfiguration; + use ChecksLogin; /** * Rules for this request. diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index a10ef457b7..f48d0cb289 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UserFormRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get data for controller. diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php index 9151650909..7c3f42da97 100644 --- a/app/Jobs/CreateAutoBudgetLimits.php +++ b/app/Jobs/CreateAutoBudgetLimits.php @@ -43,7 +43,10 @@ use Log; */ class CreateAutoBudgetLimits implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; private Carbon $date; @@ -222,7 +225,7 @@ class CreateAutoBudgetLimits implements ShouldQueue if (null !== $amount) { Log::debug(sprintf('Amount is overruled and will be set to %s', $amount)); } - $budgetLimit = new BudgetLimit; + $budgetLimit = new BudgetLimit(); $budgetLimit->budget()->associate($autoBudget->budget); $budgetLimit->transactionCurrency()->associate($autoBudget->transactionCurrency); $budgetLimit->start_date = $start; diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index 3078879c27..81732cbb01 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -50,7 +50,10 @@ use Log; */ class CreateRecurringTransactions implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; public int $created; public int $executed; @@ -76,7 +79,7 @@ class CreateRecurringTransactions implements ShouldQueue $this->date = $newDate; } if (null === $date) { - $newDate = new Carbon; + $newDate = new Carbon(); $newDate->startOfDay(); $this->date = $newDate; } @@ -109,7 +112,7 @@ class CreateRecurringTransactions implements ShouldQueue /** @var Recurrence $recurrence */ foreach ($filtered as $recurrence) { if (!array_key_exists($recurrence->user_id, $result)) { - $result[$recurrence->user_id] = new Collection; + $result[$recurrence->user_id] = new Collection(); } $this->repository->setUser($recurrence->user); $this->journalRepository->setUser($recurrence->user); @@ -296,7 +299,7 @@ class CreateRecurringTransactions implements ShouldQueue */ private function handleRepetitions(Recurrence $recurrence): Collection { - $collection = new Collection; + $collection = new Collection(); /** @var RecurrenceRepetition $repetition */ foreach ($recurrence->recurrenceRepetitions as $repetition) { Log::debug( @@ -336,7 +339,7 @@ class CreateRecurringTransactions implements ShouldQueue */ private function handleOccurrences(Recurrence $recurrence, RecurrenceRepetition $repetition, array $occurrences): Collection { - $collection = new Collection; + $collection = new Collection(); /** @var Carbon $date */ foreach ($occurrences as $date) { $result = $this->handleOccurrence($recurrence, $repetition, $date); @@ -361,7 +364,6 @@ class CreateRecurringTransactions implements ShouldQueue { $date->startOfDay(); if ($date->ne($this->date)) { - return null; } Log::debug(sprintf('%s IS today (%s)', $date->format('Y-m-d'), $this->date->format('Y-m-d'))); @@ -386,9 +388,8 @@ class CreateRecurringTransactions implements ShouldQueue $first = $recurrence->recurrenceTransactions()->first(); $groupTitle = $first->description; - } - if(0 === $count) { + if (0 === $count) { Log::error('No transactions to be created in this recurrence. Cannot continue.'); return null; diff --git a/app/Jobs/DownloadExchangeRates.php b/app/Jobs/DownloadExchangeRates.php index e6953113ff..64943c2ec5 100644 --- a/app/Jobs/DownloadExchangeRates.php +++ b/app/Jobs/DownloadExchangeRates.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Jobs; - use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; @@ -43,7 +42,10 @@ use Log; */ class DownloadExchangeRates implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; private Carbon $date; private CurrencyRepositoryInterface $repository; @@ -107,7 +109,7 @@ class DownloadExchangeRates implements ShouldQueue { Log::debug(sprintf('Now downloading new exchange rates for currency %s.', $currency->code)); $base = sprintf('%s/%s/%s', (string) config('cer.url'), $this->date->year, $this->date->isoWeek); - $client = new Client; + $client = new Client(); $url = sprintf('%s/%s.json', $base, $currency->code); $res = $client->get($url); $statusCode = $res->getStatusCode(); diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 2f8b56ddba..b431a4a2cd 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -37,7 +37,8 @@ use Mail; */ class MailError extends Job implements ShouldQueue { - use InteractsWithQueue, SerializesModels; + use InteractsWithQueue; + use SerializesModels; protected string $destination; protected array $exception; diff --git a/app/Jobs/SendWebhookMessage.php b/app/Jobs/SendWebhookMessage.php index 26923829da..d628f1882f 100644 --- a/app/Jobs/SendWebhookMessage.php +++ b/app/Jobs/SendWebhookMessage.php @@ -38,7 +38,10 @@ use Log; */ class SendWebhookMessage implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; private WebhookMessage $message; diff --git a/app/Jobs/WarnAboutBills.php b/app/Jobs/WarnAboutBills.php index 7f6bb7c0b4..353cdebc05 100644 --- a/app/Jobs/WarnAboutBills.php +++ b/app/Jobs/WarnAboutBills.php @@ -39,7 +39,10 @@ use Log; */ class WarnAboutBills implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; private Carbon $date; private bool $force; @@ -53,7 +56,7 @@ class WarnAboutBills implements ShouldQueue */ public function __construct(?Carbon $date) { - $newDate = new Carbon; + $newDate = new Carbon(); $newDate->startOfDay(); $this->date = $newDate; diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php index 8450f76298..bf7b4a4e10 100644 --- a/app/Mail/AccessTokenCreatedMail.php +++ b/app/Mail/AccessTokenCreatedMail.php @@ -34,8 +34,8 @@ use Illuminate\Queue\SerializesModels; */ class AccessTokenCreatedMail extends Mailable { - - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; /** * AccessTokenCreatedMail constructor. diff --git a/app/Mail/AdminTestMail.php b/app/Mail/AdminTestMail.php index e2629a3e55..400861d502 100644 --- a/app/Mail/AdminTestMail.php +++ b/app/Mail/AdminTestMail.php @@ -35,7 +35,8 @@ use Illuminate\Queue\SerializesModels; */ class AdminTestMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $email; @@ -44,7 +45,6 @@ class AdminTestMail extends Mailable */ public function __construct() { - } /** diff --git a/app/Mail/BillWarningMail.php b/app/Mail/BillWarningMail.php index de7e413066..64623e5560 100644 --- a/app/Mail/BillWarningMail.php +++ b/app/Mail/BillWarningMail.php @@ -31,7 +31,8 @@ use Illuminate\Queue\SerializesModels; class BillWarningMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public Bill $bill; public int $diff; diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php index bdd6110ff7..6bf15b5f1f 100644 --- a/app/Mail/ConfirmEmailChangeMail.php +++ b/app/Mail/ConfirmEmailChangeMail.php @@ -35,7 +35,8 @@ use Illuminate\Queue\SerializesModels; */ class ConfirmEmailChangeMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $newEmail; public string $oldEmail; diff --git a/app/Mail/InvitationMail.php b/app/Mail/InvitationMail.php index 9854a22685..cd1995029b 100644 --- a/app/Mail/InvitationMail.php +++ b/app/Mail/InvitationMail.php @@ -30,7 +30,8 @@ use Illuminate\Queue\SerializesModels; class InvitationMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $invitee; public string $admin; diff --git a/app/Mail/NewIPAddressWarningMail.php b/app/Mail/NewIPAddressWarningMail.php index f387f1c84d..02297032e0 100644 --- a/app/Mail/NewIPAddressWarningMail.php +++ b/app/Mail/NewIPAddressWarningMail.php @@ -34,7 +34,8 @@ use Illuminate\Queue\SerializesModels; */ class NewIPAddressWarningMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $host; public string $ipAddress; diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php index 796f980fc4..9a6bdef155 100644 --- a/app/Mail/OAuthTokenCreatedMail.php +++ b/app/Mail/OAuthTokenCreatedMail.php @@ -35,7 +35,8 @@ use Laravel\Passport\Client; */ class OAuthTokenCreatedMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public Client $client; diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php index 1ab61c951f..81a73704e4 100644 --- a/app/Mail/RegisteredUser.php +++ b/app/Mail/RegisteredUser.php @@ -36,7 +36,8 @@ use Illuminate\Queue\SerializesModels; */ class RegisteredUser extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $address; diff --git a/app/Mail/ReportNewJournalsMail.php b/app/Mail/ReportNewJournalsMail.php index feff32bdea..c69ee517be 100644 --- a/app/Mail/ReportNewJournalsMail.php +++ b/app/Mail/ReportNewJournalsMail.php @@ -38,7 +38,8 @@ use Illuminate\Support\Collection; */ class ReportNewJournalsMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public Collection $groups; public array $transformed; diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php index 2aedd0aa4a..d7dc317fa7 100644 --- a/app/Mail/RequestedNewPassword.php +++ b/app/Mail/RequestedNewPassword.php @@ -35,7 +35,8 @@ use Illuminate\Queue\SerializesModels; */ class RequestedNewPassword extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $url; diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php index c4247fd8af..f499314d2b 100644 --- a/app/Mail/UndoEmailChangeMail.php +++ b/app/Mail/UndoEmailChangeMail.php @@ -33,7 +33,8 @@ use Illuminate\Queue\SerializesModels; */ class UndoEmailChangeMail extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; public string $newEmail; public string $oldEmail; diff --git a/app/Models/Account.php b/app/Models/Account.php index e695be2575..14588b6f4e 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -104,7 +104,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class Account extends Model { - use SoftDeletes, HasFactory; + use SoftDeletes; + use HasFactory; /** * The attributes that should be casted to native types. @@ -123,7 +124,7 @@ class Account extends Model /** @var array Fields that can be filled */ protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; /** @var array Hidden from view */ - protected $hidden = ['encrypted']; + protected $hidden = ['encrypted']; private bool $joinedAccountTypes = false; /** @@ -146,7 +147,7 @@ class Account extends Model return $account; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 0aeb20f065..333bb794ff 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -120,7 +120,7 @@ class Attachment extends Model return $attachment; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index 6f8fe78df8..9132c39a4b 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -64,11 +64,10 @@ use Illuminate\Support\Carbon; */ class AutoBudget extends Model { + use SoftDeletes; public const AUTO_BUDGET_RESET = 1; public const AUTO_BUDGET_ROLLOVER = 2; - use SoftDeletes; - /** * @codeCoverageIgnore * @return BelongsTo diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 8685e4ceb7..8286c87e6d 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -105,7 +105,7 @@ class AvailableBudget extends Model return $availableBudget; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 3d76819c94..73dc7a0377 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -149,7 +149,7 @@ class Bill extends Model return $bill; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** @@ -233,7 +233,7 @@ class Bill extends Model protected function amountMax(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } @@ -245,7 +245,7 @@ class Bill extends Model protected function amountMin(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } } diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 96a7dce142..fc5f6a7c11 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -122,7 +122,7 @@ class Budget extends Model return $budget; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index aff5ed5157..e2671ae380 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -100,7 +100,7 @@ class BudgetLimit extends Model return $budgetLimit; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** @@ -129,7 +129,7 @@ class BudgetLimit extends Model protected function amount(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } } diff --git a/app/Models/Category.php b/app/Models/Category.php index 369ded30b0..e2ddee7726 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -113,7 +113,7 @@ class Category extends Model return $category; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index 8f1d0f1ce7..65bd060832 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -99,7 +99,7 @@ class LinkType extends Model return $linkType; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Location.php b/app/Models/Location.php index 7dbc62105b..720fcf02bb 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -63,7 +63,6 @@ use Illuminate\Support\Carbon; */ class Location extends Model { - /** * The attributes that should be casted to native types. * @@ -117,5 +116,4 @@ class Location extends Model { return $this->morphTo(); } - } diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index b641c1bd16..020b20c60c 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -98,7 +98,7 @@ class ObjectGroup extends Model return $objectGroup; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 3526816a63..617c6ef897 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -123,7 +123,7 @@ class PiggyBank extends Model return $piggyBank; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 94d28acc35..4562d27dab 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -107,7 +107,7 @@ class PiggyBankEvent extends Model protected function amount(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } } diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 1cfe9c788e..55f5ebf5e9 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -136,7 +136,7 @@ class PiggyBankRepetition extends Model protected function currentamount(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } } diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 1e71699c52..7b1440cee1 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -91,7 +91,7 @@ class Preference extends Model } $default = config('firefly.default_preferences'); if (array_key_exists($value, $default)) { - $preference = new Preference; + $preference = new Preference(); $preference->name = $value; $preference->data = $default[$value]; $preference->user_id = $user->id; @@ -100,7 +100,7 @@ class Preference extends Model return $preference; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 6a723f3b78..c2c5f61e5c 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -139,7 +139,7 @@ class Recurrence extends Model return $recurrence; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** @@ -213,5 +213,4 @@ class Recurrence extends Model { return $this->belongsTo(User::class); } - } diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index 5b40c521f8..1037b6ccb3 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -86,5 +86,4 @@ class RecurrenceMeta extends Model { return $this->belongsTo(Recurrence::class); } - } diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 91330e975d..3061ad67f6 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -62,14 +62,12 @@ use Illuminate\Support\Carbon; */ class RecurrenceRepetition extends Model { + use SoftDeletes; public const WEEKEND_DO_NOTHING = 1; public const WEEKEND_SKIP_CREATION = 2; public const WEEKEND_TO_FRIDAY = 3; public const WEEKEND_TO_MONDAY = 4; - - use SoftDeletes; - /** * The attributes that should be casted to native types. * diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index df7846f4ed..0ca31628e5 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -86,5 +86,4 @@ class RecurrenceTransactionMeta extends Model { return $this->belongsTo(RecurrenceTransaction::class, 'rt_id'); } - } diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 55bd858171..a0a5b88f5d 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -120,7 +120,7 @@ class Rule extends Model return $rule; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index aa2a370b71..448acd5466 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -111,7 +111,7 @@ class RuleGroup extends Model return $ruleGroup; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 3168dd3634..a33d0d0cc1 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -122,7 +122,7 @@ class Tag extends Model return $tag; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 346a521db7..b65007574c 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -88,7 +88,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; */ class Transaction extends Model { - use SoftDeletes, HasFactory; + use SoftDeletes; + use HasFactory; /** * The attributes that should be casted to native types. @@ -266,7 +267,7 @@ class Transaction extends Model protected function amount(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } @@ -278,7 +279,7 @@ class Transaction extends Model protected function foreignAmount(): Attribute { return Attribute::make( - get: fn($value) => (string) $value, + get: fn ($value) => (string) $value, ); } } diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 3af5058281..6d00964384 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -103,7 +103,7 @@ class TransactionCurrency extends Model return $currency; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index aac8eac199..a22763c667 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -106,7 +106,7 @@ class TransactionGroup extends Model } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** @@ -126,5 +126,4 @@ class TransactionGroup extends Model { return $this->belongsTo(User::class); } - } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index b39283b1af..b96879d237 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -120,7 +120,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class TransactionJournal extends Model { - use SoftDeletes, HasFactory; + use SoftDeletes; + use HasFactory; /** * The attributes that should be casted to native types. @@ -170,7 +171,7 @@ class TransactionJournal extends Model } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index c37dbcdb4b..34e819a2d8 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -98,7 +98,7 @@ class TransactionJournalLink extends Model return $link; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 5cf42db0f7..989cb92575 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -56,6 +56,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class TransactionType extends Model { + use SoftDeletes; public const DEPOSIT = 'Deposit'; public const INVALID = 'Invalid'; public const LIABILITY_CREDIT = 'Liability credit'; @@ -63,7 +64,6 @@ class TransactionType extends Model public const RECONCILIATION = 'Reconciliation'; public const TRANSFER = 'Transfer'; public const WITHDRAWAL = 'Withdrawal'; - use SoftDeletes; protected $casts = [ diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index b8ac9da824..d3176266e6 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -110,7 +110,7 @@ class Webhook extends Model return $webhook; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php index 112c5bb468..97538899aa 100644 --- a/app/Models/WebhookAttempt.php +++ b/app/Models/WebhookAttempt.php @@ -84,7 +84,7 @@ class WebhookAttempt extends Model return $attempt; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index 83e3e5da3f..03a740e4ec 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -68,7 +68,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class WebhookMessage extends Model { - protected $casts = [ 'sent' => 'boolean', @@ -98,7 +97,7 @@ class WebhookMessage extends Model return $message; } } - throw new NotFoundHttpException; + throw new NotFoundHttpException(); } /** diff --git a/app/Notifications/Admin/TestNotification.php b/app/Notifications/Admin/TestNotification.php index 128300bd7c..99d8437c87 100644 --- a/app/Notifications/Admin/TestNotification.php +++ b/app/Notifications/Admin/TestNotification.php @@ -67,7 +67,7 @@ class TestNotification extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.admin-test', ['email' => $this->address]) ->subject((string) trans('email.admin_test_subject')); } @@ -80,7 +80,7 @@ class TestNotification extends Notification */ public function toSlack($notifiable) { - return (new SlackMessage)->content((string) trans('email.admin_test_subject')); + return (new SlackMessage())->content((string) trans('email.admin_test_subject')); } /** diff --git a/app/Notifications/Admin/UserInvitation.php b/app/Notifications/Admin/UserInvitation.php index 9c84345490..cfc2af2ea5 100644 --- a/app/Notifications/Admin/UserInvitation.php +++ b/app/Notifications/Admin/UserInvitation.php @@ -68,7 +68,7 @@ class UserInvitation extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.invitation-created', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]) ->subject((string) trans('email.invitation_created_subject')); } @@ -81,7 +81,7 @@ class UserInvitation extends Notification */ public function toSlack($notifiable) { - return (new SlackMessage)->content((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email])); + return (new SlackMessage())->content((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email])); } /** diff --git a/app/Notifications/Admin/UserRegistration.php b/app/Notifications/Admin/UserRegistration.php index 892c75cd03..16f4b517fa 100644 --- a/app/Notifications/Admin/UserRegistration.php +++ b/app/Notifications/Admin/UserRegistration.php @@ -22,7 +22,6 @@ declare(strict_types=1); - namespace FireflyIII\Notifications\Admin; use FireflyIII\User; @@ -69,7 +68,7 @@ class UserRegistration extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.registered-admin', ['email' => $this->user->email, 'id' => $this->user->id]) ->subject((string) trans('email.registered_subject_admin')); } @@ -82,7 +81,7 @@ class UserRegistration extends Notification */ public function toSlack($notifiable) { - return (new SlackMessage)->content((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'id' => $this->user->id])); + return (new SlackMessage())->content((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'id' => $this->user->id])); } /** diff --git a/app/Notifications/Admin/VersionCheckResult.php b/app/Notifications/Admin/VersionCheckResult.php index 1515fd04d3..1cd56c1b33 100644 --- a/app/Notifications/Admin/VersionCheckResult.php +++ b/app/Notifications/Admin/VersionCheckResult.php @@ -68,8 +68,7 @@ class VersionCheckResult extends Notification */ public function toMail($notifiable) { - - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.new-version', ['message' => $this->message]) ->subject((string) trans('email.new_version_email_subject')); } @@ -82,7 +81,7 @@ class VersionCheckResult extends Notification */ public function toSlack($notifiable) { - return (new SlackMessage)->content($this->message) + return (new SlackMessage())->content($this->message) ->attachment(function ($attachment) { $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases'); }); @@ -101,4 +100,3 @@ class VersionCheckResult extends Notification ]; } } - diff --git a/app/Notifications/User/BillReminder.php b/app/Notifications/User/BillReminder.php index f6950fa022..d17b8f775f 100644 --- a/app/Notifications/User/BillReminder.php +++ b/app/Notifications/User/BillReminder.php @@ -77,7 +77,7 @@ class BillReminder extends Notification $subject = (string) trans(sprintf('email.bill_warning_subject_now_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]); } - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.bill-warning', ['field' => $this->field, 'diff' => $this->diff, 'bill' => $this->bill]) ->subject($subject); } @@ -96,7 +96,7 @@ class BillReminder extends Notification } $bill = $this->bill; $url = route('bills.show', [$bill->id]); - return (new SlackMessage) + return (new SlackMessage()) ->warning() ->attachment(function ($attachment) use ($bill, $url) { $attachment->title((string) trans('firefly.visit_bill', ['name' => $bill->name]), $url); diff --git a/app/Notifications/User/NewAccessToken.php b/app/Notifications/User/NewAccessToken.php index 26a33486b3..d70919de2c 100644 --- a/app/Notifications/User/NewAccessToken.php +++ b/app/Notifications/User/NewAccessToken.php @@ -61,7 +61,7 @@ class NewAccessToken extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.token-created') ->subject((string) trans('email.access_token_created_subject')); } @@ -73,7 +73,7 @@ class NewAccessToken extends Notification */ public function toSlack($notifiable) { - return (new SlackMessage)->content((string) trans('email.access_token_created_body')); + return (new SlackMessage())->content((string) trans('email.access_token_created_body')); } /** diff --git a/app/Notifications/User/TransactionCreation.php b/app/Notifications/User/TransactionCreation.php index b781f2b1b7..7dea4fcbbb 100644 --- a/app/Notifications/User/TransactionCreation.php +++ b/app/Notifications/User/TransactionCreation.php @@ -64,7 +64,7 @@ class TransactionCreation extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.report-new-journals', ['transformed' => $this->collection]) ->subject((string) trans_choice('email.new_journals_subject', count($this->collection))); } diff --git a/app/Notifications/User/UserLogin.php b/app/Notifications/User/UserLogin.php index 92b89ccfd6..263cc7db90 100644 --- a/app/Notifications/User/UserLogin.php +++ b/app/Notifications/User/UserLogin.php @@ -22,7 +22,6 @@ declare(strict_types=1); - namespace FireflyIII\Notifications\User; use Exception; @@ -77,7 +76,7 @@ class UserLogin extends Notification $host = $hostName; } - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => $host]) ->subject((string) trans('email.login_from_new_ip')); } @@ -100,7 +99,7 @@ class UserLogin extends Notification $host = $hostName; } - return (new SlackMessage)->content((string) trans('email.slack_login_from_new_ip', ['host' => $host, 'ip' => $this->ip])); + return (new SlackMessage())->content((string) trans('email.slack_login_from_new_ip', ['host' => $host, 'ip' => $this->ip])); } /** @@ -116,4 +115,3 @@ class UserLogin extends Notification ]; } } - diff --git a/app/Notifications/User/UserNewPassword.php b/app/Notifications/User/UserNewPassword.php index 1b2e4edde6..2141a634cc 100644 --- a/app/Notifications/User/UserNewPassword.php +++ b/app/Notifications/User/UserNewPassword.php @@ -63,7 +63,7 @@ class UserNewPassword extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.password', ['url' => $this->url]) ->subject((string) trans('email.reset_pw_subject')); } diff --git a/app/Notifications/User/UserRegistration.php b/app/Notifications/User/UserRegistration.php index 2c28cf69f0..0c30634939 100644 --- a/app/Notifications/User/UserRegistration.php +++ b/app/Notifications/User/UserRegistration.php @@ -60,7 +60,7 @@ class UserRegistration extends Notification */ public function toMail($notifiable) { - return (new MailMessage) + return (new MailMessage()) ->markdown('emails.registered', ['address' => route('index')]) ->subject((string) trans('email.registered_subject')); } @@ -78,4 +78,3 @@ class UserRegistration extends Notification ]; } } - diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index bd7c9fea3e..9ceb51dd63 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -58,7 +58,6 @@ class AppServiceProvider extends ServiceProvider return response() ->json($value) ->withHeaders($headers); - }); } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index ebe20226df..124d56fed6 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -52,15 +52,17 @@ class AuthServiceProvider extends ServiceProvider public function boot(): void { Auth::provider( - 'remote_user_provider', function ($app, array $config) { - return new RemoteUserProvider; - } + 'remote_user_provider', + function ($app, array $config) { + return new RemoteUserProvider(); + } ); Auth::extend( - 'remote_user_guard', static function ($app, string $name, array $config) { - return new RemoteUserGuard(Auth::createUserProvider($config['provider']), $app); - } + 'remote_user_guard', + static function ($app, string $name, array $config) { + return new RemoteUserGuard(Auth::createUserProvider($config['provider']), $app); + } ); $this->registerPolicies(); diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index d36d5b9bb4..6ac056d9a0 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -121,6 +121,5 @@ class BudgetServiceProvider extends ServiceProvider return $repository; } ); - } } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 1d63fb8e0c..fd90ecdd67 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -193,7 +193,6 @@ class EventServiceProvider extends ServiceProvider ->first(); // update! if (null !== $availableBudget) { - $repository = app(BudgetLimitRepositoryInterface::class); $repository->setUser($user); $set = $repository->getAllBudgetLimitsByCurrency($limit->transactionCurrency, $limit->start_date, $limit->end_date); @@ -229,7 +228,7 @@ class EventServiceProvider extends ServiceProvider { PiggyBank::created( static function (PiggyBank $piggyBank) { - $repetition = new PiggyBankRepetition; + $repetition = new PiggyBankRepetition(); $repetition->piggyBank()->associate($piggyBank); $repetition->startdate = $piggyBank->startdate; $repetition->targetdate = $piggyBank->targetdate; @@ -238,5 +237,4 @@ class EventServiceProvider extends ServiceProvider } ); } - } diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index d1f3d0c174..a4c198319a 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -103,66 +103,66 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind( 'preferences', static function () { - return new Preferences; + return new Preferences(); } ); $this->app->bind( 'fireflyconfig', static function () { - return new FireflyConfig; + return new FireflyConfig(); } ); $this->app->bind( 'navigation', static function () { - return new Navigation; + return new Navigation(); } ); $this->app->bind( 'amount', static function () { - return new Amount; + return new Amount(); } ); $this->app->bind( 'steam', static function () { - return new Steam; + return new Steam(); } ); $this->app->bind( 'expandedform', static function () { - return new ExpandedForm; + return new ExpandedForm(); } ); $this->app->bind( 'accountform', static function () { - return new AccountForm; + return new AccountForm(); } ); $this->app->bind( 'currencyform', static function () { - return new CurrencyForm; + return new CurrencyForm(); } ); $this->app->bind( 'piggybankform', static function () { - return new PiggyBankForm; + return new PiggyBankForm(); } ); $this->app->bind( 'ruleform', static function () { - return new RuleForm; + return new RuleForm(); } ); diff --git a/app/Providers/RecurringServiceProvider.php b/app/Providers/RecurringServiceProvider.php index ca247c9cae..85d2572c2c 100644 --- a/app/Providers/RecurringServiceProvider.php +++ b/app/Providers/RecurringServiceProvider.php @@ -59,5 +59,4 @@ class RecurringServiceProvider extends ServiceProvider } ); } - } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3e2283c629..a6600f04a7 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -65,9 +65,6 @@ class RouteServiceProvider extends ServiceProvider Route::middleware('web') ->namespace($this->namespace) ->group(base_path('routes/web.php')); - }); } - - } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 40f28a9b43..752239f65c 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -90,7 +90,7 @@ class AccountRepository implements AccountRepositoryInterface */ public function expandWithDoubles(Collection $accounts): Collection { - $result = new Collection; + $result = new Collection(); /** @var Account $account */ foreach ($accounts as $account) { $byName = $this->user->accounts()->where('name', $account->name) @@ -113,7 +113,6 @@ class AccountRepository implements AccountRepositoryInterface } return $result; - } /** @@ -294,8 +293,7 @@ class AccountRepository implements AccountRepositoryInterface */ public function getCreditTransactionGroup(Account $account): ?TransactionGroup { - $journal = TransactionJournal - ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + $journal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->where('transactions.account_id', $account->id) ->transactionTypes([TransactionType::LIABILITY_CREDIT]) ->first(['transaction_journals.*']); @@ -364,7 +362,6 @@ class AccountRepository implements AccountRepositoryInterface */ public function getOpeningBalanceAmount(Account $account): ?string { - $journal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->where('transactions.account_id', $account->id) ->transactionTypes([TransactionType::OPENING_BALANCE]) @@ -419,8 +416,7 @@ class AccountRepository implements AccountRepositoryInterface */ public function getOpeningBalance(Account $account): ?TransactionJournal { - return TransactionJournal - ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + return TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->where('transactions.account_id', $account->id) ->transactionTypes([TransactionType::OPENING_BALANCE]) ->first(['transaction_journals.*']); @@ -490,7 +486,7 @@ class AccountRepository implements AccountRepositoryInterface $list = config('firefly.valid_currency_account_types'); // return null if not in this list. - if(!in_array($type, $list, true)) { + if (!in_array($type, $list, true)) { return null; } $currencyId = (int) $this->getMetaValue($account, 'currency_id'); @@ -701,7 +697,6 @@ class AccountRepository implements AccountRepositoryInterface $search = sprintf('%%%s%%', $part); $dbQuery->where('name', 'LIKE', $search); } - } if (!empty($types)) { $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); @@ -787,5 +782,4 @@ class AccountRepository implements AccountRepositoryInterface return $service->update($account, $data); } - } diff --git a/app/Repositories/Account/OperationsRepository.php b/app/Repositories/Account/OperationsRepository.php index 5f7b342f80..471204162c 100644 --- a/app/Repositories/Account/OperationsRepository.php +++ b/app/Repositories/Account/OperationsRepository.php @@ -136,7 +136,6 @@ class OperationsRepository implements OperationsRepositoryInterface $journals = $this->getTransactions($start, $end, $accounts, TransactionType::DEPOSIT); return $this->sortByCurrency($journals, 'positive'); - } /** @@ -150,13 +149,16 @@ class OperationsRepository implements OperationsRepositoryInterface /** * @inheritDoc */ - public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null - ): array - { + public function sumExpenses( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::WITHDRAWAL, $start, $end, $accounts, $expense, $currency); return $this->groupByCurrency($journals, 'negative'); - } /** @@ -170,10 +172,13 @@ class OperationsRepository implements OperationsRepositoryInterface * @return array */ private function getTransactionsForSum( - string $type, Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $opposing = null, ?TransactionCurrency $currency = null - - ): array - { + string $type, + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $opposing = null, + ?TransactionCurrency $currency = null + ): array { $start->startOfDay(); $end->endOfDay(); @@ -284,9 +289,12 @@ class OperationsRepository implements OperationsRepositoryInterface * @inheritDoc */ public function sumExpensesByDestination( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null - ): array - { + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::WITHDRAWAL, $start, $end, $accounts, $expense, $currency); return $this->groupByDirection($journals, 'destination', 'negative'); @@ -343,9 +351,12 @@ class OperationsRepository implements OperationsRepositoryInterface * @inheritDoc */ public function sumExpensesBySource( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null - ): array - { + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::WITHDRAWAL, $start, $end, $accounts, $expense, $currency); return $this->groupByDirection($journals, 'source', 'negative'); @@ -354,9 +365,13 @@ class OperationsRepository implements OperationsRepositoryInterface /** * @inheritDoc */ - public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null - ): array - { + public function sumIncome( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::DEPOSIT, $start, $end, $accounts, $revenue, $currency); return $this->groupByCurrency($journals, 'positive'); @@ -366,9 +381,12 @@ class OperationsRepository implements OperationsRepositoryInterface * @inheritDoc */ public function sumIncomeByDestination( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null - ): array - { + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::DEPOSIT, $start, $end, $accounts, $revenue, $currency); return $this->groupByDirection($journals, 'destination', 'positive'); @@ -378,9 +396,12 @@ class OperationsRepository implements OperationsRepositoryInterface * @inheritDoc */ public function sumIncomeBySource( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null - ): array - { + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null + ): array { $journals = $this->getTransactionsForSum(TransactionType::DEPOSIT, $start, $end, $accounts, $revenue, $currency); return $this->groupByDirection($journals, 'source', 'positive'); @@ -512,7 +533,6 @@ class OperationsRepository implements OperationsRepositoryInterface // destination account? money comes in: $return[$destKey]['in'] = bcadd($return[$destKey]['in'], $amount); $return[$destKey]['difference'] = bcadd($return[$destKey]['out'], $return[$destKey]['in']); - } return $return; diff --git a/app/Repositories/Account/OperationsRepositoryInterface.php b/app/Repositories/Account/OperationsRepositoryInterface.php index a8cc6db89b..cd16d830c8 100644 --- a/app/Repositories/Account/OperationsRepositoryInterface.php +++ b/app/Repositories/Account/OperationsRepositoryInterface.php @@ -75,7 +75,12 @@ interface OperationsRepositoryInterface * * @return array */ - public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null + public function sumExpenses( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null ): array; /** @@ -90,7 +95,11 @@ interface OperationsRepositoryInterface * @return array */ public function sumExpensesByDestination( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null ): array; /** @@ -105,7 +114,11 @@ interface OperationsRepositoryInterface * @return array */ public function sumExpensesBySource( - Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $expense = null, + ?TransactionCurrency $currency = null ): array; /** @@ -119,7 +132,12 @@ interface OperationsRepositoryInterface * * @return array */ - public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null + public function sumIncome( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null ): array; /** @@ -133,8 +151,12 @@ interface OperationsRepositoryInterface * * @return array */ - public function sumIncomeByDestination(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, - ?TransactionCurrency $currency = null + public function sumIncomeByDestination( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null ): array; /** @@ -148,8 +170,12 @@ interface OperationsRepositoryInterface * * @return array */ - public function sumIncomeBySource(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, - ?TransactionCurrency $currency = null + public function sumIncomeBySource( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $revenue = null, + ?TransactionCurrency $currency = null ): array; /** diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index b6dc30e99d..74f31ccd65 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -210,7 +210,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface } $dbNote = $attachment->notes()->first(); if (null === $dbNote) { - $dbNote = new Note; + $dbNote = new Note(); $dbNote->noteable()->associate($attachment); } $dbNote->text = trim($note); diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 4a8e3bfbcb..0b64420736 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -32,7 +32,6 @@ use Illuminate\Support\Collection; */ interface AttachmentRepositoryInterface { - /** * @param Attachment $attachment * diff --git a/app/Repositories/AuditLogEntry/ALERepository.php b/app/Repositories/AuditLogEntry/ALERepository.php index 41abd0eb20..12177e7e1a 100644 --- a/app/Repositories/AuditLogEntry/ALERepository.php +++ b/app/Repositories/AuditLogEntry/ALERepository.php @@ -38,7 +38,7 @@ class ALERepository implements ALERepositoryInterface */ public function store(array $data): AuditLogEntry { - $auditLogEntry = new AuditLogEntry; + $auditLogEntry = new AuditLogEntry(); $auditLogEntry->auditable()->associate($data['auditable']); $auditLogEntry->changer()->associate($data['changer']); diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index abc6c05412..59671f0298 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -92,7 +92,7 @@ class BillRepository implements BillRepositoryInterface public function collectBillsUnpaidInRange(Carbon $start, Carbon $end): Collection { $bills = $this->getActiveBills(); - $return = new Collection; + $return = new Collection(); /** @var Bill $bill */ foreach ($bills as $bill) { $dates = $this->getPayDatesInRange($bill, $start, $end); @@ -382,7 +382,7 @@ class BillRepository implements BillRepositoryInterface */ public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection { - $set = new Collection; + $set = new Collection(); $currentStart = clone $start; //Log::debug(sprintf('Now at bill "%s" (%s)', $bill->name, $bill->repeat_freq)); //Log::debug(sprintf('First currentstart is %s', $currentStart->format('Y-m-d'))); @@ -417,7 +417,7 @@ class BillRepository implements BillRepositoryInterface */ public function nextDateMatch(Bill $bill, Carbon $date): Carbon { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($bill->id); $cache->addProperty('nextDateMatch'); $cache->addProperty($date); @@ -632,11 +632,11 @@ class BillRepository implements BillRepositoryInterface return $bill->transactionJournals() ->before($end)->after($start)->get( - [ - 'transaction_journals.id', 'transaction_journals.date', - 'transaction_journals.transaction_group_id', - ] - ); + [ + 'transaction_journals.id', 'transaction_journals.date', + 'transaction_journals.transaction_group_id', + ] + ); } /** @@ -767,7 +767,7 @@ class BillRepository implements BillRepositoryInterface */ public function nextExpectedMatch(Bill $bill, Carbon $date): Carbon { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($bill->id); $cache->addProperty('nextExpectedMatch'); $cache->addProperty($date); diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 1328bbe336..4b6cfbb125 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -34,7 +34,6 @@ use Illuminate\Support\Collection; */ interface BillRepositoryInterface { - /** * @param string $query * @param int $limit diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index 0c45754e0e..fd578c920c 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -75,7 +75,6 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface ->where('start_date', $start->format('Y-m-d')) ->where('end_date', $end->format('Y-m-d')) ->first(); - } /** @@ -213,7 +212,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface ->where('start_date', $start->format('Y-m-d')) ->where('end_date', $end->format('Y-m-d'))->first(); if (null === $availableBudget) { - $availableBudget = new AvailableBudget; + $availableBudget = new AvailableBudget(); $availableBudget->user()->associate($this->user); $availableBudget->transactionCurrency()->associate($currency); $availableBudget->start_date = $start->format('Y-m-d'); @@ -312,6 +311,5 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface } return $availableBudget; - } } diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 2385127975..7a4cc93b24 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -34,7 +34,6 @@ use Illuminate\Support\Collection; */ interface AvailableBudgetRepositoryInterface { - /** * Delete all available budgets. */ @@ -160,5 +159,4 @@ interface AvailableBudgetRepositoryInterface * @return AvailableBudget */ public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget; - } diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index 81490957dd..3673e42a7d 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -57,8 +57,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface */ public function budgeted(Carbon $start, Carbon $end, TransactionCurrency $currency, ?Collection $budgets = null): string { - $query = BudgetLimit - ::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') + $query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') // same complex where query as below. ->where( @@ -274,11 +273,11 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface ) // budget limit start within period ->orWhere( - static function (Builder $q3) use ($start, $end) { - $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00')); - $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59')); - } - ); + static function (Builder $q3) use ($start, $end) { + $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00')); + $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59')); + } + ); } ) ->orWhere( @@ -337,7 +336,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface Log::debug('No existing budget limit, create a new one'); // or create one and return it. - $limit = new BudgetLimit; + $limit = new BudgetLimit(); $limit->budget()->associate($budget); $limit->start_date = $data['start_date']->format('Y-m-d'); $limit->end_date = $data['end_date']->format('Y-m-d'); @@ -443,7 +442,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface } Log::debug('No existing budget limit, create a new one'); // or create one and return it. - $limit = new BudgetLimit; + $limit = new BudgetLimit(); $limit->budget()->associate($budget); $limit->start_date = $start->startOfDay(); $limit->end_date = $end->startOfDay(); diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php index ec65d2bcfb..ae7adc15b5 100644 --- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php @@ -35,7 +35,6 @@ use Illuminate\Support\Collection; */ interface BudgetLimitRepositoryInterface { - /** * Tells you which amount has been budgeted (for the given budgets) * in the selected query. Returns a positive amount as a string. @@ -128,5 +127,4 @@ interface BudgetLimitRepositoryInterface * @return BudgetLimit|null */ public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit; - } diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index f9f6d97217..ffa1f0e04e 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -128,12 +128,14 @@ class BudgetRepository implements BudgetRepositoryInterface $days = $this->daysInOverlap($limit, $start, $end); $amount = bcmul(bcdiv((string) $limit->amount, (string) $total), (string) $days); $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $amount); - Log::debug(sprintf('Amount per day: %s (%s over %d days). Total amount for %d days: %s', - bcdiv((string) $limit->amount, (string) $total), - $limit->amount, - $total, - $days, - $amount)); + Log::debug(sprintf( + 'Amount per day: %s (%s over %d days). Total amount for %d days: %s', + bcdiv((string) $limit->amount, (string) $total), + $limit->amount, + $total, + $days, + $amount + )); } } return $return; @@ -398,7 +400,6 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function searchBudget(string $query, int $limit): Collection { - $search = $this->user->budgets(); if ('' !== $query) { $search->where('name', 'LIKE', sprintf('%%%s%%', $query)); @@ -440,7 +441,7 @@ class BudgetRepository implements BudgetRepositoryInterface $repository = app(AccountRepositoryInterface::class); $repository->setUser($this->user); $subset = $repository->getAccountsByType(config('firefly.valid_liabilities')); - $selection = new Collection; + $selection = new Collection(); /** @var Account $account */ foreach ($subset as $account) { if ('credit' === $repository->getMetaValue($account, 'liability_direction')) { @@ -550,7 +551,7 @@ class BudgetRepository implements BudgetRepositoryInterface $currency = app('amount')->getDefaultCurrencyByUser($this->user); } - $autoBudget = new AutoBudget; + $autoBudget = new AutoBudget(); $autoBudget->budget()->associate($newBudget); $autoBudget->transaction_currency_id = $currency->id; $autoBudget->auto_budget_type = $type; @@ -593,7 +594,7 @@ class BudgetRepository implements BudgetRepositoryInterface $dbNote = $budget->notes()->first(); if ('' !== $text) { if (null === $dbNote) { - $dbNote = new Note; + $dbNote = new Note(); $dbNote->noteable()->associate($budget); } $dbNote->text = trim($text); @@ -723,7 +724,7 @@ class BudgetRepository implements BudgetRepositoryInterface if (null === $autoBudget) { // at this point it's a blind assumption auto_budget_type is 1 or 2. - $autoBudget = new AutoBudget; + $autoBudget = new AutoBudget(); $autoBudget->auto_budget_type = $data['auto_budget_type']; $autoBudget->budget_id = $budget->id; $autoBudget->transaction_currency_id = $currency->id; @@ -749,7 +750,6 @@ class BudgetRepository implements BudgetRepositoryInterface } if (array_key_exists('auto_budget_amount', $data)) { $autoBudget->amount = $data['auto_budget_amount']; - } if (array_key_exists('auto_budget_period', $data)) { $autoBudget->period = $data['auto_budget_period']; diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 4a41a5b28d..d40d4ad76a 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -34,7 +34,6 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { - /** * @param string $query * @param int $limit @@ -210,5 +209,4 @@ interface BudgetRepositoryInterface * @return Budget */ public function update(Budget $budget, array $data): Budget; - } diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index 57ad34144c..19610dfd8f 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/app/Repositories/Budget/NoBudgetRepository.php @@ -158,7 +158,6 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface */ public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array { - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]); @@ -185,7 +184,6 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface 'currency_decimal_places' => $journal['currency_decimal_places'], ]; $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount'])); - } return $array; diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index a75dd56378..bfe8c83661 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -67,5 +67,4 @@ interface NoBudgetRepositoryInterface * @return array */ public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array; - } diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index fe2b50955f..fe186db861 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -194,7 +194,6 @@ class OperationsRepository implements OperationsRepositoryInterface 'transaction_group_id' => $journal['transaction_group_id'], 'date' => $journal['date'], ]; - } return $array; @@ -290,9 +289,13 @@ class OperationsRepository implements OperationsRepositoryInterface * @deprecated * @return array */ - public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null - ): array - { + public function sumExpenses( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $budgets = null, + ?TransactionCurrency $currency = null + ): array { Log::debug(sprintf('Now in %s', __METHOD__)); $start->startOfDay(); $end->endOfDay(); @@ -305,7 +308,7 @@ class OperationsRepository implements OperationsRepositoryInterface $repository = app(AccountRepositoryInterface::class); $repository->setUser($this->user); $subset = $repository->getAccountsByType(config('firefly.valid_liabilities')); - $selection = new Collection; + $selection = new Collection(); /** @var Account $account */ foreach ($subset as $account) { if ('credit' === $repository->getMetaValue($account, 'liability_direction')) { diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index 140d01ada3..317b8fdb8a 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -98,8 +98,11 @@ interface OperationsRepositoryInterface * * @return array */ - public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null + public function sumExpenses( + Carbon $start, + Carbon $end, + ?Collection $accounts = null, + ?Collection $budgets = null, + ?TransactionCurrency $currency = null ): array; - - } diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 030bbc63e6..e8120221c6 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -192,7 +192,6 @@ class CategoryRepository implements CategoryRepositoryInterface } return $category; - } /** @@ -210,7 +209,7 @@ class CategoryRepository implements CategoryRepositoryInterface { $dbNote = $category->notes()->first(); if (null === $dbNote) { - $dbNote = new Note; + $dbNote = new Note(); $dbNote->noteable()->associate($category); } $dbNote->text = trim($notes); diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index d26dd08bf3..924e3b46cf 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -33,7 +33,6 @@ use Illuminate\Support\Collection; */ interface CategoryRepositoryInterface { - /** * @param string $query * @param int $limit diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 10d86f127b..51c766f2d2 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -84,7 +84,6 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface 'amount' => app('steam')->negative($journal['amount']), 'date' => $journal['date'], ]; - } return $array; @@ -137,7 +136,6 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface 'amount' => app('steam')->positive($journal['amount']), 'date' => $journal['date'], ]; - } return $array; diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index 510de53ef9..146c02c418 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -110,7 +110,6 @@ class OperationsRepository implements OperationsRepositoryInterface 'description' => $journal['description'], 'transaction_group_id' => $journal['transaction_group_id'], ]; - } return $array; @@ -196,7 +195,6 @@ class OperationsRepository implements OperationsRepositoryInterface 'description' => $journal['description'], 'transaction_group_id' => $journal['transaction_group_id'], ]; - } return $array; @@ -262,7 +260,6 @@ class OperationsRepository implements OperationsRepositoryInterface 'description' => $journal['description'], 'transaction_group_id' => $journal['transaction_group_id'], ]; - } return $array; @@ -328,7 +325,6 @@ class OperationsRepository implements OperationsRepositoryInterface 'description' => $journal['description'], 'transaction_group_id' => $journal['transaction_group_id'], ]; - } return $array; diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 7bbe2b1f12..93f5d22678 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -112,8 +112,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface } // is being used in accounts (as integer) - $meta = AccountMeta - ::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') + $meta = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') ->whereNull('accounts.deleted_at') ->where('account_meta.name', 'currency_id')->where('account_meta.data', json_encode((int) $currency->id))->count(); if ($meta > 0) { @@ -421,7 +420,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface public function getExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date): ?CurrencyExchangeRate { if ($fromCurrency->id === $toCurrency->id) { - $rate = new CurrencyExchangeRate; + $rate = new CurrencyExchangeRate(); $rate->rate = 1; $rate->id = 0; diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php index 9bf777b7f9..b292ee1232 100644 --- a/app/Repositories/Journal/JournalCLIRepository.php +++ b/app/Repositories/Journal/JournalCLIRepository.php @@ -50,8 +50,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface */ public function getAllJournals(array $types): Collection { - return TransactionJournal - ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + return TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->whereIn('transaction_types.type', $types) ->with(['user', 'transactionType', 'transactionCurrency', 'transactions', 'transactions.account']) ->get(['transaction_journals.*']); @@ -119,7 +118,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface */ public function getMetaDate(TransactionJournal $journal, string $field): ?Carbon { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('journal-meta-updated'); $cache->addProperty($journal->id); $cache->addProperty($field); @@ -162,7 +161,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface */ public function getMetaField(TransactionJournal $journal, string $field): ?string { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('journal-meta-updated'); $cache->addProperty($journal->id); $cache->addProperty($field); @@ -221,8 +220,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface */ public function getSplitJournals(): Collection { - $query = TransactionJournal - ::leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + $query = TransactionJournal::leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->groupBy('transaction_journals.id'); $result = $query->get(['transaction_journals.id as id', DB::raw('count(transactions.id) as transaction_count')]); $journalIds = []; @@ -234,8 +232,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface } $journalIds = array_unique($journalIds); - return TransactionJournal - ::with(['transactions']) + return TransactionJournal::with(['transactions']) ->whereIn('id', $journalIds)->get(); } diff --git a/app/Repositories/Journal/JournalCLIRepositoryInterface.php b/app/Repositories/Journal/JournalCLIRepositoryInterface.php index f9b2c1e899..cec8ec564d 100644 --- a/app/Repositories/Journal/JournalCLIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalCLIRepositoryInterface.php @@ -117,5 +117,4 @@ interface JournalCLIRepositoryInterface * @param User $user */ public function setUser(User $user); - } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 5e682539d6..750bd295b5 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -133,7 +133,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function getJournalTotal(TransactionJournal $journal): string { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty($journal->id); $cache->addProperty('amount-positive'); if ($cache->has()) { @@ -189,7 +189,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function getMetaDateById(int $journalId, string $field): ?Carbon { - $cache = new CacheProperties; + $cache = new CacheProperties(); $cache->addProperty('journal-meta-updated'); $cache->addProperty($journalId); $cache->addProperty($field); diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index c7ecd437c7..3958a012c1 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -130,8 +130,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface */ public function getJournalLinks(LinkType $linkType = null): Collection { - $query = TransactionJournalLink - ::with(['source', 'destination']) + $query = TransactionJournalLink::with(['source', 'destination']) ->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id') ->leftJoin('transaction_journals as dest_journals', 'journal_links.destination_id', '=', 'dest_journals.id') ->where('source_journals.user_id', $this->user->id) @@ -191,7 +190,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface */ public function store(array $data): LinkType { - $linkType = new LinkType; + $linkType = new LinkType(); $linkType->name = $data['name']; $linkType->inward = $data['inward']; $linkType->outward = $data['outward']; @@ -229,7 +228,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface return $existing; } - $link = new TransactionJournalLink; + $link = new TransactionJournalLink(); $link->linkType()->associate($linkType); if ('inward' === $information['direction']) { Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $inward->id, $outward->id)); @@ -285,11 +284,9 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface */ public function findSpecificLink(LinkType $linkType, TransactionJournal $inward, TransactionJournal $outward): ?TransactionJournalLink { - return TransactionJournalLink - ::where('link_type_id', $linkType->id) + return TransactionJournalLink::where('link_type_id', $linkType->id) ->where('source_id', $inward->id) ->where('destination_id', $outward->id)->first(); - } /** @@ -318,7 +315,6 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface // @ignoreException } } - } /** diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.php index 72758404d7..958c8d69b2 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php @@ -145,7 +145,6 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface $search = sprintf('%%%s%%', $part); $dbQuery->where('title', 'LIKE', $search); } - } return $dbQuery->take($limit)->get(['object_groups.*']); diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index c22ff21833..cf70d8b912 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -100,5 +100,4 @@ interface ObjectGroupRepositoryInterface * @return ObjectGroup */ public function update(ObjectGroup $objectGroup, array $data): ObjectGroup; - } diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 01a2ca0cc7..b64729e75c 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -189,7 +189,7 @@ trait ModifiesPiggyBanks public function createEvent(PiggyBank $piggyBank, string $amount): PiggyBankEvent { if (0 === bccomp('0', $amount)) { - return new PiggyBankEvent; + return new PiggyBankEvent(); } return PiggyBankEvent::create(['date' => Carbon::now(), 'amount' => $amount, 'piggy_bank_id' => $piggyBank->id]); @@ -242,7 +242,6 @@ trait ModifiesPiggyBanks } return $piggyBank; - } /** @@ -295,7 +294,6 @@ trait ModifiesPiggyBanks $piggyBank->objectGroups()->sync([$objectGroup->id]); $piggyBank->save(); } - } // try also with ID $objectGroupId = (int) ($data['object_group_id'] ?? 0); @@ -377,7 +375,7 @@ trait ModifiesPiggyBanks } $dbNote = $piggyBank->notes()->first(); if (null === $dbNote) { - $dbNote = new Note; + $dbNote = new Note(); $dbNote->noteable()->associate($piggyBank); } $dbNote->text = trim($note); @@ -475,7 +473,6 @@ trait ModifiesPiggyBanks } if (array_key_exists('startdate', $data)) { $piggyBank->startdate = $data['startdate']; - } $piggyBank->save(); diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index e74d486dd3..b34a7d29c7 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -239,7 +239,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $room = bcsub((string) $piggyBank->targetamount, (string) $repetition->currentamount); $compare = bcmul($repetition->currentamount, '-1'); - if(bccomp((string) $piggyBank->targetamount,'0') === 0) { + if (bccomp((string) $piggyBank->targetamount, '0') === 0) { // amount is zero? then the "room" is positive amount of we wish to add or remove. $room = app('steam')->positive($amount); Log::debug(sprintf('Room is now %s', $room)); @@ -302,7 +302,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function getPiggyBanksWithAmount(): Collection { - $currency = app('amount')->getDefaultCurrency(); $set = $this->getPiggyBanks(); @@ -370,7 +369,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function leftOnAccount(PiggyBank $piggyBank, Carbon $date): string { - $balance = app('steam')->balanceIgnoreVirtual($piggyBank->account, $date); /** @var Collection $piggies */ diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index e1ba67d01d..22a0d5f19c 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -53,7 +53,10 @@ use Log; */ class RecurringRepository implements RecurringRepositoryInterface { - use CalculateRangeOccurrences, CalculateXOccurrences, CalculateXOccurrencesSince, FiltersWeekends; + use CalculateRangeOccurrences; + use CalculateXOccurrences; + use CalculateXOccurrencesSince; + use FiltersWeekends; private User $user; @@ -100,8 +103,7 @@ class RecurringRepository implements RecurringRepositoryInterface public function getAll(): Collection { // grab ALL recurring transactions: - return Recurrence - ::with(['TransactionCurrency', 'TransactionType', 'RecurrenceRepetitions', 'RecurrenceTransactions']) + return Recurrence::with(['TransactionCurrency', 'TransactionType', 'RecurrenceRepetitions', 'RecurrenceTransactions']) ->orderBy('active', 'DESC') ->orderBy('title', 'ASC') ->get(); @@ -194,8 +196,7 @@ class RecurringRepository implements RecurringRepositoryInterface */ public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int { - $query = TransactionJournal - ::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id') + $query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id') ->where('transaction_journals.user_id', $recurrence->user_id) ->whereNull('transaction_journals.deleted_at') ->where('journal_meta.name', 'recurrence_id') @@ -292,8 +293,7 @@ class RecurringRepository implements RecurringRepositoryInterface */ public function getTransactionPaginator(Recurrence $recurrence, int $page, int $pageSize): LengthAwarePaginator { - $journalMeta = TransactionJournalMeta - ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + $journalMeta = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') ->whereNull('transaction_journals.deleted_at') ->where('transaction_journals.user_id', $this->user->id) ->where('name', 'recurrence_id') @@ -321,8 +321,7 @@ class RecurringRepository implements RecurringRepositoryInterface */ public function getTransactions(Recurrence $recurrence): Collection { - $journalMeta = TransactionJournalMeta - ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + $journalMeta = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') ->whereNull('transaction_journals.deleted_at') ->where('transaction_journals.user_id', $this->user->id) ->where('name', 'recurrence_id') @@ -334,8 +333,7 @@ class RecurringRepository implements RecurringRepositoryInterface $search[] = (int) $journalId; } if (empty($search)) { - - return new Collection; + return new Collection(); } /** @var GroupCollectorInterface $collector */ @@ -465,7 +463,6 @@ class RecurringRepository implements RecurringRepositoryInterface return (string) trans('firefly.recurring_daily', [], $language); } if ('weekly' === $repetition->repetition_type) { - $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language); if ($repetition->repetition_skip > 0) { return (string) trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $language); @@ -476,12 +473,16 @@ class RecurringRepository implements RecurringRepositoryInterface if ('monthly' === $repetition->repetition_type) { if ($repetition->repetition_skip > 0) { return (string) trans( - 'firefly.recurring_monthly_skip', ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], $language + 'firefly.recurring_monthly_skip', + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], + $language ); } return (string) trans( - 'firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], $language + 'firefly.recurring_monthly', + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], + $language ); } if ('ndom' === $repetition->repetition_type) { @@ -503,7 +504,6 @@ class RecurringRepository implements RecurringRepositoryInterface } return ''; - } /** diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index 08ceab085a..cdcaadd76d 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -254,5 +254,4 @@ interface RecurringRepositoryInterface * @return Recurrence */ public function update(Recurrence $recurrence, array $data): Recurrence; - } diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 53e8ee1c45..9cb52c36a7 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -196,7 +196,6 @@ class RuleRepository implements RuleRepositoryInterface } return implode(' ', $params); - } /** @@ -212,7 +211,7 @@ class RuleRepository implements RuleRepositoryInterface ->orderBy('rules.order', 'ASC') ->orderBy('rules.id', 'ASC') ->with(['ruleGroup', 'ruleTriggers'])->get(['rules.*']); - $filtered = new Collection; + $filtered = new Collection(); /** @var Rule $rule */ foreach ($collection as $rule) { /** @var RuleTrigger $ruleTrigger */ @@ -239,7 +238,7 @@ class RuleRepository implements RuleRepositoryInterface ->orderBy('rules.order', 'ASC') ->orderBy('rules.id', 'ASC') ->with(['ruleGroup', 'ruleTriggers'])->get(); - $filtered = new Collection; + $filtered = new Collection(); /** @var Rule $rule */ foreach ($collection as $rule) { /** @var RuleTrigger $ruleTrigger */ @@ -296,7 +295,7 @@ class RuleRepository implements RuleRepositoryInterface } // start by creating a new rule: - $rule = new Rule; + $rule = new Rule(); $rule->user()->associate($this->user->id); $rule->rule_group_id = $ruleGroup->id; @@ -344,7 +343,7 @@ class RuleRepository implements RuleRepositoryInterface return; } - $trigger = new RuleTrigger; + $trigger = new RuleTrigger(); $trigger->order = 0; $trigger->trigger_type = 'user_action'; $trigger->trigger_value = $moment; @@ -440,7 +439,6 @@ class RuleRepository implements RuleRepositoryInterface $this->storeTrigger($rule, $triggerValues); ++$order; } - } /** @@ -451,7 +449,7 @@ class RuleRepository implements RuleRepositoryInterface */ public function storeTrigger(Rule $rule, array $values): RuleTrigger { - $ruleTrigger = new RuleTrigger; + $ruleTrigger = new RuleTrigger(); $ruleTrigger->rule()->associate($rule); $ruleTrigger->order = $values['order']; $ruleTrigger->active = $values['active']; @@ -486,7 +484,6 @@ class RuleRepository implements RuleRepositoryInterface $this->storeAction($rule, $actionValues); ++$order; } - } /** @@ -497,7 +494,7 @@ class RuleRepository implements RuleRepositoryInterface */ public function storeAction(Rule $rule, array $values): RuleAction { - $ruleAction = new RuleAction; + $ruleAction = new RuleAction(); $ruleAction->rule()->associate($rule); $ruleAction->order = $values['order']; $ruleAction->active = $values['active']; diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index 06f8e329a3..aa1ef97406 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -31,7 +31,6 @@ use Illuminate\Support\Collection; */ interface RuleGroupRepositoryInterface { - /** * Make sure rule group order is correct in DB. */ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index aa65cb596e..32cc326ab5 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -371,7 +371,6 @@ class TagRepository implements TagRepositoryInterface $amount = bcmul($amount, '-1'); } $sums[$foreignCurrencyId][$type] = bcadd($sums[$foreignCurrencyId][$type], $amount); - } } @@ -433,7 +432,7 @@ class TagRepository implements TagRepositoryInterface if (!(null === $data['latitude'] && null === $data['longitude'] && null === $data['zoom_level'])) { $location = $this->getLocation($tag); if (null === $location) { - $location = new Location; + $location = new Location(); $location->locatable()->associate($tag); } @@ -457,5 +456,4 @@ class TagRepository implements TagRepositoryInterface { return $tag->locations()->first(); } - } diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 1a546821b3..afe80115ed 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -33,7 +33,6 @@ use Illuminate\Support\Collection; */ interface TagRepositoryInterface { - /** * @return int */