gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix code quality with rector [skip ci]

Browse Source
This commit is contained in:
James Cole
2025-11-09 09:07:14 +01:00
parent 38691d6fdf
commit d2610be790
262 changed files with 873 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/Report/BudgetController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
@@ -69,7 +70,7 @@ class BudgetController extends Controller
*
* @throws FireflyException
*/
public function accountPerBudget(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
public function accountPerBudget(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Factory|\Illuminate\Contracts\View\View
{
/** @var BudgetReportGenerator $generator */
$generator = app(BudgetReportGenerator::class);
@@ -83,13 +84,13 @@ class BudgetController extends Controller
$generator->accountPerBudget();
$report = $generator->getReport();
return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
return view('reports.budget.partials.account-per-budget', ['report' => $report, 'budgets' => $budgets]);
}
/**
* @return Factory|View
*/
public function accounts(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
public function accounts(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Factory|\Illuminate\Contracts\View\View
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $budgets);
$report = [];
@@ -135,7 +136,7 @@ class BudgetController extends Controller
}
}
return view('reports.budget.partials.accounts', compact('sums', 'report'));
return view('reports.budget.partials.accounts', ['sums' => $sums, 'report' => $report]);
}
/**
@@ -177,11 +178,11 @@ class BudgetController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
$result = view('reports.budget.partials.avg-expenses', ['result' => $result])->render();
} catch (Throwable $e) {
app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
app('log')->error($e->getTraceAsString());
Log::error($e->getTraceAsString());
throw new FireflyException($result, 0, $e);
}
@@ -192,7 +193,7 @@ class BudgetController extends Controller
/**
* @return Factory|View
*/
public function budgets(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
public function budgets(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Factory|\Illuminate\Contracts\View\View
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $budgets);
$sums = [];
@@ -250,7 +251,7 @@ class BudgetController extends Controller
}
}
return view('reports.budget.partials.budgets', compact('sums', 'report'));
return view('reports.budget.partials.budgets', ['sums' => $sums, 'report' => $report]);
}
/**
@@ -273,7 +274,7 @@ class BudgetController extends Controller
$generator->general();
$report = $generator->getReport();
return view('reports.partials.budgets', compact('report'))->render();
return view('reports.partials.budgets', ['report' => $report])->render();
}
/**
@@ -339,10 +340,10 @@ class BudgetController extends Controller
}
try {
$result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
$result = view('reports.partials.budget-period', ['report' => $report, 'periods' => $periods])->render();
} catch (Throwable $e) {
app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
app('log')->error($e->getTraceAsString());
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
throw new FireflyException($result, 0, $e);
@@ -390,9 +391,9 @@ class BudgetController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = view('reports.budget.partials.top-expenses', compact('result'))->render();
$result = view('reports.budget.partials.top-expenses', ['result' => $result])->render();
} catch (Throwable $e) {
app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);