kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +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:23:00 +01:00
parent b27fe59ab4
commit 1667b88dcd
154 changed files with 277 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php
View File

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AutocompleteRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array

6
app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Validation\Validator;
*/
class MoveTransactionsRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@@ -84,7 +85,8 @@ class MoveTransactionsRequest extends FormRequest
* @param Validator $validator
* @return void
*/
private function validateMove(Validator $validator): void {
private function validateMove(Validator $validator): void
{
$data = $validator->getData();
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());

4
app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
View File

@@ -39,7 +39,9 @@ use Log;
*/
class TransactionRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes, ValidatesBulkTransactionQuery;
use ChecksLogin;
use ConvertsDataTypes;
use ValidatesBulkTransactionQuery;
/**
* @return array

3
app/Api/V1/Requests/Data/DateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class DateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Data/DestroyRequest.php
View File

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class DestroyRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

5
app/Api/V1/Requests/Data/Export/ExportRequest.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Support\Collection;
*/
class ExportRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
public function getAll(): array
{
@@ -49,7 +50,7 @@ class ExportRequest extends FormRequest
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$accounts = new Collection;
$accounts = new Collection();
foreach ($parts as $part) {
$accountId = (int) $part;
if (0 !== $accountId) {

21
app/Api/V1/Requests/Insight/GenericRequest.php
View File

@@ -42,7 +42,8 @@ use Illuminate\Support\Collection;
*/
class GenericRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
private Collection $accounts;
private Collection $bills;
@@ -69,11 +70,11 @@ class GenericRequest extends FormRequest
public function getAssetAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE])) {
if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
$return->push($account);
}
}
@@ -216,7 +217,7 @@ class GenericRequest extends FormRequest
public function getExpenseAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
@@ -234,7 +235,7 @@ class GenericRequest extends FormRequest
public function getRevenueAccounts(): Collection
{
$this->parseAccounts();
$return = new Collection;
$return = new Collection();
/** @var Account $account */
foreach ($this->accounts as $account) {
$type = $account->accountType->type;
@@ -297,11 +298,11 @@ class GenericRequest extends FormRequest
public function rules(): array
{
// this is cheating but it works to initialize the collections.
$this->accounts = new Collection;
$this->budgets = new Collection;
$this->categories = new Collection;
$this->bills = new Collection;
$this->tags = new Collection;
$this->accounts = new Collection();
$this->budgets = new Collection();
$this->categories = new Collection();
$this->bills = new Collection();
$this->tags = new Collection();
return [
'start' => 'required|date',

8
app/Api/V1/Requests/Models/Account/StoreRequest.php
View File

@@ -40,7 +40,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* @return array
@@ -114,8 +116,8 @@ class StoreRequest extends FormRequest
'order' => 'numeric|nullable',
'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'active' => [new IsBoolean],
'include_net_worth' => [new IsBoolean],
'active' => [new IsBoolean()],
'include_net_worth' => [new IsBoolean()],
'account_role' => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
'credit_card_type' => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',

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

@@ -42,7 +42,9 @@ use Log;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
/**
* @return array
@@ -116,8 +118,8 @@ class UpdateRequest extends FormRequest
'order' => 'numeric|nullable',
'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'active' => [new IsBoolean],
'include_net_worth' => [new IsBoolean],
'active' => [new IsBoolean()],
'include_net_worth' => [new IsBoolean()],
'account_role' => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles),
'credit_card_type' => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'date' . '|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',

7
app/Api/V1/Requests/Models/Attachment/StoreRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -62,10 +63,10 @@ class StoreRequest extends FormRequest
{
$models = config('firefly.valid_attachment_models');
$models = array_map(
static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className);
}, $models
},
$models
);
$models = implode(',', $models);
$model = $this->convertString('attachable_type');

7
app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -64,10 +65,10 @@ class UpdateRequest extends FormRequest
{
$models = config('firefly.valid_attachment_models');
$models = array_map(
static function (string $className) {
return str_replace('FireflyIII\\Models\\', '', $className);
}, $models
},
$models
);
$models = implode(',', $models);
$model = $this->convertString('attachable_type');

3
app/Api/V1/Requests/Models/AvailableBudget/Request.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class Request extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

5
app/Api/V1/Requests/Models/Bill/StoreRequest.php
View File

@@ -38,7 +38,8 @@ use Log;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -87,7 +88,7 @@ class StoreRequest extends FormRequest
'extension_date' => 'date|after:date',
'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly|required',
'skip' => 'between:0,31',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'between:1,65536',
];
}

5
app/Api/V1/Requests/Models/Bill/UpdateRequest.php
View File

@@ -37,7 +37,8 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -87,7 +88,7 @@ class UpdateRequest extends FormRequest
'extension_date' => 'date|after:date',
'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'between:0,31',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'between:1,65536',
];
}

6
app/Api/V1/Requests/Models/Budget/StoreRequest.php
View File

@@ -37,7 +37,9 @@ use Illuminate\Validation\Validator;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Get all data from the request.
@@ -72,7 +74,7 @@ class StoreRequest extends FormRequest
{
return [
'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'currency_id' => 'exists:transaction_currencies,id',
'currency_code' => 'exists:transaction_currencies,code',
'notes' => 'nullable|between:1,65536',

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

@@ -37,7 +37,9 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Get all data from the request.
@@ -82,7 +84,7 @@ class UpdateRequest extends FormRequest
return [
'name' => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id),
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'notes' => 'nullable|between:1,65536',
'auto_budget_type' => 'in:reset,rollover,none',
'auto_budget_currency_id' => 'exists:transaction_currencies,id',

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -67,5 +68,4 @@ class StoreRequest extends FormRequest
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
];
}
}

4
app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -96,5 +97,4 @@ class UpdateRequest extends FormRequest
}
);
}
}

3
app/Api/V1/Requests/Models/Category/StoreRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/Category/UpdateRequest.php
View File

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array

5
app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
View File

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -58,7 +59,6 @@ class StoreRequest extends FormRequest
$data['object_group_title'] = $this->convertString('object_group_title');
return $data;
}
/**
@@ -80,5 +80,4 @@ class StoreRequest extends FormRequest
'notes' => 'max:65000',
];
}
}

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

@@ -36,7 +36,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -72,13 +73,12 @@ class UpdateRequest extends FormRequest
return [
'name' => 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id,
'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget],
'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget()],
'target_amount' => 'numeric|gt:0',
'start_date' => 'date|nullable',
'target_date' => 'date|nullable|after:start_date',
'notes' => 'max:65000',
'account_id' => ['belongsToUser:accounts', new IsAssetAccountId],
'account_id' => ['belongsToUser:accounts', new IsAssetAccountId()],
];
}
}

25
app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
View File

@@ -39,7 +39,12 @@ use Illuminate\Validation\Validator;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin;
use ConvertsDataTypes;
use RecurrenceValidation;
use TransactionValidation;
use CurrencyValidation;
use GetRecurrenceData;
use ChecksLogin;
/**
* Get all data from the request.
@@ -139,8 +144,8 @@ class StoreRequest extends FormRequest
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
'description' => 'between:1,65000',
'first_date' => 'required|date',
'apply_rules' => [new IsBoolean],
'active' => [new IsBoolean],
'apply_rules' => [new IsBoolean()],
'active' => [new IsBoolean()],
'repeat_until' => 'nullable|date',
'nr_of_repetitions' => 'nullable|numeric|between:1,31',
@@ -156,18 +161,18 @@ class StoreRequest extends FormRequest
'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id',
'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.destination_name' => 'between:1,255|nullable',
// new and updated fields:
'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser],
'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.tags' => 'nullable|between:1,64000',
];
}

25
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@@ -40,7 +40,12 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin;
use ConvertsDataTypes;
use RecurrenceValidation;
use TransactionValidation;
use CurrencyValidation;
use GetRecurrenceData;
use ChecksLogin;
/**
* Get all data from the request.
@@ -153,8 +158,8 @@ class UpdateRequest extends FormRequest
'title' => sprintf('between:1,255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
'description' => 'between:1,65000',
'first_date' => 'date',
'apply_rules' => [new IsBoolean],
'active' => [new IsBoolean],
'apply_rules' => [new IsBoolean()],
'active' => [new IsBoolean()],
'repeat_until' => 'nullable|date',
'nr_of_repetitions' => 'nullable|numeric|between:1,31',
@@ -170,18 +175,18 @@ class UpdateRequest extends FormRequest
'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id',
'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.destination_name' => 'between:1,255|nullable',
// new and updated fields:
'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser],
'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.tags' => 'nullable|between:1,64000',
];

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

@@ -29,6 +29,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Support\Request\GetRuleConfiguration;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
use function is_array;
/**
@@ -36,7 +37,9 @@ use function is_array;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
use ConvertsDataTypes;
use GetRuleConfiguration;
use ChecksLogin;
/**
* Get all data from the request.
@@ -128,15 +131,15 @@ class StoreRequest extends FormRequest
'trigger' => 'required|in:store-journal,update-journal',
'triggers.*.type' => 'required|in:' . implode(',', $validTriggers),
'triggers.*.value' => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue',
'triggers.*.stop_processing' => [new IsBoolean],
'triggers.*.active' => [new IsBoolean],
'triggers.*.stop_processing' => [new IsBoolean()],
'triggers.*.active' => [new IsBoolean()],
'actions.*.type' => 'required|in:' . implode(',', $validActions),
'actions.*.value' => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue',
'actions.*.stop_processing' => [new IsBoolean],
'actions.*.active' => [new IsBoolean],
'strict' => [new IsBoolean],
'stop_processing' => [new IsBoolean],
'active' => [new IsBoolean],
'actions.*.stop_processing' => [new IsBoolean()],
'actions.*.active' => [new IsBoolean()],
'strict' => [new IsBoolean()],
'stop_processing' => [new IsBoolean()],
'active' => [new IsBoolean()],
];
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TestRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array
@@ -56,7 +57,6 @@ class TestRequest extends FormRequest
private function getPage(): int
{
return 0 === (int) $this->query('page') ? 1 : (int) $this->query('page');
}
/**
@@ -89,5 +89,4 @@ class TestRequest extends FormRequest
'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
];
}
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TriggerRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array
@@ -78,5 +79,4 @@ class TriggerRequest extends FormRequest
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];
}
}

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

@@ -29,6 +29,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\Support\Request\GetRuleConfiguration;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
use function is_array;
/**
@@ -36,7 +37,9 @@ use function is_array;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
use ConvertsDataTypes;
use GetRuleConfiguration;
use ChecksLogin;
/**
* Get all data from the request.
@@ -142,15 +145,15 @@ class UpdateRequest extends FormRequest
'trigger' => 'in:store-journal,update-journal',
'triggers.*.type' => 'required|in:' . implode(',', $validTriggers),
'triggers.*.value' => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue',
'triggers.*.stop_processing' => [new IsBoolean],
'triggers.*.active' => [new IsBoolean],
'triggers.*.stop_processing' => [new IsBoolean()],
'triggers.*.active' => [new IsBoolean()],
'actions.*.type' => 'required|in:' . implode(',', $validActions),
'actions.*.value' => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue',
'actions.*.stop_processing' => [new IsBoolean],
'actions.*.active' => [new IsBoolean],
'strict' => [new IsBoolean],
'stop_processing' => [new IsBoolean],
'active' => [new IsBoolean],
'actions.*.stop_processing' => [new IsBoolean()],
'actions.*.active' => [new IsBoolean()],
'strict' => [new IsBoolean()],
'stop_processing' => [new IsBoolean()],
'active' => [new IsBoolean()],
'order' => 'numeric|between:1,1337',
];
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -70,7 +71,7 @@ class StoreRequest extends FormRequest
return [
'title' => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
'description' => 'between:1,5000|nullable',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
];
}
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TestRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array
@@ -78,5 +79,4 @@ class TestRequest extends FormRequest
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];
}
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TriggerRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* @return array
@@ -76,5 +77,4 @@ class TriggerRequest extends FormRequest
'end' => 'date|after:start',
];
}
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -66,7 +67,7 @@ class UpdateRequest extends FormRequest
return [
'title' => 'between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id,
'description' => 'between:1,5000|nullable',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
];
}
}

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

@@ -36,7 +36,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin, AppendsLocationData;
use ConvertsDataTypes;
use ChecksLogin;
use AppendsLocationData;
/**
* Get all data from the request.

4
app/Api/V1/Requests/Models/Tag/UpdateRequest.php
View File

@@ -37,7 +37,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin, AppendsLocationData;
use ConvertsDataTypes;
use ChecksLogin;
use AppendsLocationData;
/**
* Get all data from the request.

35
app/Api/V1/Requests/Models/Transaction/StoreRequest.php
View File

@@ -43,7 +43,12 @@ use Log;
*/
class StoreRequest extends FormRequest
{
use TransactionValidation, GroupValidation, CurrencyValidation, ConvertsDataTypes, ChecksLogin, AppendsLocationData;
use TransactionValidation;
use GroupValidation;
use CurrencyValidation;
use ConvertsDataTypes;
use ChecksLogin;
use AppendsLocationData;
/**
* Get all data. Is pretty complex because of all the ??-statements.
@@ -173,12 +178,12 @@ class StoreRequest extends FormRequest
return [
// basic fields for group:
'group_title' => 'between:1,1000|nullable',
'error_if_duplicate_hash' => [new IsBoolean],
'apply_rules' => [new IsBoolean],
'error_if_duplicate_hash' => [new IsBoolean()],
'apply_rules' => [new IsBoolean()],
// transaction rules (in array for splits):
'transactions.*.type' => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation',
'transactions.*.date' => ['required', new IsDateOrTime],
'transactions.*.date' => ['required', new IsDateOrTime()],
'transactions.*.order' => 'numeric|min:0',
// currency info
@@ -195,31 +200,31 @@ class StoreRequest extends FormRequest
'transactions.*.description' => 'nullable|between:1,1000',
// source of transaction
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.source_iban' => 'between:1,255|nullable|iban',
'transactions.*.source_number' => 'between:1,255|nullable',
'transactions.*.source_bic' => 'between:1,255|nullable|bic',
// destination of transaction
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.destination_name' => 'between:1,255|nullable',
'transactions.*.destination_iban' => 'between:1,255|nullable|iban',
'transactions.*.destination_number' => 'between:1,255|nullable',
'transactions.*.destination_bic' => 'between:1,255|nullable|bic',
// budget, category, bill and piggy
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser, 'nullable'],
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser()],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser()],
'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()],
// other interesting fields
'transactions.*.reconciled' => [new IsBoolean],
'transactions.*.reconciled' => [new IsBoolean()],
'transactions.*.notes' => 'min:1,max:50000|nullable',
'transactions.*.tags' => 'between:0,255',
@@ -261,7 +266,6 @@ class StoreRequest extends FormRequest
{
$validator->after(
function (Validator $validator) {
// must be valid array.
$this->validateTransactionArray($validator);
@@ -285,7 +289,6 @@ class StoreRequest extends FormRequest
// the group must have a description if > 1 journal.
$this->validateGroupDescription($validator);
}
);
}

30
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@@ -41,7 +41,10 @@ use Log;
*/
class UpdateRequest extends FormRequest
{
use TransactionValidation, GroupValidation, ConvertsDataTypes, ChecksLogin;
use TransactionValidation;
use GroupValidation;
use ConvertsDataTypes;
use ChecksLogin;
private array $arrayFields;
private array $booleanFields;
@@ -290,15 +293,15 @@ class UpdateRequest extends FormRequest
return [
// basic fields for group:
'group_title' => 'between:1,1000',
'apply_rules' => [new IsBoolean],
'apply_rules' => [new IsBoolean()],
// transaction rules (in array for splits):
'transactions.*.type' => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
'transactions.*.date' => [new IsDateOrTime],
'transactions.*.date' => [new IsDateOrTime()],
'transactions.*.order' => 'numeric|min:0',
// group id:
'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser],
'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser()],
// currency info
@@ -315,23 +318,23 @@ class UpdateRequest extends FormRequest
'transactions.*.description' => 'nullable|between:1,1000',
// source of transaction
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.source_name' => 'between:1,255|nullable',
// destination of transaction
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()],
'transactions.*.destination_name' => 'between:1,255|nullable',
// budget, category, bill and piggy
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser],
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser()],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()],
'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser()],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()],
// other interesting fields
'transactions.*.reconciled' => [new IsBoolean],
'transactions.*.reconciled' => [new IsBoolean()],
'transactions.*.notes' => 'min:1,max:50000|nullable',
'transactions.*.tags' => 'between:0,255',
@@ -385,12 +388,11 @@ class UpdateRequest extends FormRequest
$this->validateEqualAccountsForUpdate($validator, $transactionGroup);
// a catch when users submit splits with no source or destination info at all.
$this->preventNoAccountInfo($validator,);
$this->preventNoAccountInfo($validator, );
// validate that the currency fits the source and/or destination account.
// validate all account info
$this->validateAccountInformationUpdate($validator, $transactionGroup);
}
);
}

