kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix code

Browse Source
This commit is contained in:
James Cole
2023-12-21 05:07:26 +01:00
parent 1f7ceb6df6
commit a445bc53cd
61 changed files with 165 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Account/IndexController.php
View File

@@ -99,7 +99,7 @@ class IndexController extends Controller
$activities = app('steam')->getLastActivities($ids);
$accounts->each(
function (Account $account) use ($activities, $startBalances, $endBalances) {
function (Account $account) use ($activities, $startBalances, $endBalances): void {
$account->lastActivityDate = $this->isInArrayDate($activities, $account->id);
$account->startBalance = $this->isInArray($startBalances, $account->id);
$account->endBalance = $this->isInArray($endBalances, $account->id);
@@ -162,7 +162,7 @@ class IndexController extends Controller
$activities = app('steam')->getLastActivities($ids);
$accounts->each(
function (Account $account) use ($activities, $startBalances, $endBalances) {
function (Account $account) use ($activities, $startBalances, $endBalances): void {
$interest = (string)$this->repository->getMetaValue($account, 'interest');
$interest = '' === $interest ? '0' : $interest;

2
app/Http/Controllers/Admin/LinkController.php
View File

@@ -171,7 +171,7 @@ class LinkController extends Controller
Log::channel('audit')->info('User on index of link types in admin.');
$linkTypes->each(
function (LinkType $linkType) {
function (LinkType $linkType): void {
$linkType->journalCount = $this->repository->countJournals($linkType);
}
);

2
app/Http/Controllers/Admin/UserController.php
View File

@@ -173,7 +173,7 @@ class UserController extends Controller
// add meta stuff.
$users->each(
function (User $user) {
function (User $user): void {
$user->isAdmin = $this->repository->hasRole($user, 'owner');
$user->has2FA = null !== $user->mfa_secret;
}

2
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -95,7 +95,7 @@ class ResetPasswordController extends Controller
// database. Otherwise we will parse the error and return the response.
$response = $this->broker()->reset(
$this->credentials($request),
function ($user, $password) {
function ($user, $password): void {
$this->resetPassword($user, $password);
}
);

2
app/Http/Controllers/Category/IndexController.php
View File

@@ -77,7 +77,7 @@ class IndexController extends Controller
$collection = $collection->slice(($page - 1) * $pageSize, $pageSize);
$collection->each(
function (Category $category) {
function (Category $category): void {
$category->lastActivity = $this->repository->lastUseDate($category, new Collection());
}
);

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

@@ -74,7 +74,7 @@ class BudgetFormStoreRequest extends FormRequest
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
function (Validator $validator): void {
// validate all account info
$this->validateAutoBudgetAmount($validator);
}

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

@@ -84,7 +84,7 @@ class BudgetFormUpdateRequest extends FormRequest
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
function (Validator $validator): void {
// validate all account info
$this->validateAutoBudgetAmount($validator);
}

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

@@ -237,7 +237,7 @@ class RecurrenceFormRequest extends FormRequest
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
function (Validator $validator): void {
// validate all account info
$this->validateAccountInformation($validator);
}

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

@@ -141,7 +141,8 @@ class ReportFormRequest extends FormRequest
// validate as date
// if regex for YYYY-MM-DD:
$pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
if (false !== preg_match($pattern, $string)) {
$result = preg_match($pattern, $string);
if (false !== $result && 0 !== $result) {
try {
$date = new Carbon($parts[1]);
} catch (\Exception $e) { // intentional generic exception
@@ -178,7 +179,8 @@ class ReportFormRequest extends FormRequest
// validate as date
// if regex for YYYY-MM-DD:
$pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
if (false !== preg_match($pattern, $string)) {
$result = preg_match($pattern, $string);
if (false !== $result && 0 !== $result) {
try {
$date = new Carbon($parts[0]);
} catch (\Exception $e) { // intentional generic exception