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

Remove reference to a method no longer used.

Browse Source
This commit is contained in:
James Cole
2022-01-29 14:11:12 +01:00
parent acb2a8697a
commit 003d8ba02a
104 changed files with 219 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Support/ExpandedForm.php
View File

@@ -62,7 +62,7 @@ class ExpandedForm
//$value = round((float)$value, 8);
//}
try {
$html = prefixView('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render amountNoCurrency(): %s', $e->getMessage()));
$html = 'Could not render amountNoCurrency.';
@@ -97,7 +97,7 @@ class ExpandedForm
unset($options['placeholder'], $options['autocomplete'], $options['class']);
try {
$html = prefixView('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render checkbox(): %s', $e->getMessage()));
$html = 'Could not render checkbox.';
@@ -121,7 +121,7 @@ class ExpandedForm
$value = $this->fillFieldValue($name, $value);
unset($options['placeholder']);
try {
$html = prefixView('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render date(): %s', $e->getMessage()));
$html = 'Could not render date.';
@@ -143,7 +143,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.file', compact('classes', 'name', 'label', 'options'))->render();
$html = view('form.file', compact('classes', 'name', 'label', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render file(): %s', $e->getMessage()));
$html = 'Could not render file.';
@@ -168,7 +168,7 @@ class ExpandedForm
$value = $this->fillFieldValue($name, $value);
$options['step'] = '1';
try {
$html = prefixView('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render integer(): %s', $e->getMessage()));
$html = 'Could not render integer.';
@@ -192,7 +192,7 @@ class ExpandedForm
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
try {
$html = prefixView('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render location(): %s', $e->getMessage()));
$html = 'Could not render location.';
@@ -250,7 +250,7 @@ class ExpandedForm
// $value = round((float)$value, $selectedCurrency->decimal_places);
}
try {
$html = prefixView('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render nonSelectableAmount(): %s', $e->getMessage()));
$html = 'Could not render nonSelectableAmount.';
@@ -275,7 +275,7 @@ class ExpandedForm
$options['step'] = 'any';
unset($options['placeholder']);
try {
$html = prefixView('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render number(): %s', $e->getMessage()));
$html = 'Could not render number.';
@@ -304,7 +304,7 @@ class ExpandedForm
}
try {
$html = prefixView('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render objectGroup(): %s', $e->getMessage()));
$html = 'Could not render objectGroup.';
@@ -323,7 +323,7 @@ class ExpandedForm
public function optionsList(string $type, string $name): string
{
try {
$html = prefixView('form.options', compact('type', 'name'))->render();
$html = view('form.options', compact('type', 'name'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
$html = 'Could not render optionsList.';
@@ -345,7 +345,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.password', compact('classes', 'name', 'label', 'options'))->render();
$html = view('form.password', compact('classes', 'name', 'label', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render password(): %s', $e->getMessage()));
$html = 'Could not render password.';
@@ -372,7 +372,7 @@ class ExpandedForm
$options['step'] = 'any';
unset($options['placeholder']);
try {
$html = prefixView('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render percentage(): %s', $e->getMessage()));
$html = 'Could not render percentage.';
@@ -394,7 +394,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render staticText(): %s', $e->getMessage()));
$html = 'Could not render staticText.';
@@ -417,7 +417,7 @@ class ExpandedForm
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
try {
$html = prefixView('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render text(): %s', $e->getMessage()));
$html = 'Could not render text.';
@@ -446,7 +446,7 @@ class ExpandedForm
}
try {
$html = prefixView('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render textarea(): %s', $e->getMessage()));
$html = 'Could not render textarea.';

2
app/Support/Form/AccountForm.php
View File

@@ -136,7 +136,7 @@ class AccountForm
unset($options['class']);
try {
$html = prefixView('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
$html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render assetAccountCheckList(): %s', $e->getMessage()));
$html = 'Could not render assetAccountCheckList.';

4
app/Support/Form/CurrencyForm.php
View File

@@ -95,7 +95,7 @@ class CurrencyForm
$value = round((float)$value, $defaultCurrency->decimal_places);
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';
@@ -164,7 +164,7 @@ class CurrencyForm
$value = round((float)$value, $defaultCurrency->decimal_places);
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';

2
app/Support/Form/FormSupport.php
View File

@@ -53,7 +53,7 @@ trait FormSupport
$selected = $this->fillFieldValue($name, $selected);
unset($options['autocomplete'], $options['placeholder']);
try {
$html = prefixView('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
$html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
$html = 'Could not render select.';

6
app/Support/Http/Controllers/ModelInformation.php
View File

@@ -48,7 +48,7 @@ trait ModelInformation
protected function getActionsForBill(Bill $bill): array // get info and augument
{
try {
$result = prefixView(
$result = view(
'rules.partials.action',
[
'oldAction' => 'link_to_bill',
@@ -136,7 +136,7 @@ trait ModelInformation
];
foreach ($billTriggers as $index => $trigger) {
try {
$string = prefixView(
$string = view(
'rules.partials.trigger',
[
'oldTrigger' => $trigger,
@@ -252,7 +252,7 @@ trait ModelInformation
foreach ($journalTriggers as $index => $trigger) {
try {
$string = prefixView(
$string = view(
'rules.partials.trigger',
[
'oldTrigger' => $trigger,

24
app/Support/Http/Controllers/RenderPartialViews.php
View File

@@ -67,7 +67,7 @@ trait RenderPartialViews
$journals = $popupHelper->balanceForBudget($budget, $account, $attributes);
try {
$view = prefixView('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
$view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -88,7 +88,7 @@ trait RenderPartialViews
$budgets = $repository->getBudgets();
try {
$result = prefixView('reports.options.budget', compact('budgets'))->render();
$result = view('reports.options.budget', compact('budgets'))->render();
} catch (Throwable $e) {// @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -119,7 +119,7 @@ trait RenderPartialViews
$journals = $popupHelper->byBudget($budget, $attributes);
try {
$view = prefixView('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
$view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -146,7 +146,7 @@ trait RenderPartialViews
$journals = $popupHelper->byCategory($category, $attributes);
try {
$view = prefixView('popup.report.category-entry', compact('journals', 'category'))->render();
$view = view('popup.report.category-entry', compact('journals', 'category'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -167,7 +167,7 @@ trait RenderPartialViews
$categories = $repository->getCategories();
try {
$result = prefixView('reports.options.category', compact('categories'))->render();
$result = view('reports.options.category', compact('categories'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.options.category: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -208,7 +208,7 @@ trait RenderPartialViews
try {
$result = prefixView('reports.options.double', compact('set'))->render();
$result = view('reports.options.double', compact('set'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -241,7 +241,7 @@ trait RenderPartialViews
$journals = $popupHelper->byExpenses($account, $attributes);
try {
$view = prefixView('popup.report.expense-entry', compact('journals', 'account'))->render();
$view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -267,7 +267,7 @@ trait RenderPartialViews
foreach ($currentActions as $entry) {
$count = ($index + 1);
try {
$actions[] = prefixView(
$actions[] = view(
'rules.partials.action',
[
'oldAction' => $entry->action_type,
@@ -317,7 +317,7 @@ trait RenderPartialViews
if ('user_action' !== $entry->trigger_type) {
$count = ($index + 1);
try {
$renderedEntries[] = prefixView(
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($entry->trigger_type),
@@ -363,7 +363,7 @@ trait RenderPartialViews
$journals = $popupHelper->byIncome($account, $attributes);
try {
$view = prefixView('popup.report.income-entry', compact('journals', 'account'))->render();
$view = view('popup.report.income-entry', compact('journals', 'account'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render: %s', $e->getMessage()));
$view = 'Firefly III could not render the view. Please see the log files.';
@@ -381,7 +381,7 @@ trait RenderPartialViews
{
try {
$result = prefixView('reports.options.no-options')->render();
$result = view('reports.options.no-options')->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.options.no-options: %s', $e->getMessage()));
$result = 'Could not render view.';
@@ -403,7 +403,7 @@ trait RenderPartialViews
try {
$result = prefixView('reports.options.tag', compact('tags'))->render();
$result = view('reports.options.tag', compact('tags'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';

6
app/Support/Http/Controllers/RuleManagement.php
View File

@@ -50,7 +50,7 @@ trait RuleManagement
if (is_array($oldInput)) {
foreach ($oldInput as $oldAction) {
try {
$triggers[] = prefixView(
$triggers[] = view(
'rules.partials.action',
[
'oldAction' => $oldAction['type'],
@@ -95,7 +95,7 @@ trait RuleManagement
if (is_array($oldInput)) {
foreach ($oldInput as $oldTrigger) {
try {
$renderedEntries[] = prefixView(
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($oldTrigger['type']),
@@ -138,7 +138,7 @@ trait RuleManagement
$index = 0;
foreach ($submittedOperators as $operator) {
try {
$renderedEntries[] = prefixView(
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),