kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +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

24
app/Http/Requests/ReportFormRequest.php
View File

@@ -29,14 +29,18 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\Request\ChecksLogin;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Collection;
use Log;
/**
* Class CategoryFormRequest.
*/
class ReportFormRequest extends LoggedInRequest
class ReportFormRequest extends FormRequest
{
use ChecksLogin;
/**
* Validate list of accounts.
*
@@ -51,7 +55,7 @@ class ReportFormRequest extends LoggedInRequest
$collection = new Collection;
if (is_array($set)) {
foreach ($set as $accountId) {
$account = $repository->findNull((int) $accountId);
$account = $repository->findNull((int)$accountId);
if (null !== $account) {
$collection->push($account);
}
@@ -74,7 +78,7 @@ class ReportFormRequest extends LoggedInRequest
$collection = new Collection;
if (is_array($set)) {
foreach ($set as $budgetId) {
$budget = $repository->findNull((int) $budgetId);
$budget = $repository->findNull((int)$budgetId);
if (null !== $budget) {
$collection->push($budget);
}
@@ -97,7 +101,7 @@ class ReportFormRequest extends LoggedInRequest
$collection = new Collection;
if (is_array($set)) {
foreach ($set as $categoryId) {
$category = $repository->findNull((int) $categoryId);
$category = $repository->findNull((int)$categoryId);
if (null !== $category) {
$collection->push($category);
}
@@ -120,7 +124,7 @@ class ReportFormRequest extends LoggedInRequest
$collection = new Collection;
if (is_array($set)) {
foreach ($set as $accountId) {
$account = $repository->findNull((int) $accountId);
$account = $repository->findNull((int)$accountId);
if (null !== $account) {
$collection->push($account);
}
@@ -133,15 +137,15 @@ class ReportFormRequest extends LoggedInRequest
/**
* Validate end date.
*
* @throws FireflyException
* @return Carbon
*
* @throws FireflyException
*/
public function getEndDate(): Carbon
{
$date = today(config('app.timezone'));
$range = $this->get('daterange');
$parts = explode(' - ', (string) $range);
$parts = explode(' - ', (string)$range);
if (2 === count($parts)) {
try {
$date = new Carbon($parts[1]);
@@ -161,15 +165,15 @@ class ReportFormRequest extends LoggedInRequest
/**
* Validate start date.
*
* @throws FireflyException
* @return Carbon
*
* @throws FireflyException
*/
public function getStartDate(): Carbon
{
$date = today(config('app.timezone'));
$range = $this->get('daterange');
$parts = explode(' - ', (string) $range);
$parts = explode(' - ', (string)$range);
if (2 === count($parts)) {
try {
$date = new Carbon($parts[0]);
@@ -205,7 +209,7 @@ class ReportFormRequest extends LoggedInRequest
$collection->push($tag);
continue;
}
$tag = $repository->findNull((int) $tagTag);
$tag = $repository->findNull((int)$tagTag);
if (null !== $tag) {
$collection->push($tag);
continue;