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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php
View File

@@ -38,8 +38,6 @@ class StoreRequest extends FormRequest
/**
* Get all data from the request.
*
* @return array
*/
public function getAll(): array
{
@@ -62,8 +60,6 @@ class StoreRequest extends FormRequest
/**
* The rules that the incoming request must be matched against.
*
* @return array
*/
public function rules(): array
{

35
app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
View File

@@ -37,9 +37,6 @@ class TestRequest extends FormRequest
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getTestParameters(): array
{
return [
@@ -49,11 +46,16 @@ class TestRequest extends FormRequest
];
}
/**
* @param string $field
*
* @return Carbon|null
*/
public function rules(): array
{
return [
'start' => 'date',
'end' => 'date|after_or_equal:start',
'accounts' => '',
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];
}
private function getDate(string $field): ?Carbon
{
$value = $this->query($field);
@@ -65,27 +67,12 @@ class TestRequest extends FormRequest
if (false === $result) {
return null;
}
return $result;
}
/**
* @return array
*/
private function getAccounts(): array
{
return $this->get('accounts');
}
/**
* @return array
*/
public function rules(): array
{
return [
'start' => 'date',
'end' => 'date|after_or_equal:start',
'accounts' => '',
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];
}
}

31
app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
View File

@@ -37,9 +37,6 @@ class TriggerRequest extends FormRequest
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getTriggerParameters(): array
{
return [
@@ -49,11 +46,14 @@ class TriggerRequest extends FormRequest
];
}
/**
* @param string $field
*
* @return Carbon|null
*/
public function rules(): array
{
return [
'start' => 'date',
'end' => 'date|after_or_equal:start',
];
}
private function getDate(string $field): ?Carbon
{
$value = $this->query($field);
@@ -65,25 +65,12 @@ class TriggerRequest extends FormRequest
if (false === $result) {
return null;
}
return $result;
}
/**
* @return array
*/
private function getAccounts(): array
{
return $this->get('accounts');
}
/**
* @return array
*/
public function rules(): array
{
return [
'start' => 'date',
'end' => 'date|after_or_equal:start',
];
}
}

6
app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php
View File

@@ -39,8 +39,6 @@ class UpdateRequest extends FormRequest
/**
* Get all data from the request.
*
* @return array
*/
public function getAll(): array
{
@@ -57,8 +55,6 @@ class UpdateRequest extends FormRequest
/**
* The rules that the incoming request must be matched against.
*
* @return array
*/
public function rules(): array
{
@@ -66,7 +62,7 @@ class UpdateRequest extends FormRequest
$ruleGroup = $this->route()->parameter('ruleGroup');
return [
'title' => 'between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id,
'title' => 'between:1,100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id,
'description' => 'between:1,5000|nullable',
'active' => [new IsBoolean()],
];