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

Clean up form requests

Browse Source
This commit is contained in:
James Cole
2020-10-24 07:55:09 +02:00
parent ab4bcd3703
commit dbc878950c
33 changed files with 265 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
app/Http/Requests/RuleFormRequest.php
View File

@@ -23,15 +23,17 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Models\Rule;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Support\Request\GetRuleConfiguration;
use Illuminate\Foundation\Http\FormRequest;
/**
* Class RuleFormRequest.
*/
class RuleFormRequest extends LoggedInRequest
class RuleFormRequest extends FormRequest
{
use ConvertsDataTypes, GetRuleConfiguration;
use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
/**
* Get all data for controller.
@@ -54,6 +56,48 @@ class RuleFormRequest extends LoggedInRequest
];
}
/**
* @return array
*/
private function getRuleTriggerData(): array
{
$return = [];
$triggerData = $this->get('triggers');
if (is_array($triggerData)) {
foreach ($triggerData as $trigger) {
$stopProcessing = $trigger['stop_processing'] ?? '0';
$return[] = [
'type' => $trigger['type'] ?? 'invalid',
'value' => $trigger['value'] ?? '',
'stop_processing' => 1 === (int)$stopProcessing,
];
}
}
return $return;
}
/**
* @return array
*/
private function getRuleActionData(): array
{
$return = [];
$actionData = $this->get('actions');
if (is_array($actionData)) {
foreach ($actionData as $action) {
$stopProcessing = $action['stop_processing'] ?? '0';
$return[] = [
'type' => $action['type'] ?? 'invalid',
'value' => $action['value'] ?? '',
'stop_processing' => 1 === (int)$stopProcessing,
];
}
}
return $return;
}
/**
* Rules for this request.
*
@@ -93,46 +137,4 @@ class RuleFormRequest extends LoggedInRequest
return $rules;
}
/**
* @return array
*/
private function getRuleActionData(): array
{
$return = [];
$actionData = $this->get('actions');
if (is_array($actionData)) {
foreach ($actionData as $action) {
$stopProcessing = $action['stop_processing'] ?? '0';
$return[] = [
'type' => $action['type'] ?? 'invalid',
'value' => $action['value'] ?? '',
'stop_processing' => 1 === (int) $stopProcessing,
];
}
}
return $return;
}
/**
* @return array
*/
private function getRuleTriggerData(): array
{
$return = [];
$triggerData = $this->get('triggers');
if (is_array($triggerData)) {
foreach ($triggerData as $trigger) {
$stopProcessing = $trigger['stop_processing'] ?? '0';
$return[] = [
'type' => $trigger['type'] ?? 'invalid',
'value' => $trigger['value'] ?? '',
'stop_processing' => 1 === (int) $stopProcessing,
];
}
}
return $return;
}
}