Code cleanup

This commit is contained in:
James Cole
2021-03-21 09:15:40 +01:00
parent da1751940e
commit 206845575c
317 changed files with 7418 additions and 7362 deletions

View File

@@ -38,7 +38,6 @@ class TriggerRequest extends FormRequest
use ConvertsDataTypes, ChecksLogin;
/**
* @return array
*/

View File

@@ -59,10 +59,10 @@ class UpdateRequest extends FormRequest
$return = $this->getAllData($fields);
$triggers = $this->getRuleTriggers();
$actions = $this->getRuleActions();
if(null !== $triggers) {
if (null !== $triggers) {
$return['triggers'] = $triggers;
}
if(null !== $actions) {
if (null !== $actions) {
$return['actions'] = $actions;
}
@@ -81,9 +81,9 @@ class UpdateRequest extends FormRequest
$return = [];
if (is_array($triggers)) {
foreach ($triggers as $trigger) {
$active = array_key_exists('active', $trigger) ? $trigger['active'] : true;
$stopProcessing= array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
$return[] = [
$active = array_key_exists('active', $trigger) ? $trigger['active'] : true;
$stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
$return[] = [
'type' => $trigger['type'],
'value' => $trigger['value'],
'active' => $active,