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

7
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) {

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

@@ -147,7 +147,9 @@ 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

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(
[ [

5
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.
@@ -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;

1
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:

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';

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();
} }

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);