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

Use PSR-12 code style

Browse Source
This commit is contained in:
James Cole
2022-10-30 14:24:28 +01:00
parent 2eebcb21f1
commit f53923f16c
187 changed files with 429 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,8 @@ use Illuminate\View\View;
*/
class CreateController extends Controller
{
use RuleManagement, ModelInformation;
use RuleManagement;
use ModelInformation;
private RuleRepositoryInterface $ruleRepos;
@@ -279,10 +280,8 @@ class CreateController extends Controller
$redirect = redirect($this->getPreviousUrl('rules.create.url'));
if (1 === (int) $request->get('create_another')) {
session()->put('rules.create.fromStore', true);
$redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput();
}
return $redirect;

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

@@ -93,5 +93,4 @@ class DeleteController extends Controller
return redirect($this->getPreviousUrl('rules.delete.url'));
}
}

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

@@ -44,7 +44,8 @@ use Throwable;
*/
class EditController extends Controller
{
use RuleManagement, RenderPartialViews;
use RuleManagement;
use RenderPartialViews;
private RuleRepositoryInterface $ruleRepos;
@@ -149,7 +150,6 @@ class EditController extends Controller
$triggers = [];
foreach ($operators as $key => $operator) {
if ('user_action' !== $key && false === $operator['alias']) {
$triggers[$key] = (string) trans(sprintf('firefly.rule_trigger_%s_choice', $key));
}
}
@@ -196,11 +196,9 @@ class EditController extends Controller
app('preferences')->mark();
$redirect = redirect($this->getPreviousUrl('rules.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('rules.edit.fromUpdate', true);
$redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);
}
return $redirect;

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

@@ -106,5 +106,4 @@ class IndexController extends Controller
return redirect($route);
}
}

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

@@ -136,8 +136,8 @@ class SelectController extends Controller
public function testTriggers(TestRuleFormRequest $request): JsonResponse
{
// build fake rule
$rule = new Rule;
$triggers = new Collection;
$rule = new Rule();
$triggers = new Collection();
$rule->strict = '1' === $request->get('strict');
// build trigger array from response
@@ -149,7 +149,7 @@ class SelectController extends Controller
}
foreach ($textTriggers as $textTrigger) {
$trigger = new RuleTrigger;
$trigger = new RuleTrigger();
$trigger->trigger_type = $textTrigger['type'];
$trigger->trigger_value = $textTrigger['value'];
$triggers->push($trigger);
@@ -176,7 +176,6 @@ class SelectController extends Controller
$view = 'ERROR, see logs.';
try {
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) { // @phpstan-ignore-line
Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
Log::error($exception->getTraceAsString());
@@ -219,7 +218,6 @@ class SelectController extends Controller
$view = 'ERROR, see logs.';
try {
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) { // @phpstan-ignore-line
Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));
Log::error($exception->getTraceAsString());