Code cleanup as described in #1272

This commit is contained in:
James Cole
2018-04-22 17:12:22 +02:00
parent 8032684ad0
commit 36a5f17af2
12 changed files with 34 additions and 36 deletions

View File

@@ -146,7 +146,7 @@ class RuleController extends Controller
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
}
Session::forget('rules.create.fromStore');
session()->forget('rules.create.fromStore');
return view(
'rules.rule.create',
@@ -242,7 +242,7 @@ class RuleController extends Controller
if (true !== session('rules.edit.fromUpdate')) {
$this->rememberPreviousUri('rules.edit.uri');
}
Session::forget('rules.edit.fromUpdate');
session()->forget('rules.edit.fromUpdate');
return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'));
}
@@ -370,7 +370,7 @@ class RuleController extends Controller
if (1 === (int)$request->get('create_another')) {
// @codeCoverageIgnoreStart
Session::put('rules.create.fromStore', true);
session()->put('rules.create.fromStore', true);
return redirect(route('rules.create', [$data['rule_group_id']]))->withInput();
// @codeCoverageIgnoreEnd
@@ -522,7 +522,7 @@ class RuleController extends Controller
if (1 === (int)$request->get('return_to_edit')) {
// @codeCoverageIgnoreStart
Session::put('rules.edit.fromUpdate', true);
session()->put('rules.edit.fromUpdate', true);
return redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);
// @codeCoverageIgnoreEnd