Various code cleanup.

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

View File

@@ -65,7 +65,7 @@ trait RenderPartialViews
$account = $accountRepos->findNull((int)$attributes['accountId']);
$journals = $popupHelper->balanceForBudget($budget, $account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = prefixView('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -73,7 +73,7 @@ trait RenderPartialViews
$view = 'Firefly III could not render the view. Please see the log files.';
}
// @codeCoverageIgnoreEnd
return $view;
}
@@ -88,7 +88,7 @@ trait RenderPartialViews
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$budgets = $repository->getBudgets();
// @codeCoverageIgnoreStart
try {
$result = prefixView('reports.options.budget', compact('budgets'))->render();
} catch (Throwable $e) {// @phpstan-ignore-line
@@ -96,7 +96,7 @@ trait RenderPartialViews
$result = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return $result;
}
@@ -121,7 +121,7 @@ trait RenderPartialViews
$budget = new Budget;
}
$journals = $popupHelper->byBudget($budget, $attributes);
// @codeCoverageIgnoreStart
try {
$view = prefixView('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -129,7 +129,7 @@ trait RenderPartialViews
$view = 'Firefly III could not render the view. Please see the log files.';
}
// @codeCoverageIgnoreEnd
return $view;
}
@@ -171,7 +171,7 @@ trait RenderPartialViews
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$categories = $repository->getCategories();
// @codeCoverageIgnoreStart
try {
$result = prefixView('reports.options.category', compact('categories'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -179,7 +179,7 @@ trait RenderPartialViews
$result = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return $result;
}
@@ -214,7 +214,7 @@ trait RenderPartialViews
}
}
// @codeCoverageIgnoreStart
try {
$result = prefixView('reports.options.double', compact('set'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -222,7 +222,7 @@ trait RenderPartialViews
$result = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return $result;
}
@@ -249,7 +249,7 @@ trait RenderPartialViews
}
$journals = $popupHelper->byExpenses($account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = prefixView('popup.report.expense-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -257,7 +257,7 @@ trait RenderPartialViews
$view = 'Firefly III could not render the view. Please see the log files.';
}
// @codeCoverageIgnoreEnd
return $view;
}
@@ -288,12 +288,12 @@ trait RenderPartialViews
'count' => $count,
]
)->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Throwable was thrown in getCurrentActions(): %s', $e->getMessage()));
Log::error($e->getTraceAsString());
}
// @codeCoverageIgnoreEnd
++$index;
}
@@ -339,12 +339,12 @@ trait RenderPartialViews
'triggers' => $triggers,
]
)->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Throwable was thrown in getCurrentTriggers(): %s', $e->getMessage()));
Log::error($e->getTraceAsString());
}
// @codeCoverageIgnoreEnd
++$index;
}
}
@@ -373,7 +373,7 @@ trait RenderPartialViews
}
$journals = $popupHelper->byIncome($account, $attributes);
// @codeCoverageIgnoreStart
try {
$view = prefixView('popup.report.income-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -381,7 +381,7 @@ trait RenderPartialViews
$view = 'Firefly III could not render the view. Please see the log files.';
}
// @codeCoverageIgnoreEnd
return $view;
}
@@ -393,7 +393,7 @@ trait RenderPartialViews
*/
protected function noReportOptions(): string // render a view
{
// @codeCoverageIgnoreStart
try {
$result = prefixView('reports.options.no-options')->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -401,7 +401,7 @@ trait RenderPartialViews
$result = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return $result;
}
@@ -417,7 +417,7 @@ trait RenderPartialViews
$repository = app(TagRepositoryInterface::class);
$tags = $repository->get();
// @codeCoverageIgnoreStart
try {
$result = prefixView('reports.options.tag', compact('tags'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -425,7 +425,7 @@ trait RenderPartialViews
$result = 'Could not render view.';
}
// @codeCoverageIgnoreEnd
return $result;
}