kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-17 20:08:52 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-11-09

Browse Source
This commit is contained in:
JC5
2025-11-09 09:11:55 +01:00
parent 68183a0a0e
commit a498169148
78 changed files with 183 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Validation/AccountValidator.php
View File

@@ -50,10 +50,10 @@ class AccountValidator
use TransferValidation;
use WithdrawalValidation;
public bool $createMode = false;
public string $destError = 'No error yet.';
public bool $createMode = false;
public string $destError = 'No error yet.';
public ?Account $destination = null;
public ?Account $source = null;
public ?Account $source = null;
public string $sourceError = 'No error yet.';
private AccountRepositoryInterface $accountRepository;
private array $combinations;
@@ -230,6 +230,7 @@ class AccountValidator
protected function canCreateType(string $accountType): bool
{
$canCreate = [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value];
return in_array($accountType, $canCreate, true);
}

1
app/Validation/FireflyValidator.php
View File

@@ -123,6 +123,7 @@ class FireflyValidator extends Validator
}
$regex = '/^[a-z]{6}[0-9a-z]{2}([0-9a-z]{3})?\z/i';
$result = preg_match($regex, $value);
return 0 !== $result;
}

5
app/Validation/TransactionValidation.php
View File

@@ -302,6 +302,7 @@ trait TransactionValidation
private function isLiability(Account $account): bool
{
$type = $account->accountType->type;
return in_array($type, config('firefly.valid_liabilities'), true);
}
@@ -323,6 +324,7 @@ trait TransactionValidation
if ('' === $transaction['foreign_amount']) {
return false;
}
return 0 !== bccomp('0', (string) $transaction['foreign_amount']);
}
@@ -750,6 +752,7 @@ trait TransactionValidation
// source ID's are equal, return void.
return true;
}
// source names are equal, return void.
return (bool) $this->arrayEqual($comparison['source_name']);
}
@@ -765,6 +768,7 @@ trait TransactionValidation
// destination ID's are equal, return void.
return true;
}
// destination names are equal, return void.
return (bool) $this->arrayEqual($comparison['destination_name']);
}
@@ -783,6 +787,7 @@ trait TransactionValidation
// destination ID's are equal, return void.
return true;
}
// destination names are equal, return void.
return (bool) $this->arrayEqual($comparison['destination_name']);
}