kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Some code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-07-13 15:50:42 +02:00
parent d872484607
commit 2b4088c5f7
32 changed files with 76 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/AccountController.php
View File

@@ -40,7 +40,6 @@ use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Preferences;
use Steam;
use View;
/**
@@ -228,9 +227,9 @@ class AccountController extends Controller
$start->subDay();
$ids = $accounts->pluck('id')->toArray();
$startBalances = Steam::balancesByAccounts($accounts, $start);
$endBalances = Steam::balancesByAccounts($accounts, $end);
$activities = Steam::getLastActivities($ids);
$startBalances = app('steam')->balancesByAccounts($accounts, $start);
$endBalances = app('steam')->balancesByAccounts($accounts, $end);
$activities = app('steam')->getLastActivities($ids);
$accounts->each(
function (Account $account) use ($activities, $startBalances, $endBalances) {
@@ -289,11 +288,11 @@ class AccountController extends Controller
if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
}
$fStart = $start->formatLocalized($this->monthAndDayFormat);
$fEnd = $end->formatLocalized($this->monthAndDayFormat);
$subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$periods = $this->getPeriodOverview($account, $end);
$fStart = $start->formatLocalized($this->monthAndDayFormat);
$fEnd = $end->formatLocalized($this->monthAndDayFormat);
$subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$periods = $this->getPeriodOverview($account, $end);
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
@@ -336,8 +335,8 @@ class AccountController extends Controller
if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
}
$subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]);
$periods = new Collection;
$subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]);
$periods = new Collection;
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);

6
app/Http/Controllers/Admin/UserController.php
View File

@@ -147,8 +147,10 @@ class UserController extends Controller
$subTitleIcon = 'fa-user';
$information = $repository->getUserData($user);
return view('admin.users.show', compact('title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
)
return view(
'admin.users.show', compact(
'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
)
);
}

3
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -27,10 +27,11 @@ use FireflyConfig;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User;
use Illuminate\Auth\Events\Registered;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
/**
* @codeCoverageIgnore
* Class RegisterController

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

@@ -444,7 +444,7 @@ class BudgetController extends Controller
// prep for "specific date" view.
if ('all' !== $moment && \strlen($moment) > 0) {
$start = new Carbon($moment);
$start = new Carbon($moment);
/** @var Carbon $end */
$end = app('navigation')->endOfPeriod($start, $range);
$subTitle = trans(

5
app/Http/Controllers/CategoryController.php
View File

@@ -38,7 +38,6 @@ use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Steam;
/**
* Class CategoryController.
@@ -400,7 +399,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class);
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
$transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount'));
// amount spent
/** @var JournalCollectorInterface $collector */
@@ -482,7 +481,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category)
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class);
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
$transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount'));
$entries->push(
[

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

@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use Steam;
/**
* Class BudgetController.
@@ -230,7 +229,7 @@ class BudgetController extends Controller
public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse
{
$budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
$cache = new CacheProperties;
$cache = new CacheProperties;
$cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-category');
@@ -278,7 +277,7 @@ class BudgetController extends Controller
public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse
{
$budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
$cache = new CacheProperties;
$cache = new CacheProperties;
$cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-expense');
@@ -486,7 +485,7 @@ class BudgetController extends Controller
$budgeted = [];
while ($current < $end) {
/** @var Carbon $currentStart */
$currentStart = app('navigation')->startOfPeriod($current, $range);
$currentStart = app('navigation')->startOfPeriod($current, $range);
/** @var Carbon $currentEnd */
$currentEnd = app('navigation')->endOfPeriod($current, $range);
$budgetLimits = $this->repository->getBudgetLimits($budget, $currentStart, $currentEnd);
@@ -581,7 +580,7 @@ class BudgetController extends Controller
/** @var BudgetLimit $budgetLimit */
foreach ($limits as $budgetLimit) {
$expenses = $this->repository->spentInPeriod(new Collection([$budget]), new Collection, $budgetLimit->start_date, $budgetLimit->end_date);
$expenses = Steam::positive($expenses);
$expenses = app('steam')->positive($expenses);
if ($limits->count() > 1) {
$name = $budget->name . ' ' . trans(
@@ -603,7 +602,7 @@ class BudgetController extends Controller
$left = $hasOverspent ? '0' : bcsub($amount, $expenses);
$spent = $hasOverspent ? $amount : $expenses;
$overspent = $hasOverspent ? Steam::positive($leftInLimit) : '0';
$overspent = $hasOverspent ? app('steam')->positive($leftInLimit) : '0';
$return[$name] = [
'left' => $left,

3
app/Http/Controllers/Chart/ReportController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use Log;
use Steam;
/**
* Class ReportController.
@@ -74,7 +73,7 @@ class ReportController extends Controller
$current = clone $start;
$chartData = [];
while ($current < $end) {
$balances = Steam::balancesByAccounts($accounts, $current);
$balances = app('steam')->balancesByAccounts($accounts, $current);
$sum = $this->arraySum($balances);
$label = $current->formatLocalized((string)trans('config.month_and_day'));
$chartData[$label] = $sum;

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

@@ -213,7 +213,7 @@ class CurrencyController extends Controller
public function index(Request $request)
{
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$pageSize = (int)Preferences::get('listPageSize', 50)->data;
$collection = $this->repository->get();

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

@@ -118,7 +118,7 @@ class HomeController extends Controller
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth());
$end = session('end', Carbon::now()->endOfMonth());
/** @noinspection NullPointerExceptionInspection */
$accounts = $repository->getAccountsById($frontPage->data);
$today = new Carbon;

2
app/Http/Controllers/Import/IndexController.php
View File

@@ -198,7 +198,7 @@ class IndexController extends Controller
{
// get and filter all import routines:
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var array $config */
$providerNames = array_keys(config('import.enabled'));
$providers = [];

4
app/Http/Controllers/Import/PrerequisitesController.php
View File

@@ -87,7 +87,7 @@ class PrerequisitesController extends Controller
throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore
}
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var PrerequisitesInterface $object */
$object = app($class);
$object->setUser($user);
@@ -143,7 +143,7 @@ class PrerequisitesController extends Controller
throw new FireflyException(sprintf('Cannot find class %s', $class)); // @codeCoverageIgnore
}
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var PrerequisitesInterface $object */
$object = app($class);
$object->setUser($user);

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

@@ -179,7 +179,7 @@ class JavascriptController extends Controller
/** @var Carbon $todayStart */
$todayStart = app('navigation')->startOfPeriod($today, $viewRange);
/** @var Carbon $todayEnd */
$todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);
$todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);
if ($todayStart->ne($start) || $todayEnd->ne($end)) {
$ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd];
}

15
app/Http/Controllers/Popup/ReportController.php
View File

@@ -130,7 +130,6 @@ class ReportController extends Controller
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
switch (true) {
case BalanceLine::ROLE_DEFAULTROLE === $role && null !== $budget && null !== $account:
// normal row with a budget:
@@ -160,8 +159,8 @@ class ReportController extends Controller
*/
private function budgetSpentAmount(array $attributes): string
{
$budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
if(null === $budget) {
$budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
if (null === $budget) {
throw new FireflyException('This is an unknown budget. Apologies.');
}
$journals = $this->popupHelper->byBudget($budget, $attributes);
@@ -182,7 +181,7 @@ class ReportController extends Controller
{
$category = $this->categoryRepository->findNull((int)$attributes['categoryId']);
if(null === $category) {
if (null === $category) {
throw new FireflyException('This is an unknown category. Apologies.');
}
@@ -202,9 +201,9 @@ class ReportController extends Controller
*/
private function expenseEntry(array $attributes): string
{
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
if(null === $account) {
if (null === $account) {
throw new FireflyException('This is an unknown account. Apologies.');
}
@@ -224,9 +223,9 @@ class ReportController extends Controller
*/
private function incomeEntry(array $attributes): string
{
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
if(null === $account) {
if (null === $account) {
throw new FireflyException('This is an unknown category. Apologies.');
}

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

@@ -56,8 +56,8 @@ class PreferencesController extends Controller
*/
public function index(AccountRepositoryInterface $repository)
{
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$viewRangePref = Preferences::get('viewRange', '1M');
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$viewRangePref = Preferences::get('viewRange', '1M');
/** @noinspection NullPointerExceptionInspection */
$viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []);

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

@@ -182,7 +182,7 @@ class ProfileController extends Controller
public function enable2FA(UserRepositoryInterface $repository)
{
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
if ($repository->hasRole($user, 'demo')) {
return redirect(route('profile.index'));
}
@@ -289,7 +289,7 @@ class ProfileController extends Controller
$current = $request->get('current_password');
$new = $request->get('new_password');
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
try {
$this->validatePassword($user, $current, $new);
} catch (ValidationException $e) {
@@ -351,7 +351,7 @@ class ProfileController extends Controller
public function regenerate()
{
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$token = $user->generateAccessToken();
Preferences::set('access_token', $token);
session()->flash('success', (string)trans('firefly.token_regenerated'));

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

@@ -185,7 +185,7 @@ class ReportController extends Controller
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|string
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|string
*
* @throws \FireflyIII\Exceptions\FireflyException
*/

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

@@ -293,7 +293,7 @@ class RuleController extends Controller
public function index()
{
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->createDefaultRuleGroup();
$this->createDefaultRule();
$ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user);

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

@@ -97,8 +97,8 @@ class RuleGroupController extends Controller
public function destroy(Request $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{
/** @var User $user */
$user = auth()->user();
$title = $ruleGroup->title;
$user = auth()->user();
$title = $ruleGroup->title;
/** @var RuleGroup $moveTo */
$moveTo = $user->ruleGroups()->find((int)$request->get('move_rules_before_delete'));

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

@@ -193,7 +193,7 @@ class TagController extends Controller
// prep for "specific date" view.
if ('all' !== $moment && \strlen($moment) > 0) {
$start = new Carbon($moment);
$start = new Carbon($moment);
/** @var Carbon $end */
$end = app('navigation')->endOfPeriod($start, $range);
$subTitle = trans(

2
app/Http/Controllers/Transaction/MassController.php
View File

@@ -124,7 +124,7 @@ class MassController extends Controller
public function edit(Collection $journals): IlluminateView
{
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$subTitle = trans('firefly.mass_edit_journals');

3
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -39,7 +39,6 @@ use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Preferences;
use Steam;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
@@ -94,7 +93,7 @@ class SplitController extends Controller
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
// basic fields:
$uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
$uploadSize = min(app('steam')->phpBytes(ini_get('upload_max_filesize')), app('steam')->phpBytes(ini_get('post_max_size')));
$subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
$subTitleIcon = 'fa-pencil';

6
app/Http/Controllers/TransactionController.php
View File

@@ -275,9 +275,9 @@ class TransactionController extends Controller
/** @noinspection PhpUndefinedMethodInspection */
$entries->push(
[
'name' => $dateName,
'sums' => $sums,
'sum' => $sum,
'name' => $dateName,
'sums' => $sums,
'sum' => $sum,
'start' => $currentDate['start']->format('Y-m-d'),
'end' => $currentDate['end']->format('Y-m-d'),