kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-19 04:49:30 +00:00
Code Issues 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

11
app/Import/Storage/ImportStorage.php
View File

@@ -22,7 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Import\Storage;
use ErrorException;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionJournalFactory;
@@ -160,7 +159,7 @@ class ImportStorage
try {
$this->storeImportJournal($index, $importJournal);
$this->addStep();
} catch (FireflyException | ErrorException | Exception $e) {
} catch (Exception $e) {
$this->errors->push($e->getMessage());
Log::error(sprintf('Cannot import row #%d because: %s', $index, $e->getMessage()));
Log::error($e->getTraceAsString());
@@ -239,7 +238,7 @@ class ImportStorage
'description' => $importJournal->getDescription(),
'piggy_bank_id' => null,
'piggy_bank_name' => null,
'bill_id' => is_null($bill) ? null : $bill->id,
'bill_id' => null === $bill ? null : $bill->id,
'bill_name' => null,
'tags' => $importJournal->tags,
'interest_date' => $importJournal->getMetaDate('interest_date'),
@@ -262,14 +261,14 @@ class ImportStorage
[
'description' => null,
'amount' => $amount,
'currency_id' => intval($currencyId),
'currency_id' => (int)$currencyId,
'currency_code' => null,
'foreign_amount' => $foreignAmount,
'foreign_currency_id' => $foreignCurrencyId,
'foreign_currency_code' => null,
'budget_id' => is_null($budget) ? null : $budget->id,
'budget_id' => null === $budget ? null : $budget->id,
'budget_name' => null,
'category_id' => is_null($category) ? null : $category->id,
'category_id' => null === $category ? null : $category->id,
'category_name' => null,
'source_id' => $source->id,
'source_name' => null,