Clean up code.

This commit is contained in:
James Cole
2020-10-23 19:11:25 +02:00
parent 0845e1cb7d
commit 8dbd785ab8
57 changed files with 84 additions and 441 deletions

View File

@@ -50,11 +50,9 @@ class ConfigurationRequest extends LoggedInRequest
public function rules(): array
{
// fixed
$rules = [
return [
'single_user_mode' => 'between:0,1|numeric',
'is_demo_site' => 'between:0,1|numeric',
];
return $rules;
}
}

View File

@@ -46,13 +46,11 @@ class LinkTypeFormRequest extends LoggedInRequest
$nameRule = 'required|min:1';
}
$rules = [
return [
'id' => $idRule,
'name' => $nameRule,
'inward' => 'required|min:1|different:outward',
'outward' => 'required|min:1|different:inward',
];
return $rules;
}
}

View File

@@ -41,7 +41,7 @@ class RuleFormRequest extends LoggedInRequest
*/
public function getRuleData(): array
{
$data = [
return [
'title' => $this->string('title'),
'rule_group_id' => $this->integer('rule_group_id'),
'active' => $this->boolean('active'),
@@ -52,8 +52,6 @@ class RuleFormRequest extends LoggedInRequest
'triggers' => $this->getRuleTriggerData(),
'actions' => $this->getRuleActionData(),
];
return $data;
}
/**

View File

@@ -43,11 +43,9 @@ class TestRuleFormRequest extends LoggedInRequest
{
// fixed
$validTriggers = $this->getTriggers();
$rules = [
return [
'rule-trigger.*' => 'required|min:1|in:' . implode(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue',
];
return $rules;
}
}