kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 12:28:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix code quality with rector [skip ci]

Browse Source
This commit is contained in:
James Cole
2025-11-09 09:08:03 +01:00
parent d2610be790
commit 68183a0a0e
209 changed files with 1021 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Validation/Account/LiabilityValidation.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Validation\Account;
use Illuminate\Support\Facades\Log;
use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
@@ -35,23 +36,23 @@ trait LiabilityValidation
{
protected function validateLCDestination(array $array): bool
{
app('log')->debug('Now in validateLCDestination', $array);
Log::debug('Now in validateLCDestination', $array);
$result = null;
$accountId = array_key_exists('id', $array) ? $array['id'] : null;
$accountName = array_key_exists('name', $array) ? $array['name'] : null;
$accountId = $array['id'] ?? null;
$accountName = $array['name'] ?? null;
$validTypes = config('firefly.valid_liabilities');
// if the ID is not null the source account should be a dummy account of the type liability credit.
// the ID of the destination must belong to a liability.
if (null !== $accountId) {
if (AccountTypeEnum::LIABILITY_CREDIT->value !== $this->source?->accountType?->type) {
app('log')->error('Source account is not a liability.');
Log::error('Source account is not a liability.');
return false;
}
$result = $this->findExistingAccount($validTypes, $array);
if (null === $result) {
app('log')->error('Destination account is not a liability.');
Log::error('Destination account is not a liability.');
return false;
}
@@ -60,11 +61,11 @@ trait LiabilityValidation
}
if (null !== $accountName && '' !== $accountName) {
app('log')->debug('Destination ID is null, now we can assume the destination is a (new) liability credit account.');
Log::debug('Destination ID is null, now we can assume the destination is a (new) liability credit account.');
return true;
}
app('log')->error('Destination ID is null, but destination name is also NULL.');
Log::error('Destination ID is null, but destination name is also NULL.');
return false;
}
@@ -74,35 +75,35 @@ trait LiabilityValidation
*/
protected function validateLCSource(array $array): bool
{
app('log')->debug('Now in validateLCSource', $array);
Log::debug('Now in validateLCSource', $array);
// if the array has an ID and ID is not null, try to find it and check type.
// this account must be a liability
$accountId = array_key_exists('id', $array) ? $array['id'] : null;
$accountId = $array['id'] ?? null;
if (null !== $accountId) {
app('log')->debug('Source ID is not null, assume were looking for a liability.');
Log::debug('Source ID is not null, assume were looking for a liability.');
// find liability credit:
$result = $this->findExistingAccount(config('firefly.valid_liabilities'), $array);
if (null === $result) {
app('log')->error('Did not find a liability account, return false.');
Log::error('Did not find a liability account, return false.');
return false;
}
app('log')->debug(sprintf('Return true, found #%d ("%s")', $result->id, $result->name));
Log::debug(sprintf('Return true, found #%d ("%s")', $result->id, $result->name));
$this->setSource($result);
return true;
}
// if array has name and is not null, return true.
$accountName = array_key_exists('name', $array) ? $array['name'] : null;
$accountName = $array['name'] ?? null;
$result = true;
if ('' === $accountName || null === $accountName) {
app('log')->error('Array must have a name, is not the case, return false.');
Log::error('Array must have a name, is not the case, return false.');
$result = false;
}
if (true === $result) {
app('log')->error('Array has a name, return true.');
if ($result) {
Log::error('Array has a name, return true.');
// set the source to be a (dummy) revenue account.
$account = new Account();
$accountType = AccountType::whereType(AccountTypeEnum::LIABILITY_CREDIT->value)->first();