Clean up code.

2026-01-10 12:24:50 +00:00 · 2023-12-10 06:45:59 +01:00
parent 9a807fc215
commit c2b22a2bac
157 changed files with 648 additions and 669 deletions
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -71,7 +71,7 @@ class Amount
    {
        $locale   = app('steam')->getLocale();
        $rounded  = app('steam')->bcround($amount, $decimalPlaces);
-        $coloured = $coloured ?? true;
+        $coloured ??= true;

        $fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);
        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $symbol);
--- a/app/Support/Binder/Date.php
+++ b/app/Support/Binder/Date.php
@@ -71,7 +71,7 @@ class Date implements BinderInterface

        try {
            $result = new Carbon($value);
-        } catch (InvalidDateException $e) { /** @phpstan-ignore-line */
+        } catch (InvalidDateException $e) { // @phpstan-ignore-line
            $message = sprintf('Could not parse date "%s" for user #%d: %s', $value, auth()->user()->id, $e->getMessage());
            app('log')->error($message);
            throw new NotFoundHttpException($message, $e);
--- a/app/Support/Chart/Category/FrontpageChartGenerator.php
+++ b/app/Support/Chart/Category/FrontpageChartGenerator.php
@@ -128,7 +128,7 @@ class FrontpageChartGenerator
    {
        $currencyId = (int)$currency['currency_id'];

-        $this->currencies[$currencyId] = $this->currencies[$currencyId] ?? [
+        $this->currencies[$currencyId] ??= [
            'currency_id'             => $currencyId,
            'currency_name'           => $currency['currency_name'],
            'currency_symbol'         => $currency['currency_symbol'],
--- a/app/Support/Chart/Category/WholePeriodChartGenerator.php
+++ b/app/Support/Chart/Category/WholePeriodChartGenerator.php
@@ -152,7 +152,7 @@ class WholePeriodChartGenerator
        $return = [];
        foreach ($array as $block) {
            foreach ($block as $currencyId => $currencyRow) {
-                $return[$currencyId] = $return[$currencyId] ?? [
+                $return[$currencyId] ??= [
                    'currency_id'             => $currencyId,
                    'currency_name'           => $currencyRow['currency_name'],
                    'currency_symbol'         => $currencyRow['currency_symbol'],
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -49,7 +49,7 @@ class ExpandedForm
     */
    public function amountNoCurrency(string $name, $value = null, array $options = null): string
    {
-        $options         = $options ?? [];
+        $options ??= [];
        $label           = $this->label($name, $options);
        $options         = $this->expandOptionArray($name, $label, $options);
        $classes         = $this->getHolderClasses($name);
@@ -83,8 +83,8 @@ class ExpandedForm
     */
    public function checkbox(string $name, int $value = null, $checked = null, array $options = null): string
    {
-        $options            = $options ?? [];
-        $value              = $value ?? 1;
+        $options ??= [];
+        $value ??= 1;
        $options['checked'] = true === $checked;

        if (app('session')->has('preFilled')) {
@@ -144,7 +144,7 @@ class ExpandedForm
     */
    public function file(string $name, array $options = null): string
    {
-        $options = $options ?? [];
+        $options ??= [];
        $label   = $this->label($name, $options);
        $options = $this->expandOptionArray($name, $label, $options);
        $classes = $this->getHolderClasses($name);
@@ -169,12 +169,12 @@ class ExpandedForm
     */
    public function integer(string $name, $value = null, array $options = null): string
    {
-        $options         = $options ?? [];
+        $options ??= [];
        $label           = $this->label($name, $options);
        $options         = $this->expandOptionArray($name, $label, $options);
        $classes         = $this->getHolderClasses($name);
        $value           = $this->fillFieldValue($name, $value);
-        $options['step'] = $options['step'] ?? '1';
+        $options['step'] ??= '1';
        try {
            $html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
        } catch (Throwable $e) {
@@ -196,7 +196,7 @@ class ExpandedForm
     */
    public function location(string $name, $value = null, array $options = null): string
    {
-        $options = $options ?? [];
+        $options ??= [];
        $label   = $this->label($name, $options);
        $options = $this->expandOptionArray($name, $label, $options);
        $classes = $this->getHolderClasses($name);
--- a/app/Support/Form/AccountForm.php
+++ b/app/Support/Form/AccountForm.php
@@ -132,7 +132,7 @@ class AccountForm
     */
    public function assetAccountCheckList(string $name, array $options = null): string
    {
-        $options  = $options ?? [];
+        $options ??= [];
        $label    = $this->label($name, $options);
        $options  = $this->expandOptionArray($name, $label, $options);
        $classes  = $this->getHolderClasses($name);
--- a/app/Support/Form/FormSupport.php
+++ b/app/Support/Form/FormSupport.php
@@ -44,7 +44,7 @@ trait FormSupport
     */
    public function select(string $name, array $list = null, $selected = null, array $options = null): string
    {
-        $list     = $list ?? [];
+        $list ??= [];
        $label    = $this->label($name, $options);
        $options  = $this->expandOptionArray($name, $label, $options);
        $classes  = $this->getHolderClasses($name);
@@ -68,7 +68,7 @@ trait FormSupport
     */
    protected function label(string $name, array $options = null): string
    {
-        $options = $options ?? [];
+        $options ??= [];
        if (array_key_exists('label', $options)) {
            return $options['label'];
        }
@@ -86,7 +86,7 @@ trait FormSupport
     */
    protected function expandOptionArray(string $name, $label, array $options = null): array
    {
-        $options                 = $options ?? [];
+        $options ??= [];
        $name                    = str_replace('[]', '', $name);
        $options['class']        = 'form-control';
        $options['id']           = 'ffInput_' . $name;
@@ -156,7 +156,7 @@ trait FormSupport
        $date = null;
        try {
            $date = today(config('app.timezone'));
-        } catch (InvalidDateException $e) {
+        } catch (InvalidDateException $e) {  // @phpstan-ignore-line
            app('log')->error($e->getMessage());
        }

--- a/app/Support/Form/PiggyBankForm.php
+++ b/app/Support/Form/PiggyBankForm.php
@@ -71,7 +71,7 @@ class PiggyBankForm
                $groupTitle = $group->title;
                $groupOrder = $group->order;
            }
-            $subList[$groupOrder]                        = $subList[$groupOrder] ?? [
+            $subList[$groupOrder] ??= [
                'group'   => [
                    'title' => $groupTitle,
                ],
--- a/app/Support/Form/RuleForm.php
+++ b/app/Support/Form/RuleForm.php
@@ -67,7 +67,7 @@ class RuleForm
     */
    public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): string
    {
-        $options          = $options ?? [];
+        $options ??= [];
        $options['class'] = 'form-control';
        /** @var RuleGroupRepositoryInterface $groupRepos */
        $groupRepos = app(RuleGroupRepositoryInterface::class);
--- a/app/Support/Http/Api/ConvertsExchangeRates.php
+++ b/app/Support/Http/Api/ConvertsExchangeRates.php
@@ -171,7 +171,7 @@ trait ConvertsExchangeRates
    private function convertAmount(string $amount, TransactionCurrency $from, TransactionCurrency $to, ?Carbon $date = null): string
    {
        app('log')->debug(sprintf('Converting %s from %s to %s', $amount, $from->code, $to->code));
-        $date = $date ?? today(config('app.timezone'));
+        $date ??= today(config('app.timezone'));
        $rate = $this->getRate($from, $to, $date);

        return bcmul($amount, $rate);
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -263,7 +263,7 @@ trait AugumentData
                $name = $journal['source_account_name'];
            }

-            $grouped[$name] = $grouped[$name] ?? '0';
+            $grouped[$name] ??= '0';
            $grouped[$name] = bcadd($journal['amount'], $grouped[$name]);
        }

--- a/app/Support/Http/Controllers/RequestInformation.php
+++ b/app/Support/Http/Controllers/RequestInformation.php
@@ -168,7 +168,7 @@ trait RequestInformation
     */
    final protected function parseAttributes(array $attributes): array // parse input + return result
    {
-        $attributes['location'] = $attributes['location'] ?? '';
+        $attributes['location'] ??= '';
        $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));
        $date                   = Carbon::createFromFormat('Ymd', $attributes['startDate']);
        if (false === $date) {
--- a/app/Support/Http/Controllers/RuleManagement.php
+++ b/app/Support/Http/Controllers/RuleManagement.php
@@ -139,7 +139,7 @@ trait RuleManagement
        $index = 0;
        foreach ($submittedOperators as $operator) {
            $rootOperator = OperatorQuerySearch::getRootOperator($operator['type']);
-            $needsContext = (bool) config(sprintf('search.operators.%s.needs_context',$rootOperator));
+            $needsContext = (bool) config(sprintf('search.operators.%s.needs_context', $rootOperator));
            try {
                $renderedEntries[] = view(
                    'rules.partials.trigger',
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -89,10 +89,10 @@ class Navigation

        if (!array_key_exists($repeatFreq, $functionMap)) {
            Log::error(sprintf(
-                           'The periodicity %s is unknown. Choose one of available periodicity: %s',
-                           $repeatFreq,
-                           implode(', ', array_keys($functionMap))
-                       ));
+                'The periodicity %s is unknown. Choose one of available periodicity: %s',
+                $repeatFreq,
+                implode(', ', array_keys($functionMap))
+            ));
            return $theDate;
        }

@@ -352,12 +352,12 @@ class Navigation
    public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int
    {
        Log::debug(sprintf(
-                       'diffInPeriods: %s (skip: %d), between %s and %s.',
-                       $period,
-                       $skip,
-                       $beginning->format('Y-m-d'),
-                       $end->format('Y-m-d')
-                   ));
+            'diffInPeriods: %s (skip: %d), between %s and %s.',
+            $period,
+            $skip,
+            $beginning->format('Y-m-d'),
+            $end->format('Y-m-d')
+        ));
        $map = [
            'daily'     => 'floatDiffInDays',
            'weekly'    => 'floatDiffInWeeks',
@@ -394,11 +394,11 @@ class Navigation
            $parameter = $skip + 1;
            $diff      = ceil($diff / $parameter) * $parameter;
            Log::debug(sprintf(
-                           'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',
-                           $skip,
-                           $parameter,
-                           $diff
-                       ));
+                'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',
+                $skip,
+                $parameter,
+                $diff
+            ));
        }

        return (int)$diff;
@@ -705,7 +705,7 @@ class Navigation
     */
    public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = null): Carbon
    {
-        $subtract = $subtract ?? 1;
+        $subtract ??= 1;
        $date     = clone $theDate;
        // 1D 1W 1M 3M 6M 1Y
        $functionMap = [
--- a/app/Support/ParseDateString.php
+++ b/app/Support/ParseDateString.php
@@ -156,7 +156,7 @@ class ParseDateString
        $result = false;
        try {
            $result = Carbon::createFromFormat('Y-m-d', $date);
-        } catch (InvalidFormatException $e) {
+        } catch (InvalidFormatException $e) { // @phpstan-ignore-line
            Log::error(sprintf('parseDefaultDate("%s") ran into an error, but dont mind: %s', $date, $e->getMessage()));
        }
        if (false === $result) {
--- a/app/Support/Report/Budget/BudgetReportGenerator.php
+++ b/app/Support/Report/Budget/BudgetReportGenerator.php
@@ -77,7 +77,7 @@ class BudgetReportGenerator
        /** @var Account $account */
        foreach ($this->accounts as $account) {
            $accountId                = $account->id;
-            $this->report[$accountId] = $this->report[$accountId] ?? [
+            $this->report[$accountId] ??= [
                'name'       => $account->name,
                'id'         => $account->id,
                'iban'       => $account->iban,
@@ -117,7 +117,7 @@ class BudgetReportGenerator
            $sourceAccountId = $journal['source_account_id'];

            $this->report[$sourceAccountId]['currencies'][$currencyId]
-                = $this->report[$sourceAccountId]['currencies'][$currencyId] ?? [
+                ??= [
                'currency_id'             => $expenses['currency_id'],
                'currency_symbol'         => $expenses['currency_symbol'],
                'currency_name'           => $expenses['currency_name'],
@@ -126,7 +126,7 @@ class BudgetReportGenerator
            ];

            $this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId]
-                = $this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId] ?? '0';
+                ??= '0';

            $this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId]
                = bcadd($this->report[$sourceAccountId]['currencies'][$currencyId]['budgets'][$budgetId], $journal['amount']);
@@ -169,7 +169,7 @@ class BudgetReportGenerator
    private function processBudget(Budget $budget): void
    {
        $budgetId                           = $budget->id;
-        $this->report['budgets'][$budgetId] = $this->report['budgets'][$budgetId] ?? [
+        $this->report['budgets'][$budgetId] ??= [
            'budget_id'     => $budgetId,
            'budget_name'   => $budget->name,
            'no_budget'     => false,
@@ -201,7 +201,7 @@ class BudgetReportGenerator
        $left          = -1 === bccomp(bcadd($limit->amount, $spent), '0') ? '0' : bcadd($limit->amount, $spent);
        $overspent     = 1 === bccomp(bcmul($spent, '-1'), $limit->amount) ? bcadd($spent, $limit->amount) : '0';

-        $this->report['budgets'][$budgetId]['budget_limits'][$limitId] = $this->report['budgets'][$budgetId]['budget_limits'][$limitId] ?? [
+        $this->report['budgets'][$budgetId]['budget_limits'][$limitId] ??= [
            'budget_limit_id'         => $limitId,
            'start_date'              => $limit->start_date,
            'end_date'                => $limit->end_date,
@@ -220,7 +220,7 @@ class BudgetReportGenerator

        // make sum information:
        $this->report['sums'][$currencyId]
-                                                        = $this->report['sums'][$currencyId] ?? [
+                                                        ??= [
            'budgeted'                => '0',
            'spent'                   => '0',
            'left'                    => '0',
@@ -284,9 +284,9 @@ class BudgetReportGenerator
            $this->report['sums'][$nbCurrencyId]['currency_decimal_places'] = $nbCurrencyDp;

            // append other sums because they might be missing:
-            $this->report['sums'][$nbCurrencyId]['overspent'] = $this->report['sums'][$nbCurrencyId]['overspent'] ?? '0';
-            $this->report['sums'][$nbCurrencyId]['left']      = $this->report['sums'][$nbCurrencyId]['left'] ?? '0';
-            $this->report['sums'][$nbCurrencyId]['budgeted']  = $this->report['sums'][$nbCurrencyId]['budgeted'] ?? '0';
+            $this->report['sums'][$nbCurrencyId]['overspent'] ??= '0';
+            $this->report['sums'][$nbCurrencyId]['left'] ??= '0';
+            $this->report['sums'][$nbCurrencyId]['budgeted'] ??= '0';
        }
    }

@@ -314,7 +314,7 @@ class BudgetReportGenerator
                if (0 !== bccomp($budgeted, '0') && 0 !== bccomp($totalBudgeted, '0')) {
                    $budgetedPct = round((float)bcmul(bcdiv($budgeted, $totalBudgeted), '100'));
                }
-                $this->report['sums'][$currencyId]['budgeted']                                 = $this->report['sums'][$currencyId]['budgeted'] ?? '0';
+                $this->report['sums'][$currencyId]['budgeted'] ??= '0';
                $this->report['budgets'][$budgetId]['budget_limits'][$limitId]['spent_pct']    = $spentPct;
                $this->report['budgets'][$budgetId]['budget_limits'][$limitId]['budgeted_pct'] = $budgetedPct;
            }
--- a/app/Support/Report/Category/CategoryReportGenerator.php
+++ b/app/Support/Report/Category/CategoryReportGenerator.php
@@ -107,7 +107,7 @@ class CategoryReportGenerator
     */
    private function processCurrencyArray(int $currencyId, array $currencyRow): void
    {
-        $this->report['sums'][$currencyId] = $this->report['sums'][$currencyId] ?? [
+        $this->report['sums'][$currencyId] ??= [
            'spent'                   => '0',
            'earned'                  => '0',
            'sum'                     => '0',
@@ -136,7 +136,7 @@ class CategoryReportGenerator
    private function processCategoryRow(int $currencyId, array $currencyRow, int $categoryId, array $categoryRow): void
    {
        $key                              = sprintf('%s-%s', $currencyId, $categoryId);
-        $this->report['categories'][$key] = $this->report['categories'][$key] ?? [
+        $this->report['categories'][$key] ??= [
            'id'                      => $categoryId,
            'title'                   => $categoryRow['name'],
            'currency_id'             => $currencyRow['currency_id'],
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -326,15 +326,15 @@ class Steam
            $balances[$format] = $currentBalance;

            app('log')->debug(sprintf(
-                                  '%s: transaction in %s(!). Conversion rate is %s. %s %s = %s %s',
-                                  $format,
-                                  $currency->code,
-                                  $rate,
-                                  $currency->code,
-                                  $transaction['amount'],
-                                  $native->code,
-                                  $convertedAmount
-                              ));
+                '%s: transaction in %s(!). Conversion rate is %s. %s %s = %s %s',
+                $format,
+                $currency->code,
+                $rate,
+                $currency->code,
+                $transaction['amount'],
+                $native->code,
+                $convertedAmount
+            ));


        }
--- a/app/Support/Twig/AmountFormat.php
+++ b/app/Support/Twig/AmountFormat.php
@@ -101,7 +101,7 @@ class AmountFormat extends AbstractExtension
        return new TwigFunction(
            'formatAmountByAccount',
            static function (AccountModel $account, string $amount, bool $coloured = null): string {
-                $coloured = $coloured ?? true;
+                $coloured ??= true;
                /** @var AccountRepositoryInterface $accountRepos */
                $accountRepos = app(AccountRepositoryInterface::class);
                $currency     = $accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
@@ -122,8 +122,8 @@ class AmountFormat extends AbstractExtension
        return new TwigFunction(
            'formatAmountBySymbol',
            static function (string $amount, string $symbol, int $decimalPlaces = null, bool $coloured = null): string {
-                $decimalPlaces            = $decimalPlaces ?? 2;
-                $coloured                 = $coloured ?? true;
+                $decimalPlaces ??= 2;
+                $coloured ??= true;
                $currency                 = new TransactionCurrency();
                $currency->symbol         = $symbol;
                $currency->decimal_places = $decimalPlaces;
@@ -144,7 +144,7 @@ class AmountFormat extends AbstractExtension
        return new TwigFunction(
            'formatAmountByCurrency',
            static function (TransactionCurrency $currency, string $amount, bool $coloured = null): string {
-                $coloured = $coloured ?? true;
+                $coloured ??= true;

                return app('amount')->formatAnything($currency, $amount, $coloured);
            },