kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Use PSR-12 code style

Browse Source
This commit is contained in:
James Cole
2022-10-30 14:24:28 +01:00
parent 2eebcb21f1
commit f53923f16c
187 changed files with 429 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/AccountFormRequest.php
View File

@@ -35,7 +35,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AccountFormRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* Get all data.

3
app/Http/Requests/AttachmentFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AttachmentFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/BillStoreRequest.php
View File

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BillStoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/BillUpdateRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BillUpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

5
app/Http/Requests/BudgetFormStoreRequest.php
View File

@@ -34,7 +34,9 @@ use Illuminate\Validation\Validator;
*/
class BudgetFormStoreRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Returns the data required by the controller.
@@ -86,5 +88,4 @@ class BudgetFormStoreRequest extends FormRequest
}
);
}
}

4
app/Http/Requests/BudgetFormUpdateRequest.php
View File

@@ -35,7 +35,9 @@ use Illuminate\Validation\Validator;
*/
class BudgetFormUpdateRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Returns the data required by the controller.

4
app/Http/Requests/BulkEditJournalRequest.php
View File

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BulkEditJournalRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Rules for this request.
@@ -40,7 +41,6 @@ class BulkEditJournalRequest extends FormRequest
*/
public function rules(): array
{
// fixed
return [
'journals.*' => 'required|belongsToUser:transaction_journals,id',

3
app/Http/Requests/CategoryFormRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CategoryFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get information for the controller.

3
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CurrencyFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/EmailFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class EmailFormRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Rules for this request.

3
app/Http/Requests/InviteUserFormRequest.php
View File

@@ -30,7 +30,8 @@ use Illuminate\Foundation\Http\FormRequest;
class InviteUserFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Rules for this request.

3
app/Http/Requests/JournalLinkRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class JournalLinkRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/LinkTypeFormRequest.php
View File

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class LinkTypeFormRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Rules for this request.

3
app/Http/Requests/NewUserFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class NewUserFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Rules for this request.

3
app/Http/Requests/ObjectGroupFormRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class ObjectGroupFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/PiggyBankStoreRequest.php
View File

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class PiggyBankStoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

3
app/Http/Requests/PiggyBankUpdateRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class PiggyBankUpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.

5
app/Http/Requests/ReconciliationStoreRequest.php
View File

@@ -34,7 +34,8 @@ use Log;
*/
class ReconciliationStoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Returns the data required by the controller.
@@ -74,7 +75,7 @@ class ReconciliationStoreRequest extends FormRequest
'startBalance' => 'numeric|max:1000000000',
'endBalance' => 'numeric|max:1000000000',
'difference' => 'required|numeric|max:1000000000',
'journals' => [new ValidJournals],
'journals' => [new ValidJournals()],
'reconcile' => 'required|in:create,nothing',
];
}

7
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -42,7 +42,8 @@ use Log;
*/
class RecurrenceFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get the data required by the controller.
@@ -160,7 +161,7 @@ class RecurrenceFormRequest extends FormRequest
}
//monthly,17
//ndom,3,7
if (in_array(substr($value, 0, 6), ['yearly', 'weekly'])) {
if (in_array(substr($value, 0, 6), ['yearly', 'weekly'], true)) {
$return['type'] = substr($value, 0, 6);
$return['moment'] = substr($value, 7);
}
@@ -191,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest
// mandatory info for recurrence.
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
'first_date' => 'required|date|after:' . $today->format('Y-m-d'),
'repetition_type' => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'],
'repetition_type' => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'between:1,20'],
'skip' => 'required|numeric|integer|gte:0|lte:31',
// optional for recurrence:

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

@@ -52,7 +52,7 @@ class ReportFormRequest extends FormRequest
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$set = $this->get('accounts');
$collection = new Collection;
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $accountId) {
$account = $repository->find((int) $accountId);
@@ -75,7 +75,7 @@ class ReportFormRequest extends FormRequest
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$set = $this->get('budget');
$collection = new Collection;
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $budgetId) {
$budget = $repository->find((int) $budgetId);
@@ -98,7 +98,7 @@ class ReportFormRequest extends FormRequest
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$set = $this->get('category');
$collection = new Collection;
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $categoryId) {
$category = $repository->find((int) $categoryId);
@@ -121,7 +121,7 @@ class ReportFormRequest extends FormRequest
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$set = $this->get('double');
$collection = new Collection;
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $accountId) {
$account = $repository->find((int) $accountId);
@@ -213,7 +213,7 @@ class ReportFormRequest extends FormRequest
/** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class);
$set = $this->get('tag');
$collection = new Collection;
$collection = new Collection();
Log::debug('Set is:', $set ?? []);
if (is_array($set)) {
foreach ($set as $tagTag) {

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

@@ -33,7 +33,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class RuleFormRequest extends FormRequest
{
use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
use ConvertsDataTypes;
use GetRuleConfiguration;
use ChecksLogin;
/**
* Get all data for controller.

5
app/Http/Requests/RuleGroupFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class RuleGroupFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data for controller.
@@ -73,7 +74,7 @@ class RuleGroupFormRequest extends FormRequest
return [
'title' => $titleRule,
'description' => 'between:1,5000|nullable',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
];
}
}

5
app/Http/Requests/TagFormRequest.php
View File

@@ -34,7 +34,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TagFormRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* Get all data for controller.
@@ -50,7 +52,6 @@ class TagFormRequest extends FormRequest
];
return $this->appendLocationData($data, 'location');
}
/**

3
app/Http/Requests/TestRuleFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TestRuleFormRequest extends FormRequest
{
use GetRuleConfiguration, ChecksLogin;
use GetRuleConfiguration;
use ChecksLogin;
/**
* Rules for this request.

3
app/Http/Requests/UserFormRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UserFormRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get data for controller.