diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php index 34c7c63b74..e8af125c61 100644 --- a/app/Generator/Report/Account/MonthReportGenerator.php +++ b/app/Generator/Report/Account/MonthReportGenerator.php @@ -35,14 +35,10 @@ use Throwable; */ class MonthReportGenerator implements ReportGeneratorInterface { - /** @var Collection The accounts involved in the report. */ - private $accounts; - /** @var Carbon The end date */ - private $end; - /** @var Collection The expense accounts. */ - private $expense; - /** @var Carbon The start date. */ - private $start; + private Collection $accounts; + private Carbon $end; + private Collection $expense; + private Carbon $start; /** * Generate the report. diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 4bb58e507c..e44cce9469 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -41,16 +41,11 @@ use Throwable; */ class MonthReportGenerator implements ReportGeneratorInterface { - /** @var Collection The accounts in the report. */ - private $accounts; - /** @var Collection The budgets in the report. */ - private $budgets; - /** @var Carbon The end date. */ - private $end; - /** @var array The expenses in the report. */ - private $expenses; - /** @var Carbon The start date. */ - private $start; + private Collection $accounts; + private Collection $budgets; + private Carbon $end; + private array $expenses; + private Carbon $start; /** * MonthReportGenerator constructor. diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 543701d9db..d0b1729589 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -244,20 +244,6 @@ class GroupCollector implements GroupCollectorInterface return $this; } - /** - * Limit the result to a specific transaction group. - * - * @param TransactionGroup $transactionGroup - * - * @return GroupCollectorInterface - */ - public function setGroup(TransactionGroup $transactionGroup): GroupCollectorInterface - { - $this->query->where('transaction_groups.id', $transactionGroup->id); - - return $this; - } - /** * Limit the result to a set of specific journals. * diff --git a/app/Helpers/Collector/GroupCollectorInterface.php b/app/Helpers/Collector/GroupCollectorInterface.php index 23f4c4f4ac..97e8029457 100644 --- a/app/Helpers/Collector/GroupCollectorInterface.php +++ b/app/Helpers/Collector/GroupCollectorInterface.php @@ -238,15 +238,6 @@ interface GroupCollectorInterface */ public function setDestinationAccounts(Collection $accounts): GroupCollectorInterface; - /** - * Limit the result to a specific transaction group. - * - * @param TransactionGroup $transactionGroup - * - * @return GroupCollectorInterface - */ - public function setGroup(TransactionGroup $transactionGroup): GroupCollectorInterface; - /** * Limit the result to a set of specific transaction journals. * diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php index 324d7de3a5..cd00d2b196 100644 --- a/app/Http/Controllers/Budget/AvailableBudgetController.php +++ b/app/Http/Controllers/Budget/AvailableBudgetController.php @@ -111,7 +111,7 @@ class AvailableBudgetController extends Controller */ public function createAlternative(Request $request, Carbon $start, Carbon $end) { - $currencies = $this->currencyRepos->getEnabled(); + $currencies = $this->currencyRepos->get(); $availableBudgets = $this->abRepository->get($start, $end); // remove already budgeted currencies: diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php index 5e25cdbdb4..0647658859 100644 --- a/app/Http/Controllers/Budget/BudgetLimitController.php +++ b/app/Http/Controllers/Budget/BudgetLimitController.php @@ -86,7 +86,7 @@ class BudgetLimitController extends Controller */ public function create(Budget $budget, Carbon $start, Carbon $end) { - $collection = $this->currencyRepos->getEnabled(); + $collection = $this->currencyRepos->get(); $budgetLimits = $this->blRepository->getBudgetLimits($budget, $start, $end); // remove already budgeted currencies: diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 8f4222a979..c55e0b61e9 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -99,7 +99,7 @@ class IndexController extends Controller $start = $start ?? session('start', Carbon::now()->startOfMonth()); $end = $end ?? app('navigation')->endOfPeriod($start, $range); $defaultCurrency = app('amount')->getDefaultCurrency(); - $currencies = $this->currencyRepository->getEnabled(); + $currencies = $this->currencyRepository->get(); $budgeted = '0'; $spent = '0'; diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index ba72763e6e..7d205367c1 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -55,7 +55,6 @@ class StartFireflySession extends StartSession && 'GET' === $request->method() && !$request->ajax()) { $session->setPreviousUrl($uri); - return; } } } diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 038cd8d106..815f1ba3df 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -401,14 +401,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $preferred; } - /** - * @return Collection - */ - public function getEnabled(): Collection - { - return TransactionCurrency::where('enabled', true)->orderBy('code', 'ASC')->get(); - } - /** * Get currency exchange rate. * diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 440257fa34..60d3eb7760 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -203,11 +203,6 @@ interface CurrencyRepositoryInterface */ public function getCurrencyByPreference(Preference $preference): TransactionCurrency; - /** - * @return Collection - */ - public function getEnabled(): Collection; - /** * Get currency exchange rate. * diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php index 78915668db..314e396472 100644 --- a/app/Support/Form/AccountForm.php +++ b/app/Support/Form/AccountForm.php @@ -72,41 +72,6 @@ class AccountForm return $grouped; } - /** - * Shows a