kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 23:15:31 +00:00
Code Issues 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

14
app/Http/Controllers/Rule/CreateController.php
View File

@@ -78,7 +78,7 @@ class CreateController extends Controller
*
* @throws FireflyException
*/
public function create(Request $request, ?RuleGroup $ruleGroup = null)
public function create(Request $request, ?RuleGroup $ruleGroup = null): Factory|\Illuminate\Contracts\View\View
{
$this->createDefaultRuleGroup();
$preFilled = [
@@ -144,7 +144,7 @@ class CreateController extends Controller
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
['subTitleIcon' => $subTitleIcon, 'oldTriggers' => $oldTriggers, 'preFilled' => $preFilled, 'oldActions' => $oldActions, 'triggerCount' => $triggerCount, 'actionCount' => $actionCount, 'ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]
);
}
@@ -155,7 +155,7 @@ class CreateController extends Controller
*
* @throws FireflyException
*/
public function createFromBill(Request $request, Bill $bill)
public function createFromBill(Request $request, Bill $bill): Factory|\Illuminate\Contracts\View\View
{
$request->session()->flash('info', (string) trans('firefly.instructions_rule_from_bill', ['name' => e($bill->name)]));
@@ -196,16 +196,14 @@ class CreateController extends Controller
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
['subTitleIcon' => $subTitleIcon, 'oldTriggers' => $oldTriggers, 'preFilled' => $preFilled, 'oldActions' => $oldActions, 'triggerCount' => $triggerCount, 'actionCount' => $actionCount, 'subTitle' => $subTitle]
);
}
/**
* @return Factory|\Illuminate\Contracts\View\View
*
* @throws FireflyException
*/
public function createFromJournal(Request $request, TransactionJournal $journal)
public function createFromJournal(Request $request, TransactionJournal $journal): Factory|\Illuminate\Contracts\View\View
{
$request->session()->flash('info', (string) trans('firefly.instructions_rule_from_journal', ['name' => e($journal->description)]));
@@ -245,7 +243,7 @@ class CreateController extends Controller
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
['subTitleIcon' => $subTitleIcon, 'oldTriggers' => $oldTriggers, 'preFilled' => $preFilled, 'oldActions' => $oldActions, 'triggerCount' => $triggerCount, 'actionCount' => $actionCount, 'subTitle' => $subTitle]
);
}

4
app/Http/Controllers/Rule/DeleteController.php
View File

@@ -63,14 +63,14 @@ class DeleteController extends Controller
*
* @return Factory|View
*/
public function delete(Rule $rule)
public function delete(Rule $rule): Factory|\Illuminate\Contracts\View\View
{
$subTitle = (string) trans('firefly.delete_rule', ['title' => $rule->title]);
// put previous url in session
$this->rememberPreviousUrl('rules.delete.url');
return view('rules.rule.delete', compact('rule', 'subTitle'));
return view('rules.rule.delete', ['rule' => $rule, 'subTitle' => $subTitle]);
}
/**

9
app/Http/Controllers/Rule/EditController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Rule;
use Illuminate\Support\Facades\Log;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\RuleFormRequest;
@@ -76,7 +77,7 @@ class EditController extends Controller
*
* @throws FireflyException
*/
public function edit(Request $request, Rule $rule)
public function edit(Request $request, Rule $rule): Factory|\Illuminate\Contracts\View\View
{
$triggerCount = 0;
$actionCount = 0;
@@ -146,7 +147,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
return view('rules.rule.edit', ['rule' => $rule, 'subTitle' => $subTitle, 'primaryTrigger' => $primaryTrigger, 'oldTriggers' => $oldTriggers, 'oldActions' => $oldActions, 'triggerCount' => $triggerCount, 'actionCount' => $actionCount]);
}
/**
@@ -180,8 +181,8 @@ class EditController extends Controller
)->render();
} catch (Throwable $e) {
$message = sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage());
app('log')->debug($message);
app('log')->error($e->getTraceAsString());
Log::debug($message);
Log::error($e->getTraceAsString());
throw new FireflyException($message, 0, $e);
}

4
app/Http/Controllers/Rule/IndexController.php
View File

@@ -68,13 +68,13 @@ class IndexController extends Controller
*
* @return Factory|View
*/
public function index()
public function index(): Factory|\Illuminate\Contracts\View\View
{
$this->createDefaultRuleGroup();
$this->ruleGroupRepos->resetOrder();
$ruleGroups = $this->ruleGroupRepos->getAllRuleGroupsWithRules(null);
return view('rules.index', compact('ruleGroups'));
return view('rules.index', ['ruleGroups' => $ruleGroups]);
}
public function moveRule(Request $request, Rule $rule, RuleGroup $ruleGroup): JsonResponse

11
app/Http/Controllers/Rule/SelectController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Rule;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
@@ -114,7 +115,7 @@ class SelectController extends Controller
// does the user have shared accounts?
$subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', compact('rule', 'subTitle'));
return view('rules.rule.select-transactions', ['rule' => $rule, 'subTitle' => $subTitle]);
}
/**
@@ -179,8 +180,8 @@ class SelectController extends Controller
try {
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) {
app('log')->error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
app('log')->error($exception->getTraceAsString());
Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
Log::error($exception->getTraceAsString());
$view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());
throw new FireflyException($view, 0, $exception);
@@ -222,8 +223,8 @@ class SelectController extends Controller
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) {
$message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());
app('log')->error($message);
app('log')->error($exception->getTraceAsString());
Log::error($message);
Log::error($exception->getTraceAsString());
throw new FireflyException($message, 0, $exception);
}