3
app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Validation\Validator;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php
View File

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

3
app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Validation\Rule;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.

8
app/Api/V1/Requests/Models/Webhook/CreateRequest.php
View File

@@ -34,14 +34,14 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CreateRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
*/
public function getData(): array
{
$triggers = Webhook::getTriggersForValidation();
$responses = Webhook::getResponsesForValidation();
$deliveries = Webhook::getDeliveriesForValidation();
@@ -77,13 +77,11 @@ class CreateRequest extends FormRequest
return [
'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'trigger' => sprintf('required|in:%s', $triggers),
'response' => sprintf('required|in:%s', $responses),
'delivery' => sprintf('required|in:%s', $deliveries),
'url' => ['required', 'url', 'uniqueWebhook'],
];
}
}

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

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@@ -80,7 +81,6 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
$triggers = implode(',', array_keys(Webhook::getTriggersForValidation()));
$responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
$deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
@@ -88,7 +88,7 @@ class UpdateRequest extends FormRequest
return [
'title' => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
'active' => [new IsBoolean],
'active' => [new IsBoolean()],
'trigger' => sprintf('in:%s', $triggers),
'response' => sprintf('in:%s', $responses),
'delivery' => sprintf('in:%s', $deliveries),

5
app/Api/V1/Requests/System/UpdateRequest.php
View File

@@ -36,7 +36,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
@@ -73,7 +74,7 @@ class UpdateRequest extends FormRequest
break;
case 'configuration.is_demo_site':
case 'configuration.single_user_mode':
return ['value' => ['required', new IsBoolean]];
return ['value' => ['required', new IsBoolean()]];
case 'configuration.permission_update_check':
return ['value' => 'required|numeric|between:-1,1'];
case 'configuration.last_update_check':

6
app/Api/V1/Requests/System/UserStoreRequest.php
View File

@@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UserStoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Logged in + owner
@@ -75,10 +76,9 @@ class UserStoreRequest extends FormRequest
{
return [
'email' => 'required|email|unique:users,email',
'blocked' => [new IsBoolean],
'blocked' => [new IsBoolean()],
'blocked_code' => 'in:email_changed',
'role' => 'in:owner,demo',
];
}
}

