Some code cleanup.

2025-10-18 18:40:12 +00:00 · 2018-07-13 15:50:42 +02:00
parent d872484607
commit 2b4088c5f7
32 changed files with 76 additions and 84 deletions
--- a/app/Generator/Chart/Basic/ChartJsGenerator.php
+++ b/app/Generator/Chart/Basic/ChartJsGenerator.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 namespace FireflyIII\Generator\Chart\Basic;

 use FireflyIII\Support\ChartColour;
-use Steam;

 /**
 * Class ChartJsGenerator.
@@ -130,7 +129,7 @@ class ChartJsGenerator implements GeneratorInterface
        $index = 0;
        foreach ($data as $key => $value) {
            // 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['labels'][]                         = $key;
            ++$index;
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
-use Steam;

 /**
 * Class MonthReportGenerator.
@@ -199,7 +198,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
        $journals         = $collector->getJournals();
        $journals         = $journals->reverse();
-        $dayBeforeBalance = Steam::balance($account, $date);
+        $dayBeforeBalance = app('steam')->balance($account, $date);
        $startBalance     = $dayBeforeBalance;
        $currency         = $currencyRepos->findNull((int)$accountRepository->getMetaValue($account, 'currency_id'));

@@ -225,7 +224,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
            'journals'         => $journals->reverse(),
            'exists'           => $journals->count() > 0,
            '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')),
            'dayBeforeBalance' => $dayBeforeBalance,
        ];
--- a/app/Helpers/Chart/MetaPieChart.php
+++ b/app/Helpers/Chart/MetaPieChart.php
@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
-use Steam;

 /**
 * Class MetaPieChart.
@@ -363,7 +362,7 @@ class MetaPieChart implements MetaPieChartInterface
                $object           = $repository->find((int)$objectId);
                $names[$objectId] = $object->name ?? $object->tag;
            }
-            $amount                       = Steam::positive($amount);
+            $amount                       = app('steam')->positive($amount);
            $this->total                  = bcadd($this->total, $amount);
            $chartData[$names[$objectId]] = $amount;
        }
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -49,7 +49,6 @@ use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
-use Steam;

 /**
 * TODO rename references to journals to transactions
@@ -282,10 +281,10 @@ class JournalCollector implements JournalCollectorInterface
        $set->each(
            function (Transaction $transaction) {
                $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) {
-                    $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->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);
--- a/app/Helpers/Filter/TransferFilter.php
+++ b/app/Helpers/Filter/TransferFilter.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Helpers\Filter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
-use Steam;

 /**
 * Class TransferFilter.
@@ -53,7 +52,7 @@ class TransferFilter implements FilterInterface
            }
            // make property string:
            $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];
            $transactionIds = [$transaction->id, (int)$transaction->opposing_id];
            sort($accountIds);
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -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) {
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -147,7 +147,9 @@ 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'
                              )
        );
    }
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -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
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -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(
                [
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -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.
@@ -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,
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -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;
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -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:
@@ -161,7 +160,7 @@ class ReportController extends Controller
    private function budgetSpentAmount(array $attributes): string
    {
        $budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
-        if(null === $budget) {
+        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.');
        }

@@ -204,7 +203,7 @@ class ReportController extends Controller
    {
        $account = $this->accountRepository->findNull((int)$attributes['accountId']);

-        if(null === $account) {
+        if (null === $account) {
            throw new FireflyException('This is an unknown account. Apologies.');
        }

@@ -226,7 +225,7 @@ class ReportController extends Controller
    {
        $account = $this->accountRepository->findNull((int)$attributes['accountId']);

-        if(null === $account) {
+        if (null === $account) {
            throw new FireflyException('This is an unknown category. Apologies.');
        }

--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -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';

--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -117,6 +117,7 @@ class Authenticate
                );
                // @codeCoverageIgnoreEnd
            }
+
            /** @noinspection PhpUndefinedMethodInspection */
            return $this->auth->authenticate();
        }
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -27,7 +27,6 @@ use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Steam;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@@ -149,7 +148,7 @@ class PiggyBank extends Model
     */
    public function leftOnAccount(Carbon $date): string
    {
-        $balance = Steam::balanceIgnoreVirtual($this->account, $date);
+        $balance = app('steam')->balanceIgnoreVirtual($this->account, $date);
        /** @var PiggyBank $piggyBank */
        foreach ($this->account->piggyBanks as $piggyBank) {
            $currentAmount = $piggyBank->currentRelevantRep()->currentamount ?? '0';
--- a/app/Repositories/Account/AccountTasker.php
+++ b/app/Repositories/Account/AccountTasker.php
@@ -29,7 +29,6 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 use Log;
-use Steam;

 /**
 * Class AccountTasker.
@@ -50,8 +49,8 @@ class AccountTasker implements AccountTaskerInterface
    {
        $yesterday = clone $start;
        $yesterday->subDay();
-        $startSet = Steam::balancesByAccounts($accounts, $yesterday);
-        $endSet   = Steam::balancesByAccounts($accounts, $end);
+        $startSet = app('steam')->balancesByAccounts($accounts, $yesterday);
+        $endSet   = app('steam')->balancesByAccounts($accounts, $end);

        Log::debug('Start of accountreport');

--- a/app/Support/Search/Modifier.php
+++ b/app/Support/Search/Modifier.php
@@ -26,7 +26,6 @@ use Carbon\Carbon;
 use Exception;
 use FireflyIII\Models\Transaction;
 use Log;
-use Steam;

 /**
 * Class Modifier
@@ -42,8 +41,8 @@ class Modifier
     */
    public static function amountCompare(Transaction $transaction, string $amount, int $expected): bool
    {
-        $amount            = Steam::positive($amount);
-        $transactionAmount = Steam::positive($transaction->transaction_amount);
+        $amount            = app('steam')->positive($amount);
+        $transactionAmount = app('steam')->positive($transaction->transaction_amount);

        $compare = bccomp($amount, $transactionAmount);
        Log::debug(sprintf('%s vs %s is %d', $amount, $transactionAmount, $compare));
@@ -64,12 +63,12 @@ class Modifier
        $res = true;
        switch ($modifier['type']) {
            case 'source':
-                $name = Steam::tryDecrypt($transaction->account_name);
+                $name = app('steam')->tryDecrypt($transaction->account_name);
                $res  = self::stringCompare($name, $modifier['value']);
                Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
                break;
            case 'destination':
-                $name = Steam::tryDecrypt($transaction->opposing_account_name);
+                $name = app('steam')->tryDecrypt($transaction->opposing_account_name);
                $res  = self::stringCompare($name, $modifier['value']);
                Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
                break;
@@ -82,7 +81,7 @@ class Modifier
                Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true)));
                break;
            case 'bill':
-                $name = Steam::tryDecrypt($transaction->bill_name);
+                $name = app('steam')->tryDecrypt($transaction->bill_name);
                $res  = self::stringCompare($name, $modifier['value']);
                Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true)));
                break;
@@ -166,11 +165,11 @@ class Modifier
    {
        $journalBudget = '';
        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 = '';
        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);
@@ -186,11 +185,13 @@ class Modifier
    {
        $journalCategory = '';
        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 = '';
        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);