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

Fix possible null pointer.

Browse Source
This commit is contained in:
James Cole
2018-03-30 22:40:20 +02:00
parent 08ff3d8ad0
commit 8f3e84df4d
16 changed files with 437 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Factory/TransactionCurrencyFactory.php
View File

@@ -24,6 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Factory;
use FireflyIII\Models\TransactionCurrency;
use Illuminate\Database\QueryException;
use Log;
/**
* Class TransactionCurrencyFactory
@@ -33,21 +35,26 @@ class TransactionCurrencyFactory
/**
* @param array $data
*
* @return TransactionCurrency
* @return TransactionCurrency|null
*/
public function create(array $data): TransactionCurrency
public function create(array $data): ?TransactionCurrency
{
/** @var TransactionCurrency $currency */
$currency = TransactionCurrency::create(
[
'name' => $data['name'],
'code' => $data['code'],
'symbol' => $data['symbol'],
'decimal_places' => $data['decimal_places'],
]
);
$result = null;
try {
/** @var TransactionCurrency $currency */
$result = TransactionCurrency::create(
[
'name' => $data['name'],
'code' => $data['code'],
'symbol' => $data['symbol'],
'decimal_places' => $data['decimal_places'],
]
);
} catch (QueryException $e) {
Log::error(sprintf('Could not create new currency: %s', $e->getMessage()));
}
return $currency;
return $result;
}
/**

7
app/Factory/TransactionJournalMetaFactory.php
View File

@@ -43,7 +43,7 @@ class TransactionJournalMetaFactory
$value = $data['data'];
/** @var TransactionJournalMeta $entry */
$entry = $data['journal']->transactionJournalMeta()->where('name', $data['name'])->first();
if (is_null($value) && !is_null($entry)) {
if (null === $value && null !== $entry) {
try {
$entry->delete();
} catch (Exception $e) { // @codeCoverageIgnore
@@ -56,9 +56,9 @@ class TransactionJournalMetaFactory
if ($data['data'] instanceof Carbon) {
$value = $data['data']->toW3cString();
}
if (strlen(strval($value)) === 0) {
if ((string)$value === '') {
// don't store blank strings.
if (!is_null($entry)) {
if (null !== $entry) {
try {
$entry->delete();
} catch (Exception $e) { // @codeCoverageIgnore
@@ -69,7 +69,6 @@ class TransactionJournalMetaFactory
return null;
}
if (null === $entry) {
$entry = new TransactionJournalMeta();
$entry->transactionJournal()->associate($data['journal']);