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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-09-09 06:41:45 +02:00
parent 0543733e3d
commit 3a3eb4e84f
38 changed files with 212 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Requests/ExportFormRequest.php
View File

@@ -43,14 +43,14 @@ class ExportFormRequest extends Request
$formats = join(',', array_keys(config('firefly.export_formats')));
return [
// 'export_start_range' => 'required|date|after:' . $first,
// 'export_end_range' => 'required|date|before:' . $today,
// 'accounts' => 'required',
// 'job' => 'required|belongsToUser:export_jobs,key',
// 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
// 'include_attachments' => 'in:0,1',
// 'include_config' => 'in:0,1',
// 'exportFormat' => 'in:' . $formats,
'export_start_range' => 'required|date|after:' . $first,
'export_end_range' => 'required|date|before:' . $today,
'accounts' => 'required',
'job' => 'required|belongsToUser:export_jobs,key',
'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
'include_attachments' => 'in:0,1',
'include_config' => 'in:0,1',
'exportFormat' => 'in:' . $formats,
];
}
}

94
app/Http/Requests/Request.php
View File

@@ -33,53 +33,6 @@ class Request extends FormRequest
return intval($this->input($field)) === 1;
}
/**
* @param string $field
*
* @return Carbon|null
*/
protected function date(string $field)
{
return $this->get($field) ? new Carbon($this->get($field)) : null;
}
/**
* @param string $field
*
* @return float
*/
protected function float(string $field): float
{
return round($this->input($field), 12);
}
/**
* @param string $field
* @param string $type
*
* @return array
*/
protected function getArray(string $field, string $type): array
{
$original = $this->get($field);
$return = [];
foreach ($original as $index => $value) {
$return[$index] = $this->$type($value);
}
return $return;
}
/**
* @param string $field
*
* @return int
*/
protected function integer(string $field): int
{
return intval($this->get($field));
}
/**
* @param string $field
*
@@ -140,4 +93,51 @@ class Request extends FormRequest
return trim($string);
}
/**
* @param string $field
*
* @return Carbon|null
*/
protected function date(string $field)
{
return $this->get($field) ? new Carbon($this->get($field)) : null;
}
/**
* @param string $field
*
* @return float
*/
protected function float(string $field): float
{
return round($this->input($field), 12);
}
/**
* @param string $field
* @param string $type
*
* @return array
*/
protected function getArray(string $field, string $type): array
{
$original = $this->get($field);
$return = [];
foreach ($original as $index => $value) {
$return[$index] = $this->$type($value);
}
return $return;
}
/**
* @param string $field
*
* @return int
*/
protected function integer(string $field): int
{
return intval($this->get($field));
}
}