6
app/Api/V1/Requests/System/UserUpdateRequest.php
View File

@@ -35,7 +35,8 @@ use Illuminate\Validation\Validator;
*/
class UserUpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
use ConvertsDataTypes;
use ChecksLogin;
/**
* Logged in + owner
@@ -78,7 +79,7 @@ class UserUpdateRequest extends FormRequest
return [
'email' => sprintf('email|unique:users,email,%d', $user->id),
'blocked' => [new IsBoolean],
'blocked' => [new IsBoolean()],
'blocked_code' => 'in:email_changed',
'role' => 'in:owner,demo,',
];
@@ -104,5 +105,4 @@ class UserUpdateRequest extends FormRequest
}
);
}
}

4
app/Api/V1/Requests/User/PreferenceStoreRequest.php
View File

@@ -29,7 +29,8 @@ use Illuminate\Foundation\Http\FormRequest;
class PreferenceStoreRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@@ -63,5 +64,4 @@ class PreferenceStoreRequest extends FormRequest
'data' => 'required',
];
}
}

4
app/Api/V1/Requests/User/PreferenceUpdateRequest.php
View File

@@ -30,7 +30,8 @@ use Illuminate\Foundation\Http\FormRequest;
class PreferenceUpdateRequest extends FormRequest
{
use ChecksLogin, ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* @return array
@@ -63,5 +64,4 @@ class PreferenceUpdateRequest extends FormRequest
'data' => 'required',
];
}
}