kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-07 07:28:43 +02:00
parent 4ddcb0c965
commit f12744ad8c
180 changed files with 714 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Json/BoxController.php
View File

@@ -72,7 +72,7 @@ class BoxController extends Controller
$cache->addProperty($today);
$cache->addProperty('box-available');
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get());
}
$leftPerDayAmount = '0';
$leftToSpendAmount = '0';
@@ -142,7 +142,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-balance');
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get());
}
// prep some arrays:
$incomes = [];
@@ -189,7 +189,7 @@ class BoxController extends Controller
$incomes[$currencyId] = app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false);
$expenses[$currencyId] = app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false);
}
if (empty($sums)) {
if (0===count($sums)) {
$currency = app('amount')->getDefaultCurrency();
$sums[$currency->id] = app('amount')->formatAnything($currency, '0', false);
$incomes[$currency->id] = app('amount')->formatAnything($currency, '0', false);

8
app/Http/Controllers/Json/FrontpageController.php
View File

@@ -64,15 +64,15 @@ class FrontpageController extends Controller
}
}
$html = '';
if (!empty($info)) {
if (0!==count($info)) {
try {
$html = prefixView('json.piggy-banks', compact('info'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
$html = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
}
return response()->json(['html' => $html]);

4
app/Http/Controllers/Json/IntroController.php
View File

@@ -54,7 +54,7 @@ class IntroController extends Controller
return response()->json($steps);
}
if ($this->hasOutroStep($route)) {
// @codeCoverageIgnoreStart
// save last step:
$lastStep = $steps[count($steps) - 1];
// remove last step:
@@ -62,7 +62,7 @@ class IntroController extends Controller
// merge arrays and add last step again
$steps = array_merge($steps, $specificSteps);
$steps[] = $lastStep;
// @codeCoverageIgnoreEnd
}
if (!$this->hasOutroStep($route)) {
$steps = array_merge($steps, $specificSteps);

20
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -153,12 +153,12 @@ class ReconcileController extends Controller
'selectedIds'
)
)->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('View error: %s', $e->getMessage()));
$view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
}
// @codeCoverageIgnoreEnd
$return = [
'post_uri' => $route,
'html' => $view,
@@ -181,7 +181,7 @@ class ReconcileController extends Controller
Log::debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description']));
// not much magic below we need to cover using tests.
// @codeCoverageIgnoreStart
if ($account->id === $journal['source_account_id']) {
if ($currency->id === $journal['currency_id']) {
$toAdd = $journal['amount'];
@@ -198,7 +198,7 @@ class ReconcileController extends Controller
$toAdd = bcmul($journal['foreign_amount'], '-1');
}
}
// @codeCoverageIgnoreEnd
Log::debug(sprintf('Going to add %s to %s', $toAdd, $amount));
$amount = bcadd($amount, $toAdd);
@@ -250,13 +250,13 @@ class ReconcileController extends Controller
'accounts.reconcile.transactions',
compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
)->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render: %s', $e->getMessage()));
$html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());
}
// @codeCoverageIgnoreEnd
return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
}
@@ -275,7 +275,7 @@ class ReconcileController extends Controller
/** @var array $journal */
foreach ($array as $journal) {
$inverse = false;
// @codeCoverageIgnoreStart
if (TransactionType::DEPOSIT === $journal['transaction_type_type']) {
$inverse = true;
}
@@ -296,7 +296,7 @@ class ReconcileController extends Controller
$journal['foreign_amount'] = app('steam')->positive($journal['foreign_amount']);
}
}
// @codeCoverageIgnoreEnd
$journals[] = $journal;
}

8
app/Http/Controllers/Json/RuleController.php
View File

@@ -51,13 +51,13 @@ class RuleController extends Controller
}
try {
$view = prefixView('rules.partials.action', compact('actions', 'count'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
$view = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return response()->json(['html' => $view]);
}
@@ -84,7 +84,7 @@ class RuleController extends Controller
try {
$view = prefixView('rules.partials.trigger', compact('triggers', 'count'))->render();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
$view = 'Could not render view.';
}