kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 02:03:40 +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

3
app/Generator/Chart/Basic/ChartJsGenerator.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Generator\Chart\Basic; namespace FireflyIII\Generator\Chart\Basic;
use FireflyIII\Support\ChartColour; use FireflyIII\Support\ChartColour;
use Steam;
/** /**
* Class ChartJsGenerator. * Class ChartJsGenerator.
@@ -130,7 +129,7 @@ class ChartJsGenerator implements GeneratorInterface
$index = 0; $index = 0;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
// make larger than 0 // make larger than 0
$chartData['datasets'][0]['data'][] = (float)Steam::positive($value); $chartData['datasets'][0]['data'][] = (float)app('steam')->positive($value);
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index); $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
$chartData['labels'][] = $key; $chartData['labels'][] = $key;
++$index; ++$index;

5
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
/** /**
* Class MonthReportGenerator. * Class MonthReportGenerator.
@@ -199,7 +198,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end); $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$journals = $journals->reverse(); $journals = $journals->reverse();
$dayBeforeBalance = Steam::balance($account, $date); $dayBeforeBalance = app('steam')->balance($account, $date);
$startBalance = $dayBeforeBalance; $startBalance = $dayBeforeBalance;
$currency = $currencyRepos->findNull((int)$accountRepository->getMetaValue($account, 'currency_id')); $currency = $currencyRepos->findNull((int)$accountRepository->getMetaValue($account, 'currency_id'));
@@ -225,7 +224,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
'journals' => $journals->reverse(), 'journals' => $journals->reverse(),
'exists' => $journals->count() > 0, 'exists' => $journals->count() > 0,
'end' => $this->end->formatLocalized((string)trans('config.month_and_day')), 'end' => $this->end->formatLocalized((string)trans('config.month_and_day')),
'endBalance' => Steam::balance($account, $this->end), 'endBalance' => app('steam')->balance($account, $this->end),
'dayBefore' => $date->formatLocalized((string)trans('config.month_and_day')), 'dayBefore' => $date->formatLocalized((string)trans('config.month_and_day')),
'dayBeforeBalance' => $dayBeforeBalance, 'dayBeforeBalance' => $dayBeforeBalance,
]; ];

3
app/Helpers/Chart/MetaPieChart.php
View File

@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
/** /**
* Class MetaPieChart. * Class MetaPieChart.
@@ -363,7 +362,7 @@ class MetaPieChart implements MetaPieChartInterface
$object = $repository->find((int)$objectId); $object = $repository->find((int)$objectId);
$names[$objectId] = $object->name ?? $object->tag; $names[$objectId] = $object->name ?? $object->tag;
} }
$amount = Steam::positive($amount); $amount = app('steam')->positive($amount);
$this->total = bcadd($this->total, $amount); $this->total = bcadd($this->total, $amount);
$chartData[$names[$objectId]] = $amount; $chartData[$names[$objectId]] = $amount;
} }

5
app/Helpers/Collector/JournalCollector.php
View File

@@ -49,7 +49,6 @@ use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Steam;
/** /**
* TODO rename references to journals to transactions * TODO rename references to journals to transactions
@@ -282,10 +281,10 @@ class JournalCollector implements JournalCollectorInterface
$set->each( $set->each(
function (Transaction $transaction) { function (Transaction $transaction) {
$transaction->date = new Carbon($transaction->date); $transaction->date = new Carbon($transaction->date);
$transaction->description = Steam::decrypt((int)$transaction->encrypted, $transaction->description); $transaction->description = app('steam')->decrypt((int)$transaction->encrypted, $transaction->description);
if (null !== $transaction->bill_name) { if (null !== $transaction->bill_name) {
$transaction->bill_name = Steam::decrypt((int)$transaction->bill_name_encrypted, $transaction->bill_name); $transaction->bill_name = app('steam')->decrypt((int)$transaction->bill_name_encrypted, $transaction->bill_name);
} }
$transaction->account_name = app('steam')->tryDecrypt($transaction->account_name); $transaction->account_name = app('steam')->tryDecrypt($transaction->account_name);
$transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name); $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);

3
app/Helpers/Filter/TransferFilter.php
View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Helpers\Filter;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
/** /**
* Class TransferFilter. * Class TransferFilter.
@@ -53,7 +52,7 @@ class TransferFilter implements FilterInterface
} }
// make property string: // make property string:
$journalId = $transaction->transaction_journal_id; $journalId = $transaction->transaction_journal_id;
$amount = Steam::positive($transaction->transaction_amount); $amount = app('steam')->positive($transaction->transaction_amount);
$accountIds = [(int)$transaction->account_id, (int)$transaction->opposing_account_id]; $accountIds = [(int)$transaction->account_id, (int)$transaction->opposing_account_id];
$transactionIds = [$transaction->id, (int)$transaction->opposing_id]; $transactionIds = [$transaction->id, (int)$transaction->opposing_id];
sort($accountIds); sort($accountIds);

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

@@ -40,7 +40,6 @@ use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences; use Preferences;
use Steam;
use View; use View;
/** /**
@@ -228,9 +227,9 @@ class AccountController extends Controller
$start->subDay(); $start->subDay();
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$startBalances = Steam::balancesByAccounts($accounts, $start); $startBalances = app('steam')->balancesByAccounts($accounts, $start);
$endBalances = Steam::balancesByAccounts($accounts, $end); $endBalances = app('steam')->balancesByAccounts($accounts, $end);
$activities = Steam::getLastActivities($ids); $activities = app('steam')->getLastActivities($ids);
$accounts->each( $accounts->each(
function (Account $account) use ($activities, $startBalances, $endBalances) { function (Account $account) use ($activities, $startBalances, $endBalances) {
@@ -289,11 +288,11 @@ class AccountController extends Controller
if (0 === $currencyId) { if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
} }
$fStart = $start->formatLocalized($this->monthAndDayFormat); $fStart = $start->formatLocalized($this->monthAndDayFormat);
$fEnd = $end->formatLocalized($this->monthAndDayFormat); $fEnd = $end->formatLocalized($this->monthAndDayFormat);
$subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); $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')]); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$periods = $this->getPeriodOverview($account, $end); $periods = $this->getPeriodOverview($account, $end);
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
@@ -336,8 +335,8 @@ class AccountController extends Controller
if (0 === $currencyId) { if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore
} }
$subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]); $subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]);
$periods = new Collection; $periods = new Collection;
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); $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'; $subTitleIcon = 'fa-user';
$information = $repository->getUserData($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\Http\Controllers\Controller;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Events\Registered;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* Class RegisterController * Class RegisterController

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

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

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

@@ -38,7 +38,6 @@ use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Preferences; use Preferences;
use Steam;
/** /**
* Class CategoryController. * Class CategoryController.
@@ -400,7 +399,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class); $collector->removeFilter(InternalTransferFilter::class);
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount')); $transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount'));
// amount spent // amount spent
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
@@ -482,7 +481,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category) $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category)
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class); $collector->removeFilter(InternalTransferFilter::class);
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount')); $transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount'));
$entries->push( $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 FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
/** /**
* Class BudgetController. * Class BudgetController.
@@ -230,7 +229,7 @@ class BudgetController extends Controller
public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse
{ {
$budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id; $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
$cache = new CacheProperties; $cache = new CacheProperties;
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId); $cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-category'); $cache->addProperty('chart.budget.expense-category');
@@ -278,7 +277,7 @@ class BudgetController extends Controller
public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse
{ {
$budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id; $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
$cache = new CacheProperties; $cache = new CacheProperties;
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId); $cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-expense'); $cache->addProperty('chart.budget.expense-expense');
@@ -486,7 +485,7 @@ class BudgetController extends Controller
$budgeted = []; $budgeted = [];
while ($current < $end) { while ($current < $end) {
/** @var Carbon $currentStart */ /** @var Carbon $currentStart */
$currentStart = app('navigation')->startOfPeriod($current, $range); $currentStart = app('navigation')->startOfPeriod($current, $range);
/** @var Carbon $currentEnd */ /** @var Carbon $currentEnd */
$currentEnd = app('navigation')->endOfPeriod($current, $range); $currentEnd = app('navigation')->endOfPeriod($current, $range);
$budgetLimits = $this->repository->getBudgetLimits($budget, $currentStart, $currentEnd); $budgetLimits = $this->repository->getBudgetLimits($budget, $currentStart, $currentEnd);
@@ -581,7 +580,7 @@ class BudgetController extends Controller
/** @var BudgetLimit $budgetLimit */ /** @var BudgetLimit $budgetLimit */
foreach ($limits as $budgetLimit) { foreach ($limits as $budgetLimit) {
$expenses = $this->repository->spentInPeriod(new Collection([$budget]), new Collection, $budgetLimit->start_date, $budgetLimit->end_date); $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) { if ($limits->count() > 1) {
$name = $budget->name . ' ' . trans( $name = $budget->name . ' ' . trans(
@@ -603,7 +602,7 @@ class BudgetController extends Controller
$left = $hasOverspent ? '0' : bcsub($amount, $expenses); $left = $hasOverspent ? '0' : bcsub($amount, $expenses);
$spent = $hasOverspent ? $amount : $expenses; $spent = $hasOverspent ? $amount : $expenses;
$overspent = $hasOverspent ? Steam::positive($leftInLimit) : '0'; $overspent = $hasOverspent ? app('steam')->positive($leftInLimit) : '0';
$return[$name] = [ $return[$name] = [
'left' => $left, '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\Http\JsonResponse;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Steam;
/** /**
* Class ReportController. * Class ReportController.
@@ -74,7 +73,7 @@ class ReportController extends Controller
$current = clone $start; $current = clone $start;
$chartData = []; $chartData = [];
while ($current < $end) { while ($current < $end) {
$balances = Steam::balancesByAccounts($accounts, $current); $balances = app('steam')->balancesByAccounts($accounts, $current);
$sum = $this->arraySum($balances); $sum = $this->arraySum($balances);
$label = $current->formatLocalized((string)trans('config.month_and_day')); $label = $current->formatLocalized((string)trans('config.month_and_day'));
$chartData[$label] = $sum; $chartData[$label] = $sum;

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

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

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

@@ -118,7 +118,7 @@ class HomeController extends Controller
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', Carbon::now()->endOfMonth());
/** @noinspection NullPointerExceptionInspection */ /** @noinspection NullPointerExceptionInspection */
$accounts = $repository->getAccountsById($frontPage->data); $accounts = $repository->getAccountsById($frontPage->data);
$today = new Carbon; $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: // get and filter all import routines:
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var array $config */ /** @var array $config */
$providerNames = array_keys(config('import.enabled')); $providerNames = array_keys(config('import.enabled'));
$providers = []; $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 throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore
} }
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var PrerequisitesInterface $object */ /** @var PrerequisitesInterface $object */
$object = app($class); $object = app($class);
$object->setUser($user); $object->setUser($user);
@@ -143,7 +143,7 @@ class PrerequisitesController extends Controller
throw new FireflyException(sprintf('Cannot find class %s', $class)); // @codeCoverageIgnore throw new FireflyException(sprintf('Cannot find class %s', $class)); // @codeCoverageIgnore
} }
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var PrerequisitesInterface $object */ /** @var PrerequisitesInterface $object */
$object = app($class); $object = app($class);
$object->setUser($user); $object->setUser($user);

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

@@ -179,7 +179,7 @@ class JavascriptController extends Controller
/** @var Carbon $todayStart */ /** @var Carbon $todayStart */
$todayStart = app('navigation')->startOfPeriod($today, $viewRange); $todayStart = app('navigation')->startOfPeriod($today, $viewRange);
/** @var Carbon $todayEnd */ /** @var Carbon $todayEnd */
$todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange); $todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);
if ($todayStart->ne($start) || $todayEnd->ne($end)) { if ($todayStart->ne($start) || $todayEnd->ne($end)) {
$ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd]; $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']); $account = $this->accountRepository->findNull((int)$attributes['accountId']);
switch (true) { switch (true) {
case BalanceLine::ROLE_DEFAULTROLE === $role && null !== $budget && null !== $account: case BalanceLine::ROLE_DEFAULTROLE === $role && null !== $budget && null !== $account:
// normal row with a budget: // normal row with a budget:
@@ -160,8 +159,8 @@ class ReportController extends Controller
*/ */
private function budgetSpentAmount(array $attributes): string private function budgetSpentAmount(array $attributes): string
{ {
$budget = $this->budgetRepository->findNull((int)$attributes['budgetId']); $budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
if(null === $budget) { if (null === $budget) {
throw new FireflyException('This is an unknown budget. Apologies.'); throw new FireflyException('This is an unknown budget. Apologies.');
} }
$journals = $this->popupHelper->byBudget($budget, $attributes); $journals = $this->popupHelper->byBudget($budget, $attributes);
@@ -182,7 +181,7 @@ class ReportController extends Controller
{ {
$category = $this->categoryRepository->findNull((int)$attributes['categoryId']); $category = $this->categoryRepository->findNull((int)$attributes['categoryId']);
if(null === $category) { if (null === $category) {
throw new FireflyException('This is an unknown category. Apologies.'); throw new FireflyException('This is an unknown category. Apologies.');
} }
@@ -202,9 +201,9 @@ class ReportController extends Controller
*/ */
private function expenseEntry(array $attributes): string 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.'); throw new FireflyException('This is an unknown account. Apologies.');
} }
@@ -224,9 +223,9 @@ class ReportController extends Controller
*/ */
private function incomeEntry(array $attributes): string 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.'); 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) public function index(AccountRepositoryInterface $repository)
{ {
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$viewRangePref = Preferences::get('viewRange', '1M'); $viewRangePref = Preferences::get('viewRange', '1M');
/** @noinspection NullPointerExceptionInspection */ /** @noinspection NullPointerExceptionInspection */
$viewRange = $viewRangePref->data; $viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []); $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) public function enable2FA(UserRepositoryInterface $repository)
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
if ($repository->hasRole($user, 'demo')) { if ($repository->hasRole($user, 'demo')) {
return redirect(route('profile.index')); return redirect(route('profile.index'));
} }
@@ -289,7 +289,7 @@ class ProfileController extends Controller
$current = $request->get('current_password'); $current = $request->get('current_password');
$new = $request->get('new_password'); $new = $request->get('new_password');
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
try { try {
$this->validatePassword($user, $current, $new); $this->validatePassword($user, $current, $new);
} catch (ValidationException $e) { } catch (ValidationException $e) {
@@ -351,7 +351,7 @@ class ProfileController extends Controller
public function regenerate() public function regenerate()
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$token = $user->generateAccessToken(); $token = $user->generateAccessToken();
Preferences::set('access_token', $token); Preferences::set('access_token', $token);
session()->flash('success', (string)trans('firefly.token_regenerated')); 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 $start
* @param Carbon $end * @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 * @throws \FireflyIII\Exceptions\FireflyException
*/ */

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

@@ -293,7 +293,7 @@ class RuleController extends Controller
public function index() public function index()
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$this->createDefaultRuleGroup(); $this->createDefaultRuleGroup();
$this->createDefaultRule(); $this->createDefaultRule();
$ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user); $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) public function destroy(Request $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$title = $ruleGroup->title; $title = $ruleGroup->title;
/** @var RuleGroup $moveTo */ /** @var RuleGroup $moveTo */
$moveTo = $user->ruleGroups()->find((int)$request->get('move_rules_before_delete')); $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. // prep for "specific date" view.
if ('all' !== $moment && \strlen($moment) > 0) { if ('all' !== $moment && \strlen($moment) > 0) {
$start = new Carbon($moment); $start = new Carbon($moment);
/** @var Carbon $end */ /** @var Carbon $end */
$end = app('navigation')->endOfPeriod($start, $range); $end = app('navigation')->endOfPeriod($start, $range);
$subTitle = trans( $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 public function edit(Collection $journals): IlluminateView
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$subTitle = trans('firefly.mass_edit_journals'); $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\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences; use Preferences;
use Steam;
use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\ParameterBag;
use View; use View;
@@ -94,7 +93,7 @@ class SplitController extends Controller
return $this->redirectToAccount($journal); // @codeCoverageIgnore return $this->redirectToAccount($journal); // @codeCoverageIgnore
} }
// basic fields: // 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]); $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
$subTitleIcon = 'fa-pencil'; $subTitleIcon = 'fa-pencil';

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

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

1
app/Http/Middleware/Authenticate.php
View File

@@ -117,6 +117,7 @@ class Authenticate
); );
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
} }
/** @noinspection PhpUndefinedMethodInspection */ /** @noinspection PhpUndefinedMethodInspection */
return $this->auth->authenticate(); return $this->auth->authenticate();
} }

2
app/Http/Middleware/AuthenticateTwoFactor.php
View File

@@ -73,7 +73,7 @@ class AuthenticateTwoFactor
$is2faEnabled = app('preferences')->get('twoFactorAuthEnabled', false)->data; $is2faEnabled = app('preferences')->get('twoFactorAuthEnabled', false)->data;
$has2faSecret = null !== app('preferences')->get('twoFactorAuthSecret'); $has2faSecret = null !== app('preferences')->get('twoFactorAuthSecret');
/** @noinspection PhpUndefinedMethodInspection */ /** @noinspection PhpUndefinedMethodInspection */
$is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated'); $is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated');
if ($is2faEnabled && $has2faSecret && !$is2faAuthed) { if ($is2faEnabled && $has2faSecret && !$is2faAuthed) {
Log::debug('Does not seem to be 2 factor authed, redirect.'); Log::debug('Does not seem to be 2 factor authed, redirect.');

3
app/Models/PiggyBank.php
View File

@@ -27,7 +27,6 @@ use Crypt;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Steam;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
@@ -149,7 +148,7 @@ class PiggyBank extends Model
*/ */
public function leftOnAccount(Carbon $date): string public function leftOnAccount(Carbon $date): string
{ {
$balance = Steam::balanceIgnoreVirtual($this->account, $date); $balance = app('steam')->balanceIgnoreVirtual($this->account, $date);
/** @var PiggyBank $piggyBank */ /** @var PiggyBank $piggyBank */
foreach ($this->account->piggyBanks as $piggyBank) { foreach ($this->account->piggyBanks as $piggyBank) {
$currentAmount = $piggyBank->currentRelevantRep()->currentamount ?? '0'; $currentAmount = $piggyBank->currentRelevantRep()->currentamount ?? '0';

5
app/Repositories/Account/AccountTasker.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Steam;
/** /**
* Class AccountTasker. * Class AccountTasker.
@@ -50,8 +49,8 @@ class AccountTasker implements AccountTaskerInterface
{ {
$yesterday = clone $start; $yesterday = clone $start;
$yesterday->subDay(); $yesterday->subDay();
$startSet = Steam::balancesByAccounts($accounts, $yesterday); $startSet = app('steam')->balancesByAccounts($accounts, $yesterday);
$endSet = Steam::balancesByAccounts($accounts, $end); $endSet = app('steam')->balancesByAccounts($accounts, $end);
Log::debug('Start of accountreport'); Log::debug('Start of accountreport');

21
app/Support/Search/Modifier.php
View File

@@ -26,7 +26,6 @@ use Carbon\Carbon;
use Exception; use Exception;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use Log; use Log;
use Steam;
/** /**
* Class Modifier * Class Modifier
@@ -42,8 +41,8 @@ class Modifier
*/ */
public static function amountCompare(Transaction $transaction, string $amount, int $expected): bool public static function amountCompare(Transaction $transaction, string $amount, int $expected): bool
{ {
$amount = Steam::positive($amount); $amount = app('steam')->positive($amount);
$transactionAmount = Steam::positive($transaction->transaction_amount); $transactionAmount = app('steam')->positive($transaction->transaction_amount);
$compare = bccomp($amount, $transactionAmount); $compare = bccomp($amount, $transactionAmount);
Log::debug(sprintf('%s vs %s is %d', $amount, $transactionAmount, $compare)); Log::debug(sprintf('%s vs %s is %d', $amount, $transactionAmount, $compare));
@@ -64,12 +63,12 @@ class Modifier
$res = true; $res = true;
switch ($modifier['type']) { switch ($modifier['type']) {
case 'source': case 'source':
$name = Steam::tryDecrypt($transaction->account_name); $name = app('steam')->tryDecrypt($transaction->account_name);
$res = self::stringCompare($name, $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'destination': case 'destination':
$name = Steam::tryDecrypt($transaction->opposing_account_name); $name = app('steam')->tryDecrypt($transaction->opposing_account_name);
$res = self::stringCompare($name, $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
@@ -82,7 +81,7 @@ class Modifier
Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'bill': case 'bill':
$name = Steam::tryDecrypt($transaction->bill_name); $name = app('steam')->tryDecrypt($transaction->bill_name);
$res = self::stringCompare($name, $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
@@ -166,11 +165,11 @@ class Modifier
{ {
$journalBudget = ''; $journalBudget = '';
if (null !== $transaction->transaction_journal_budget_name) { if (null !== $transaction->transaction_journal_budget_name) {
$journalBudget = Steam::decrypt((int)$transaction->transaction_journal_budget_encrypted, $transaction->transaction_journal_budget_name); $journalBudget = app('steam')->decrypt((int)$transaction->transaction_journal_budget_encrypted, $transaction->transaction_journal_budget_name);
} }
$transactionBudget = ''; $transactionBudget = '';
if (null !== $transaction->transaction_budget_name) { if (null !== $transaction->transaction_budget_name) {
$journalBudget = Steam::decrypt((int)$transaction->transaction_budget_encrypted, $transaction->transaction_budget_name); $journalBudget = app('steam')->decrypt((int)$transaction->transaction_budget_encrypted, $transaction->transaction_budget_name);
} }
return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search); return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search);
@@ -186,11 +185,13 @@ class Modifier
{ {
$journalCategory = ''; $journalCategory = '';
if (null !== $transaction->transaction_journal_category_name) { if (null !== $transaction->transaction_journal_category_name) {
$journalCategory = Steam::decrypt((int)$transaction->transaction_journal_category_encrypted, $transaction->transaction_journal_category_name); $journalCategory = app('steam')->decrypt(
(int)$transaction->transaction_journal_category_encrypted, $transaction->transaction_journal_category_name
);
} }
$transactionCategory = ''; $transactionCategory = '';
if (null !== $transaction->transaction_category_name) { if (null !== $transaction->transaction_category_name) {
$journalCategory = Steam::decrypt((int)$transaction->transaction_category_encrypted, $transaction->transaction_category_name); $journalCategory = app('steam')->decrypt((int)$transaction->transaction_category_encrypted, $transaction->transaction_category_name);
} }
return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search); return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search);