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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2023-11-04 14:18:49 +01:00
parent 5a35960434
commit ba0843d0bb
211 changed files with 566 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@@ -123,7 +123,7 @@ class AccountController extends Controller
usort(
$allItems,
function (array $a, array $b): int {
static function (array $a, array $b): int {
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
$pos_a = array_search($a['type'], $order, true);
$pos_b = array_search($b['type'], $order, true);

2
app/Api/V2/Controllers/Chart/CategoryController.php
View File

@@ -135,7 +135,7 @@ class CategoryController extends Controller
$return = array_values($return);
// order by native amount
usort($return, function (array $a, array $b) {
usort($return, static function (array $a, array $b) {
return (float)$a['native_amount'] < (float)$b['native_amount'] ? 1 : -1;
});
return response()->json($this->clean($return));

2
app/Api/V2/Request/Autocomplete/AutocompleteRequest.php
View File

@@ -35,8 +35,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AutocompleteRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];

6
app/Api/V2/Request/Chart/BalanceChartRequest.php
View File

@@ -36,8 +36,8 @@ use Illuminate\Validation\Validator;
*/
class BalanceChartRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
use ValidatesUserGroupTrait;
/**
@@ -64,7 +64,7 @@ class BalanceChartRequest extends FormRequest
'start' => 'required|date|after:1900-01-01|before:2099-12-31',
'end' => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
'accounts.*' => 'required|exists:accounts,id',
'period' => sprintf('required|in:%s', join(',', config('firefly.valid_view_ranges'))),
'period' => sprintf('required|in:%s', implode(',', config('firefly.valid_view_ranges'))),
];
}
@@ -76,7 +76,7 @@ class BalanceChartRequest extends FormRequest
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
static function (Validator $validator) {
// validate transaction query data.
$data = $validator->getData();
if (!array_key_exists('accounts', $data)) {

2
app/Api/V2/Request/Generic/DateRequest.php
View File

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

2
app/Api/V2/Request/Generic/SingleDateRequest.php
View File

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

12
app/Api/V2/Request/Model/Transaction/StoreRequest.php
View File

@@ -50,13 +50,13 @@ use Illuminate\Validation\Validator;
*/
class StoreRequest extends FormRequest
{
use ChecksLogin;
use ConvertsDataTypes;
use TransactionValidation;
use GroupValidation;
use CurrencyValidation;
use AppendsLocationData;
use ChecksLogin;
use ConvertsDataTypes;
use CurrencyValidation;
use GroupValidation;
use TransactionValidation;
protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];

2
app/Api/V2/Request/UserGroup/UpdateMembershipRequest.php
View File

@@ -64,7 +64,7 @@ class UpdateMembershipRequest extends FormRequest
return [
'id' => 'exists:users,id|required_without:email',
'email' => 'exists:users,email|required_without:id',
'roles.*' => 'required|in:' . join(',', $validRoles),
'roles.*' => 'required|in:' . implode(',', $validRoles),
];
}
}