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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-08-04 17:30:06 +02:00
parent 5af026674f
commit f0d3ca5d53
88 changed files with 552 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Validation/TransactionValidation.php
View File

@@ -112,10 +112,10 @@ trait TransactionValidation
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
$journalDescription = (string)($data['description'] ?? '');
$journalDescription = (string)($data['description'] ?? null);
$validDescriptions = 0;
foreach ($transactions as $index => $transaction) {
if (\strlen((string)($transaction['description'] ?? '')) > 0) {
if (\strlen((string)($transaction['description'] ?? null)) > 0) {
$validDescriptions++;
}
}
@@ -157,9 +157,9 @@ trait TransactionValidation
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
$journalDescription = (string)($data['description'] ?? '');
$journalDescription = (string)($data['description'] ?? null);
foreach ($transactions as $index => $transaction) {
$description = (string)($transaction['description'] ?? '');
$description = (string)($transaction['description'] ?? null);
// description cannot be equal to journal description.
if ($description === $journalDescription) {
$validator->errors()->add('transactions.' . $index . '.description', (string)trans('validation.equal_description'));
@@ -249,7 +249,7 @@ trait TransactionValidation
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
foreach ($transactions as $index => $transaction) {
$description = (string)($transaction['description'] ?? '');
$description = (string)($transaction['description'] ?? null);
// filled description is mandatory for split transactions.
if ('' === $description && \count($transactions) > 1) {
$validator->errors()->add(