kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup and fixed alignments.

Browse Source
This commit is contained in:
James Cole
2024-01-01 14:41:31 +01:00
parent 8b9dce70bb
commit 657262f179
119 changed files with 1022 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Api/V1/Requests/Models/Rule/StoreRequest.php
View File

@@ -44,7 +44,7 @@ class StoreRequest extends FormRequest
*/
public function getAll(): array
{
$fields = [
$fields = [
'title' => ['title', 'convertString'],
'description' => ['description', 'convertString'],
'rule_group_id' => ['rule_group_id', 'convertInteger'],
@@ -55,7 +55,7 @@ class StoreRequest extends FormRequest
'stop_processing' => ['stop_processing', 'boolean'],
'active' => ['active', 'boolean'],
];
$data = $this->getAllData($fields);
$data = $this->getAllData($fields);
$data['triggers'] = $this->getRuleTriggers();
$data['actions'] = $this->getRuleActions();
@@ -68,8 +68,8 @@ class StoreRequest extends FormRequest
*/
public function rules(): array
{
$validTriggers = $this->getTriggers();
$validActions = array_keys(config('firefly.rule-actions'));
$validTriggers = $this->getTriggers();
$validActions = array_keys(config('firefly.rule-actions'));
// some triggers and actions require text:
$contextTriggers = implode(',', $this->getTriggersWithContext());
@@ -141,10 +141,10 @@ class StoreRequest extends FormRequest
*/
protected function atLeastOneActiveTrigger(Validator $validator): void
{
$data = $validator->getData();
$data = $validator->getData();
/** @var null|array|int|string $triggers */
$triggers = $data['triggers'] ?? [];
$triggers = $data['triggers'] ?? [];
// need at least one trigger
if (!is_countable($triggers) || 0 === count($triggers)) {
return;
@@ -170,10 +170,10 @@ class StoreRequest extends FormRequest
*/
protected function atLeastOneActiveAction(Validator $validator): void
{
$data = $validator->getData();
$data = $validator->getData();
/** @var null|array|int|string $actions */
$actions = $data['actions'] ?? [];
$actions = $data['actions'] ?? [];
// need at least one trigger
if (!is_countable($actions) || 0 === count($actions)) {
return;

2
app/Api/V1/Requests/Models/Rule/TestRequest.php
View File

@@ -64,7 +64,7 @@ class TestRequest extends FormRequest
private function getDate(string $field): ?Carbon
{
$value = $this->query($field);
$value = $this->query($field);
if (is_array($value)) {
return null;
}

2
app/Api/V1/Requests/Models/Rule/TriggerRequest.php
View File

@@ -58,7 +58,7 @@ class TriggerRequest extends FormRequest
private function getDate(string $field): ?Carbon
{
$value = $this->query($field);
$value = $this->query($field);
if (is_array($value)) {
return null;
}

8
app/Api/V1/Requests/Models/Rule/UpdateRequest.php
View File

@@ -45,7 +45,7 @@ class UpdateRequest extends FormRequest
*/
public function getAll(): array
{
$fields = [
$fields = [
'title' => ['title', 'convertString'],
'description' => ['description', 'stringWithNewlines'],
'rule_group_id' => ['rule_group_id', 'convertInteger'],
@@ -74,11 +74,11 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
$validTriggers = $this->getTriggers();
$validActions = array_keys(config('firefly.rule-actions'));
$validTriggers = $this->getTriggers();
$validActions = array_keys(config('firefly.rule-actions'));
/** @var Rule $rule */
$rule = $this->route()->parameter('rule');
$rule = $this->route()->parameter('rule');
// some triggers and actions require text:
$contextTriggers = implode(',', $this->getTriggersWithContext());