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 some tests, disable actions for the time being.

Browse Source
This commit is contained in:
James Cole
2020-08-01 15:06:02 +02:00
parent a6a83286b9
commit 723d1cffe2
8 changed files with 347 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -85,7 +85,7 @@ trait AccountServiceTrait
$fields = $this->validAssetFields;
}
if ($account->accountType->type === AccountType::ASSET && isset($data['account_role']) && 'ccAsset' === $data['account_role']) {
$fields = $this->validCCFields;
$fields = $this->validCCFields; // @codeCoverageIgnore
}
/** @var AccountMetaFactory $factory */
$factory = app(AccountMetaFactory::class);
@@ -96,10 +96,10 @@ trait AccountServiceTrait
// convert boolean value:
if (is_bool($data[$field]) && false === $data[$field]) {
$data[$field] = 0;
$data[$field] = 0; // @codeCoverageIgnore
}
if (is_bool($data[$field]) && true === $data[$field]) {
$data[$field] = 1;
$data[$field] = 1; // @codeCoverageIgnore
}
$factory->crud($account, $field, (string)$data[$field]);
@@ -150,7 +150,7 @@ trait AccountServiceTrait
{
$data['opening_balance'] = (string)($data['opening_balance'] ?? '');
if ('' !== $data['opening_balance'] && 0 === bccomp($data['opening_balance'], '0')) {
$data['opening_balance'] = '';
$data['opening_balance'] = ''; // @codeCoverageIgnore
}
if ('' !== $data['opening_balance'] && isset($data['opening_balance'], $data['opening_balance_date'])) {
Log::debug('Array has valid opening balance data.');
@@ -171,12 +171,18 @@ trait AccountServiceTrait
*/
public function isEmptyOBData(array $data): bool
{
if (!isset($data['opening_balance']) && !isset($data['opening_balance_date'])) {
if (!array_key_exists('opening_balance', $data) &&
!array_key_exists('opening_balance_date', $data)
) {
// not set, so false.
return false;
}
// if isset, but is empty:
if ('' === $data['opening_balance'] && '' === $data['opening_balance_date']) {
if (
(array_key_exists('opening_balance', $data) && '' === $data['opening_balance'])
||
(array_key_exists('opening_balance_date', $data) && '' === $data['opening_balance_date'])
) {
return true;
}
@@ -211,9 +217,11 @@ trait AccountServiceTrait
$sourceId = $account->id;
}
if (0 === bccomp($amount, '0')) {
// @codeCoverageIgnoreStart
Log::debug('Amount is zero, so will not make an OB group.');
return null;
// @codeCoverageIgnoreEnd
}
$amount = app('steam')->positive($amount);
$submission = [
@@ -327,7 +335,6 @@ trait AccountServiceTrait
* @param array $data
*
* @return TransactionGroup|null
* @codeCoverageIgnore
*/
protected function updateOBGroup(Account $account, array $data): ?TransactionGroup
{