gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-02 15:10:40 +02:00
parent fa7ab45a40
commit a3c34e6b3c
151 changed files with 802 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Import/Object/ImportJournal.php
View File

@@ -71,7 +71,7 @@ class ImportJournal
/** @var array */
private $amountDebit;
/** @var string */
private $convertedAmount = null;
private $convertedAmount;
/** @var string */
private $date = '';
/** @var string */
@@ -225,7 +225,7 @@ class ImportJournal
public function getMetaString(string $field): ?string
{
if (isset($this->metaFields[$field]) && strlen($this->metaFields[$field]) > 0) {
return strval($this->metaFields[$field]);
return (string)$this->metaFields[$field];
}
return null;
@@ -277,7 +277,7 @@ class ImportJournal
case 'sepa-country':
case 'sepa-ep':
case 'sepa-ci':
$value = trim(strval($array['value']));
$value = trim((string)$array['value']);
if (strlen($value) > 0) {
$this->metaFields[$array['role']] = $value;
}
@@ -448,17 +448,17 @@ class ImportJournal
{
$info = [];
$converterClass = '';
if (!is_null($this->amount)) {
if (null !== $this->amount) {
Log::debug('Amount value is not NULL, assume this is the correct value.');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amount['role'])));
$info = $this->amount;
}
if (!is_null($this->amountDebit)) {
if (null !== $this->amountDebit) {
Log::debug('Amount DEBIT value is not NULL, assume this is the correct value (overrules Amount).');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amountDebit['role'])));
$info = $this->amountDebit;
}
if (!is_null($this->amountCredit)) {
if (null !== $this->amountCredit) {
Log::debug('Amount CREDIT value is not NULL, assume this is the correct value (overrules Amount and AmountDebit).');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amountCredit['role'])));
$info = $this->amountCredit;