kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup

Browse Source
This commit is contained in:
James Cole
2023-01-03 06:48:53 +01:00
parent 6784fe4436
commit 07e4e93632
47 changed files with 118 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Account/EditController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\AccountFormRequest;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Controllers\ModelInformation;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
@@ -44,9 +43,8 @@ class EditController extends Controller
{
use ModelInformation;
private AttachmentHelperInterface $attachments;
private CurrencyRepositoryInterface $currencyRepos;
private AccountRepositoryInterface $repository;
private AttachmentHelperInterface $attachments;
private AccountRepositoryInterface $repository;
/**
* EditController constructor.
@@ -61,9 +59,8 @@ class EditController extends Controller
app('view')->share('mainTitleIcon', 'fa-credit-card');
app('view')->share('title', (string)trans('firefly.accounts'));
$this->repository = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
$this->repository = app(AccountRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
return $next($request);
}

14
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -33,7 +33,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
@@ -50,12 +49,8 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class ReconcileController extends Controller
{
/** @var AccountRepositoryInterface The account repository */
private $accountRepos;
/** @var CurrencyRepositoryInterface The currency repository */
private $currencyRepos;
/** @var JournalRepositoryInterface Journals and transactions overview */
private $repository;
private AccountRepositoryInterface $accountRepos;
private JournalRepositoryInterface $repository;
/**
* ReconcileController constructor.
@@ -71,9 +66,8 @@ class ReconcileController extends Controller
function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-credit-card');
app('view')->share('title', (string)trans('firefly.accounts'));
$this->repository = app(JournalRepositoryInterface::class);
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class);
$this->repository = app(JournalRepositoryInterface::class);
$this->accountRepos = app(AccountRepositoryInterface::class);
return $next($request);
}

7
app/Http/Controllers/Account/ShowController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Controllers\PeriodOverview;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
@@ -49,8 +48,7 @@ class ShowController extends Controller
{
use PeriodOverview;
private CurrencyRepositoryInterface $currencyRepos;
private AccountRepositoryInterface $repository;
private AccountRepositoryInterface $repository;
/**
* ShowController constructor.
@@ -69,8 +67,7 @@ class ShowController extends Controller
app('view')->share('mainTitleIcon', 'fa-credit-card');
app('view')->share('title', (string)trans('firefly.accounts'));
$this->repository = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class);
$this->repository = app(AccountRepositoryInterface::class);
return $next($request);
}

4
app/Http/Controllers/Budget/IndexController.php
View File

@@ -305,6 +305,10 @@ class IndexController extends Controller
}
}
// final calculation for 'left':
/**
* @var int $currencyId
* @var array $info
*/
foreach ($sums['budgeted'] as $currencyId => $info) {
$spent = $sums['spent'][$currencyId]['amount'] ?? '0';
$budgeted = $sums['budgeted'][$currencyId]['amount'] ?? '0';

1
app/Http/Controllers/Chart/ExpenseReportController.php
View File

@@ -185,6 +185,7 @@ class ExpenseReportController extends Controller
// remove all empty entries to prevent cluttering:
$newSet = [];
foreach ($chartData as $key => $entry) {
// TODO not sure, this is a bad comparison.
if (0 === !array_sum($entry['entries'])) {
$newSet[$key] = $entry;
}

2
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -83,7 +83,7 @@ class PiggyBankController extends Controller
// get first event or start date of piggy bank or today
$startDate = $piggyBank->startdate ?? today(config('app.timezone'));
/** @var PiggyBankEvent $firstEvent */
/** @var PiggyBankEvent|null $firstEvent */
$firstEvent = $set->first();
$firstDate = null === $firstEvent ? new Carbon() : $firstEvent->date;

23
app/Http/Controllers/Json/BudgetController.php
View File

@@ -30,8 +30,6 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
@@ -42,16 +40,9 @@ class BudgetController extends Controller
{
use DateCalculation;
/** @var AvailableBudgetRepositoryInterface */
private $abRepository;
/** @var BudgetLimitRepositoryInterface */
private $blRepository;
/** @var CurrencyRepositoryInterface */
private $currencyRepository;
/** @var OperationsRepositoryInterface */
private $opsRepository;
/** @var BudgetRepositoryInterface The budget repository */
private $repository;
private AvailableBudgetRepositoryInterface $abRepository;
private BudgetLimitRepositoryInterface $blRepository;
private BudgetRepositoryInterface $repository;
/**
* IndexController constructor.
@@ -66,11 +57,9 @@ class BudgetController extends Controller
function ($request, $next) {
app('view')->share('title', (string)trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class);
$this->opsRepository = app(OperationsRepositoryInterface::class);
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->blRepository = app(BudgetLimitRepositoryInterface::class);
$this->repository = app(BudgetRepositoryInterface::class);
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->blRepository = app(BudgetLimitRepositoryInterface::class);
$this->repository->cleanupBudgets();
return $next($request);

4
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -47,8 +47,6 @@ use Throwable;
class ReconcileController extends Controller
{
private AccountRepositoryInterface $accountRepos;
private CurrencyRepositoryInterface $currencyRepos;
private JournalRepositoryInterface $repository;
/**
* ReconcileController constructor.
@@ -64,9 +62,7 @@ class ReconcileController extends Controller
function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-credit-card');
app('view')->share('title', (string)trans('firefly.accounts'));
$this->repository = app(JournalRepositoryInterface::class);
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class);
return $next($request);
}

2
app/Http/Controllers/PreferencesController.php
View File

@@ -88,7 +88,7 @@ class PreferencesController extends Controller
$role = sprintf('opt_group_l_%s', $type);
}
if ('' === $role || 'opt_group_' === $role) {
if ('opt_group_' === $role) {
$role = 'opt_group_defaultAsset';
}
$groupedAccounts[trans(sprintf('firefly.%s', $role))][$account->id] = $account->name;

4
app/Http/Controllers/ProfileController.php
View File

@@ -197,9 +197,9 @@ class ProfileController extends Controller
*
* @param Request $request
*
* @return Application|RedirectResponse|Redirector
* @return View|RedirectResponse
*/
public function deleteAccount(Request $request): Application|RedirectResponse|Redirector
public function deleteAccount(Request $request): View|RedirectResponse
{
if (!$this->internalAuth || !$this->internalIdentity) {
$request->session()->flash('error', trans('firefly.external_user_mgt_disabled'));

11
app/Http/Controllers/Report/BudgetController.php
View File

@@ -28,9 +28,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\NoBudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\BasicDataSupport;
@@ -49,10 +46,7 @@ class BudgetController extends Controller
{
use BasicDataSupport;
private BudgetLimitRepositoryInterface $blRepository;
private NoBudgetRepositoryInterface $nbRepository;
private OperationsRepositoryInterface $opsRepository;
private BudgetRepositoryInterface $repository;
private OperationsRepositoryInterface $opsRepository;
/**
* ExpenseReportController constructor.
@@ -65,9 +59,6 @@ class BudgetController extends Controller
$this->middleware(
function ($request, $next) {
$this->opsRepository = app(OperationsRepositoryInterface::class);
$this->repository = app(BudgetRepositoryInterface::class);
$this->blRepository = app(BudgetLimitRepositoryInterface::class);
$this->nbRepository = app(NoBudgetRepositoryInterface::class);
return $next($request);
}

2
app/Http/Controllers/ReportController.php
View File

@@ -290,7 +290,7 @@ class ReportController extends Controller
$role = sprintf('opt_group_l_%s', $type);
}
if ('' === $role || 'opt_group_' === $role) {
if ('opt_group_' === $role) {
$role = 'opt_group_defaultAsset';
}
$groupedAccounts[trans(sprintf('firefly.%s', $role))][$account->id] = $account;