From 5c4d010bded0db2f6344985da9b06ca13cf28b3c Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 12 Aug 2016 15:10:03 +0200 Subject: [PATCH] Code cleanup. --- app/Console/Commands/EncryptFile.php | 2 +- app/Console/Commands/Import.php | 9 +- app/Crud/Account/AccountCrud.php | 4 +- app/Crud/Account/AccountCrudInterface.php | 2 +- app/Crud/Split/Journal.php | 2 +- app/Crud/Split/JournalInterface.php | 2 +- app/Export/Collector/AttachmentCollector.php | 4 +- app/Export/Collector/UploadCollector.php | 2 - app/Export/Entry/EntryAccount.php | 2 +- app/Export/Entry/EntryBill.php | 2 +- app/Export/Entry/EntryBudget.php | 2 +- app/Export/Entry/EntryCategory.php | 2 +- .../Events/BudgetLimitEventHandler.php | 2 +- app/Handlers/Events/UserSaveIpAddress.php | 2 +- .../Controllers/Admin/DomainController.php | 2 +- app/Http/Controllers/Admin/UserController.php | 4 +- app/Http/Controllers/ImportController.php | 7 +- .../Transaction/MassController.php | 2 +- .../Transaction/SplitController.php | 2 +- app/Http/Middleware/Range.php | 4 +- app/Http/Requests/SplitJournalFormRequest.php | 2 +- app/Http/breadcrumbs.php | 2 +- app/Import/Converter/AccountId.php | 2 +- app/Import/Converter/Amount.php | 2 +- app/Import/Converter/AssetAccountIban.php | 2 +- app/Import/Converter/AssetAccountName.php | 2 +- app/Import/Converter/AssetAccountNumber.php | 2 +- app/Import/Converter/BasicConverter.php | 2 +- app/Import/Converter/BillId.php | 2 +- app/Import/Converter/BillName.php | 2 +- app/Import/Converter/BudgetId.php | 2 +- app/Import/Converter/BudgetName.php | 2 +- app/Import/Converter/CategoryId.php | 2 +- app/Import/Converter/CategoryName.php | 2 +- app/Import/Converter/ConverterInterface.php | 2 +- app/Import/Converter/CurrencyCode.php | 2 +- app/Import/Converter/CurrencyId.php | 2 +- app/Import/Converter/CurrencyName.php | 2 +- app/Import/Converter/CurrencySymbol.php | 2 +- app/Import/Converter/Date.php | 2 +- app/Import/Converter/Description.php | 2 +- app/Import/Converter/ExternalId.php | 2 +- app/Import/Converter/INGDebetCredit.php | 2 +- app/Import/Converter/Ignore.php | 2 +- app/Import/Converter/OpposingAccountIban.php | 2 +- app/Import/Converter/OpposingAccountName.php | 2 +- .../Converter/OpposingAccountNumber.php | 2 +- app/Import/Converter/RabobankDebetCredit.php | 2 +- app/Import/Converter/SomeConverter.php | 31 --- app/Import/Converter/TagsComma.php | 2 +- app/Import/Converter/TagsSpace.php | 2 +- app/Import/ImportEntry.php | 22 +- app/Import/ImportResult.php | 2 +- app/Import/ImportStorage.php | 2 +- app/Import/ImportValidator.php | 2 +- app/Import/Importer/CsvImporter.php | 4 +- app/Import/Importer/ImporterInterface.php | 2 +- app/Import/Logging/CommandHandler.php | 2 +- app/Import/Mapper/AssetAccountIbans.php | 2 +- app/Import/Mapper/AssetAccounts.php | 2 +- app/Import/Mapper/Bills.php | 2 +- app/Import/Mapper/Budgets.php | 2 +- app/Import/Mapper/Categories.php | 2 +- app/Import/Mapper/OpposingAccountIbans.php | 2 +- app/Import/Mapper/OpposingAccounts.php | 2 +- app/Import/Mapper/Tags.php | 2 +- app/Import/Mapper/TransactionCurrencies.php | 2 +- .../PreProcessorInterface.php | 2 +- app/Import/MapperPreProcess/TagsComma.php | 2 +- app/Import/MapperPreProcess/TagsSpace.php | 2 +- app/Import/Role/Map.php | 2 +- app/Import/Role/Role.php | 2 +- app/Import/Setup/CsvSetup.php | 2 +- app/Import/Setup/SetupInterface.php | 2 +- app/Import/Specifics/AbnAmroDescription.php | 6 +- app/Import/Specifics/RabobankDescription.php | 6 +- app/Import/Specifics/SpecificInterface.php | 6 +- app/Models/ImportJob.php | 2 +- app/Providers/CrudServiceProvider.php | 2 - .../Category/CategoryRepository.php | 6 - .../ImportJob/ImportJobRepository.php | 2 +- .../ImportJobRepositoryInterface.php | 2 +- app/Support/Models/TagSupport.php | 2 +- config/csv.php | 199 ------------------ .../2016_06_16_000002_create_main_tables.php | 1 - phpunit.xml | 0 resources/lang/en_US/csv.php | 2 +- resources/lang/fr_FR/csv.php | 2 +- resources/lang/nl_NL/csv.php | 2 +- resources/lang/pt_BR/csv.php | 2 +- resources/lang/zh-HK/csv.php | 2 +- resources/lang/zh-TW/csv.php | 2 +- resources/views/form/options.twig | 2 +- resources/views/piggy-banks/add-mobile.twig | 2 +- 94 files changed, 106 insertions(+), 363 deletions(-) delete mode 100644 app/Import/Converter/SomeConverter.php mode change 100755 => 100644 phpunit.xml diff --git a/app/Console/Commands/EncryptFile.php b/app/Console/Commands/EncryptFile.php index 3d68deacf5..25ebf9cf10 100644 --- a/app/Console/Commands/EncryptFile.php +++ b/app/Console/Commands/EncryptFile.php @@ -51,7 +51,7 @@ class EncryptFile extends Command */ public function handle() { - $file = $this->argument('file'); + $file = e($this->argument('file')); if (!file_exists($file)) { $this->error(sprintf('File "%s" does not seem to exist.', $file)); diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 7f92e063ab..3d70737e7e 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -19,7 +19,6 @@ use FireflyIII\Import\Logging\CommandHandler; use FireflyIII\Models\ImportJob; use Illuminate\Console\Command; use Log; -use Monolog\Handler\StreamHandler; /** * Class Import @@ -73,7 +72,11 @@ class Import extends Command } $this->line('Going to import job with key "' . $job->key . '" of type ' . $job->file_type); - $class = config('firefly.import_formats.' . $job->file_type); + $valid = array_keys(config('firefly.import_formats')); + $class = 'INVALID'; + if (in_array($job->file_type, $valid)) { + $class = config('firefly.import_formats.' . $job->file_type); + } /** @var ImporterInterface $importer */ $importer = app($class); @@ -98,7 +101,7 @@ class Import extends Command $cleaned = $validator->clean(); // then import collection: - $storage = new ImportStorage($collection); + $storage = new ImportStorage($cleaned); $storage->setUser($job->user); // and run store routine: diff --git a/app/Crud/Account/AccountCrud.php b/app/Crud/Account/AccountCrud.php index 552d7e0f5f..803f88f3c4 100644 --- a/app/Crud/Account/AccountCrud.php +++ b/app/Crud/Account/AccountCrud.php @@ -119,7 +119,7 @@ class AccountCrud implements AccountCrudInterface */ public function findByIban(string $iban, array $types): Account { - $query = $this->user->accounts()->where('iban', '!=', ""); + $query = $this->user->accounts()->where('iban', '!=', ''); if (count($types) > 0) { $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); @@ -538,4 +538,4 @@ class AccountCrud implements AccountCrudInterface return true; } -} \ No newline at end of file +} diff --git a/app/Crud/Account/AccountCrudInterface.php b/app/Crud/Account/AccountCrudInterface.php index 95e794418d..460f6628e6 100644 --- a/app/Crud/Account/AccountCrudInterface.php +++ b/app/Crud/Account/AccountCrudInterface.php @@ -106,4 +106,4 @@ interface AccountCrudInterface * @return Account */ public function updateAccountType(Account $account, string $type): Account; -} \ No newline at end of file +} diff --git a/app/Crud/Split/Journal.php b/app/Crud/Split/Journal.php index cbb4e34c35..94eda45c5b 100644 --- a/app/Crud/Split/Journal.php +++ b/app/Crud/Split/Journal.php @@ -213,4 +213,4 @@ class Journal implements JournalInterface } -} \ No newline at end of file +} diff --git a/app/Crud/Split/JournalInterface.php b/app/Crud/Split/JournalInterface.php index 81c852398d..15793101f2 100644 --- a/app/Crud/Split/JournalInterface.php +++ b/app/Crud/Split/JournalInterface.php @@ -44,4 +44,4 @@ interface JournalInterface * @return TransactionJournal */ public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal; -} \ No newline at end of file +} diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index 35a4a0ebb8..f3c9e83516 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -83,10 +83,10 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface /** @var TransactionJournal $journal */ $journal = $attachment->attachable; $args = [ - 'attachment_name' => $attachment->filename, + 'attachment_name' => e($attachment->filename), 'attachment_id' => $attachment->id, 'type' => strtolower($journal->transactionType->type), - 'description' => $journal->description, + 'description' => e($journal->description), 'journal_id' => $journal->id, 'date' => $journal->date->formatLocalized(strval(trans('config.month_and_day'))), 'amount' => Amount::formatJournal($journal, false), diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index 3841a52a9d..e161f89ece 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -45,8 +45,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface // make storage: $this->uploadDisk = Storage::disk('upload'); $this->exportDisk = Storage::disk('export'); - - // todo needs work for new importer (potentially collect other types as well) $this->expected = 'csv-upload-' . Auth::user()->id . '-'; } diff --git a/app/Export/Entry/EntryAccount.php b/app/Export/Entry/EntryAccount.php index 4a63c466a5..da23d80b68 100644 --- a/app/Export/Entry/EntryAccount.php +++ b/app/Export/Entry/EntryAccount.php @@ -44,4 +44,4 @@ class EntryAccount $this->type = $account->accountType->type; $this->number = $account->getMeta('accountNumber'); } -} \ No newline at end of file +} diff --git a/app/Export/Entry/EntryBill.php b/app/Export/Entry/EntryBill.php index 67d48af854..696fb58985 100644 --- a/app/Export/Entry/EntryBill.php +++ b/app/Export/Entry/EntryBill.php @@ -38,4 +38,4 @@ class EntryBill } } -} \ No newline at end of file +} diff --git a/app/Export/Entry/EntryBudget.php b/app/Export/Entry/EntryBudget.php index 730de35406..0ca9d38ae5 100644 --- a/app/Export/Entry/EntryBudget.php +++ b/app/Export/Entry/EntryBudget.php @@ -38,4 +38,4 @@ class EntryBudget } } -} \ No newline at end of file +} diff --git a/app/Export/Entry/EntryCategory.php b/app/Export/Entry/EntryCategory.php index 18d19f0642..8a8de50dfa 100644 --- a/app/Export/Entry/EntryCategory.php +++ b/app/Export/Entry/EntryCategory.php @@ -37,4 +37,4 @@ class EntryCategory $this->name = $category->name; } } -} \ No newline at end of file +} diff --git a/app/Handlers/Events/BudgetLimitEventHandler.php b/app/Handlers/Events/BudgetLimitEventHandler.php index 5fb0439b2f..d7eb7327c4 100644 --- a/app/Handlers/Events/BudgetLimitEventHandler.php +++ b/app/Handlers/Events/BudgetLimitEventHandler.php @@ -104,4 +104,4 @@ class BudgetLimitEventHandler } } -} \ No newline at end of file +} diff --git a/app/Handlers/Events/UserSaveIpAddress.php b/app/Handlers/Events/UserSaveIpAddress.php index 5b34ebc6da..7dcbf11394 100644 --- a/app/Handlers/Events/UserSaveIpAddress.php +++ b/app/Handlers/Events/UserSaveIpAddress.php @@ -59,4 +59,4 @@ class UserSaveIpAddress return true; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/DomainController.php b/app/Http/Controllers/Admin/DomainController.php index ce52f103ff..3c86f45708 100644 --- a/app/Http/Controllers/Admin/DomainController.php +++ b/app/Http/Controllers/Admin/DomainController.php @@ -133,4 +133,4 @@ class DomainController extends Controller return $filtered; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 08d4663e06..c55b586188 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -28,10 +28,12 @@ class UserController extends Controller /** * @param User $user + * + * @return int */ public function edit(User $user) { - + return $user->id; } diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index d216aa5eb1..bf1d796aa6 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -45,8 +45,7 @@ class ImportController extends Controller * * @param ImportJob $job * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws FireflyException + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ public function complete(ImportJob $job) { @@ -54,7 +53,6 @@ class ImportController extends Controller if (!$this->jobInCorrectStep($job, 'complete')) { return $this->redirectToCorrectStep($job); } - $importer = $this->makeImporter($job); $subTitle = trans('firefy.import_complete'); $subTitleIcon = 'fa-star'; @@ -305,14 +303,11 @@ class ImportController extends Controller case 'configure': case 'process': return $job->status === 'import_status_never_started'; - break; case 'settings': case 'store-settings': return $job->status === 'import_configuration_saved'; - break; case 'complete': return $job->status === 'settings_complete'; - break; } return false; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index c402817eaf..ec44c1ad11 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -230,4 +230,4 @@ class MassController extends Controller return redirect(session('transactions.mass-edit.url')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index ee63c6a2ed..43e3d2e821 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -358,4 +358,4 @@ class SplitController extends Controller return $return; } -} \ No newline at end of file +} diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 8470f1e38c..91e6f4b9aa 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -107,6 +107,8 @@ class Range $ranges['next'] = [$nextStart->format('Y-m-d'), $nextEnd->format('Y-m-d')]; switch ($viewRange) { + default: + throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); case '1D': $format = (string)trans('config.month_and_day'); break; @@ -122,8 +124,6 @@ class Range case '1M': $format = (string)trans('config.month'); break; - default: - throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); case '1W': $format = (string)trans('config.week_in_year'); break; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 67ff3b438b..2a333258e6 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -97,4 +97,4 @@ class SplitJournalFormRequest extends Request 'piggy_bank_id.*' => 'between:1,255', ]; } -} \ No newline at end of file +} diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index e977635219..381920a156 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -599,4 +599,4 @@ Breadcrumbs::register( $breadcrumbs->parent('transactions.index', $what); $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('split.journal.create', [$what])); } -); \ No newline at end of file +); diff --git a/app/Import/Converter/AccountId.php b/app/Import/Converter/AccountId.php index 7fd0b56cf2..1f07603f63 100644 --- a/app/Import/Converter/AccountId.php +++ b/app/Import/Converter/AccountId.php @@ -62,4 +62,4 @@ class AccountId extends BasicConverter implements ConverterInterface return new Account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php index 3b8db1f12f..1e071652c0 100644 --- a/app/Import/Converter/Amount.php +++ b/app/Import/Converter/Amount.php @@ -62,4 +62,4 @@ class Amount extends BasicConverter implements ConverterInterface return round(floatval($value), 4); } -} \ No newline at end of file +} diff --git a/app/Import/Converter/AssetAccountIban.php b/app/Import/Converter/AssetAccountIban.php index a22022db3b..97f1932e14 100644 --- a/app/Import/Converter/AssetAccountIban.php +++ b/app/Import/Converter/AssetAccountIban.php @@ -81,4 +81,4 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface return $account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/AssetAccountName.php b/app/Import/Converter/AssetAccountName.php index a8e7ef27a6..f20cd7b798 100644 --- a/app/Import/Converter/AssetAccountName.php +++ b/app/Import/Converter/AssetAccountName.php @@ -84,4 +84,4 @@ class AssetAccountName extends BasicConverter implements ConverterInterface } -} \ No newline at end of file +} diff --git a/app/Import/Converter/AssetAccountNumber.php b/app/Import/Converter/AssetAccountNumber.php index 241ebf0a3a..cbad7b39a5 100644 --- a/app/Import/Converter/AssetAccountNumber.php +++ b/app/Import/Converter/AssetAccountNumber.php @@ -90,4 +90,4 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface return $account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/BasicConverter.php b/app/Import/Converter/BasicConverter.php index d93590c81c..dbe7b56663 100644 --- a/app/Import/Converter/BasicConverter.php +++ b/app/Import/Converter/BasicConverter.php @@ -80,4 +80,4 @@ class BasicConverter { $this->user = $user; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/BillId.php b/app/Import/Converter/BillId.php index 74ccedc513..edb8817a10 100644 --- a/app/Import/Converter/BillId.php +++ b/app/Import/Converter/BillId.php @@ -70,4 +70,4 @@ class BillId extends BasicConverter implements ConverterInterface return new Bill; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/BillName.php b/app/Import/Converter/BillName.php index a159ab4a3a..2c9eb92f42 100644 --- a/app/Import/Converter/BillName.php +++ b/app/Import/Converter/BillName.php @@ -89,4 +89,4 @@ class BillName extends BasicConverter implements ConverterInterface } -} \ No newline at end of file +} diff --git a/app/Import/Converter/BudgetId.php b/app/Import/Converter/BudgetId.php index 7d18d58de4..aa6448cb89 100644 --- a/app/Import/Converter/BudgetId.php +++ b/app/Import/Converter/BudgetId.php @@ -69,4 +69,4 @@ class BudgetId extends BasicConverter implements ConverterInterface return new Budget; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/BudgetName.php b/app/Import/Converter/BudgetName.php index bee601b682..8611e7dd2e 100644 --- a/app/Import/Converter/BudgetName.php +++ b/app/Import/Converter/BudgetName.php @@ -72,4 +72,4 @@ class BudgetName extends BasicConverter implements ConverterInterface return $budget; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/CategoryId.php b/app/Import/Converter/CategoryId.php index 1a2d3fc45c..47e5d7f965 100644 --- a/app/Import/Converter/CategoryId.php +++ b/app/Import/Converter/CategoryId.php @@ -68,4 +68,4 @@ class CategoryId extends BasicConverter implements ConverterInterface return new Category; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/CategoryName.php b/app/Import/Converter/CategoryName.php index 8d09d271b8..383a1f907d 100644 --- a/app/Import/Converter/CategoryName.php +++ b/app/Import/Converter/CategoryName.php @@ -72,4 +72,4 @@ class CategoryName extends BasicConverter implements ConverterInterface return $category; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/ConverterInterface.php b/app/Import/Converter/ConverterInterface.php index ac127f1275..e474587a33 100644 --- a/app/Import/Converter/ConverterInterface.php +++ b/app/Import/Converter/ConverterInterface.php @@ -51,4 +51,4 @@ interface ConverterInterface * @param User $user */ public function setUser(User $user); -} \ No newline at end of file +} diff --git a/app/Import/Converter/CurrencyCode.php b/app/Import/Converter/CurrencyCode.php index 3e78e80d80..e49bea2e2f 100644 --- a/app/Import/Converter/CurrencyCode.php +++ b/app/Import/Converter/CurrencyCode.php @@ -63,4 +63,4 @@ class CurrencyCode extends BasicConverter implements ConverterInterface return $currency; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/CurrencyId.php b/app/Import/Converter/CurrencyId.php index 2dd402dafe..59b6e2e13f 100644 --- a/app/Import/Converter/CurrencyId.php +++ b/app/Import/Converter/CurrencyId.php @@ -67,4 +67,4 @@ class CurrencyId extends BasicConverter implements ConverterInterface return new TransactionCurrency; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/CurrencyName.php b/app/Import/Converter/CurrencyName.php index 7babdef1c4..e2976852a5 100644 --- a/app/Import/Converter/CurrencyName.php +++ b/app/Import/Converter/CurrencyName.php @@ -72,4 +72,4 @@ class CurrencyName extends BasicConverter implements ConverterInterface return $currency; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/CurrencySymbol.php b/app/Import/Converter/CurrencySymbol.php index 83b86dded2..2855f2bd48 100644 --- a/app/Import/Converter/CurrencySymbol.php +++ b/app/Import/Converter/CurrencySymbol.php @@ -72,4 +72,4 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface return $currency; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/Date.php b/app/Import/Converter/Date.php index e5ccc28e57..e873f9c128 100644 --- a/app/Import/Converter/Date.php +++ b/app/Import/Converter/Date.php @@ -46,4 +46,4 @@ class Date extends BasicConverter implements ConverterInterface $this->setCertainty(100); return $date; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/Description.php b/app/Import/Converter/Description.php index a8ce132873..d7a2cde245 100644 --- a/app/Import/Converter/Description.php +++ b/app/Import/Converter/Description.php @@ -34,4 +34,4 @@ class Description extends BasicConverter implements ConverterInterface return strval($value); } -} \ No newline at end of file +} diff --git a/app/Import/Converter/ExternalId.php b/app/Import/Converter/ExternalId.php index 272dc5b7d7..5f8c493fed 100644 --- a/app/Import/Converter/ExternalId.php +++ b/app/Import/Converter/ExternalId.php @@ -34,4 +34,4 @@ class ExternalId extends BasicConverter implements ConverterInterface return strval(trim($value)); } -} \ No newline at end of file +} diff --git a/app/Import/Converter/INGDebetCredit.php b/app/Import/Converter/INGDebetCredit.php index 378fad1130..2e3ca15dbd 100644 --- a/app/Import/Converter/INGDebetCredit.php +++ b/app/Import/Converter/INGDebetCredit.php @@ -42,4 +42,4 @@ class INGDebetCredit extends BasicConverter implements ConverterInterface return 1; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/Ignore.php b/app/Import/Converter/Ignore.php index 24a4895155..e96b5fabb1 100644 --- a/app/Import/Converter/Ignore.php +++ b/app/Import/Converter/Ignore.php @@ -29,4 +29,4 @@ class Ignore extends BasicConverter implements ConverterInterface return null; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/OpposingAccountIban.php b/app/Import/Converter/OpposingAccountIban.php index bf227412da..4fc2a1cc9d 100644 --- a/app/Import/Converter/OpposingAccountIban.php +++ b/app/Import/Converter/OpposingAccountIban.php @@ -73,4 +73,4 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface return $account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/OpposingAccountName.php b/app/Import/Converter/OpposingAccountName.php index 973a8b4da5..d5fe3fb7d6 100644 --- a/app/Import/Converter/OpposingAccountName.php +++ b/app/Import/Converter/OpposingAccountName.php @@ -82,4 +82,4 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface return $account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/OpposingAccountNumber.php b/app/Import/Converter/OpposingAccountNumber.php index cb97af5cf0..ede513646a 100644 --- a/app/Import/Converter/OpposingAccountNumber.php +++ b/app/Import/Converter/OpposingAccountNumber.php @@ -82,4 +82,4 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface return $account; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/RabobankDebetCredit.php b/app/Import/Converter/RabobankDebetCredit.php index 3908b3a062..2cd9e2ed98 100644 --- a/app/Import/Converter/RabobankDebetCredit.php +++ b/app/Import/Converter/RabobankDebetCredit.php @@ -42,4 +42,4 @@ class RabobankDebetCredit extends BasicConverter implements ConverterInterface return 1; } -} \ No newline at end of file +} diff --git a/app/Import/Converter/SomeConverter.php b/app/Import/Converter/SomeConverter.php deleted file mode 100644 index 3b6d3b31c1..0000000000 --- a/app/Import/Converter/SomeConverter.php +++ /dev/null @@ -1,31 +0,0 @@ -defaultImportAccount = new Account; /** @var string $value */ foreach ($this->validFields as $value) { $this->fields[$value] = null; @@ -63,21 +62,6 @@ class ImportEntry } } - /** - * @return ImportResult - */ - public function import(): ImportResult - { - - $validation = $this->validate(); - - if ($validation->valid()) { - return $this->doImport(); - } - - return $validation; - } - /** * @param string $role * @param int $certainty @@ -91,14 +75,11 @@ class ImportEntry default: Log::error('Import entry cannot handle object.', ['role' => $role]); throw new FireflyException('Import entry cannot handle object of type "' . $role . '".'); - break; - case 'amount': /* * Easy enough. */ $this->setFloat('amount', $convertedValue, $certainty); - $this->applyMultiplier('amount'); // if present. return; @@ -147,7 +128,7 @@ class ImportEntry case 'sepa-ct-id': case 'sepa-db': case 'sepa-ct-op': - case'description': + case 'description': $this->setAppendableString('description', $convertedValue); break; case '_ignore': @@ -160,6 +141,7 @@ class ImportEntry case 'tags-comma': case 'tags-space': $this->appendCollection('tags', $convertedValue); + break; case 'external-id': $this->externalID = $convertedValue; break; diff --git a/app/Import/ImportResult.php b/app/Import/ImportResult.php index e7be183e85..afc68bee82 100644 --- a/app/Import/ImportResult.php +++ b/app/Import/ImportResult.php @@ -165,4 +165,4 @@ class ImportResult } -} \ No newline at end of file +} diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index 0f2b45414b..b789363e8e 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -187,4 +187,4 @@ class ImportStorage } -} \ No newline at end of file +} diff --git a/app/Import/ImportValidator.php b/app/Import/ImportValidator.php index 596252a10c..af55598b53 100644 --- a/app/Import/ImportValidator.php +++ b/app/Import/ImportValidator.php @@ -386,4 +386,4 @@ class ImportValidator } -} \ No newline at end of file +} diff --git a/app/Import/Importer/CsvImporter.php b/app/Import/Importer/CsvImporter.php index ff9845dd5c..3ce6694247 100644 --- a/app/Import/Importer/CsvImporter.php +++ b/app/Import/Importer/CsvImporter.php @@ -86,6 +86,8 @@ class CsvImporter implements ImporterInterface // create import object. This is where each entry ends up. $object = new ImportEntry; + Log::debug(sprintf('Now at row %d', $index)); + // set some vars: $object->setUser($this->job->user); $config = $this->job->configuration; @@ -129,4 +131,4 @@ class CsvImporter implements ImporterInterface return $object; } -} \ No newline at end of file +} diff --git a/app/Import/Importer/ImporterInterface.php b/app/Import/Importer/ImporterInterface.php index 08fbb591fe..91dcbd3a7d 100644 --- a/app/Import/Importer/ImporterInterface.php +++ b/app/Import/Importer/ImporterInterface.php @@ -32,4 +32,4 @@ interface ImporterInterface * */ public function setJob(ImportJob $job); -} \ No newline at end of file +} diff --git a/app/Import/Logging/CommandHandler.php b/app/Import/Logging/CommandHandler.php index eeab715e22..c629a00e49 100644 --- a/app/Import/Logging/CommandHandler.php +++ b/app/Import/Logging/CommandHandler.php @@ -82,4 +82,4 @@ class CommandHandler extends AbstractProcessingHandler break; } } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index d3a4c246e6..8ff105ff76 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -53,4 +53,4 @@ class AssetAccountIbans implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php index fdf0a64daa..21e4007361 100644 --- a/app/Import/Mapper/AssetAccounts.php +++ b/app/Import/Mapper/AssetAccounts.php @@ -50,4 +50,4 @@ class AssetAccounts implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 0dcdc06f10..b1629d4865 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -43,4 +43,4 @@ class Bills implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php index a1b9c2edd8..fad817ed32 100644 --- a/app/Import/Mapper/Budgets.php +++ b/app/Import/Mapper/Budgets.php @@ -44,4 +44,4 @@ class Budgets implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php index 0f85392c8f..784e748848 100644 --- a/app/Import/Mapper/Categories.php +++ b/app/Import/Mapper/Categories.php @@ -44,4 +44,4 @@ class Categories implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index f788345483..2e1b7c8511 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -58,4 +58,4 @@ class OpposingAccountIbans implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php index 3f165e6a7a..37f67dccae 100644 --- a/app/Import/Mapper/OpposingAccounts.php +++ b/app/Import/Mapper/OpposingAccounts.php @@ -54,4 +54,4 @@ class OpposingAccounts implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php index 4f608f2146..f38d1e0f08 100644 --- a/app/Import/Mapper/Tags.php +++ b/app/Import/Mapper/Tags.php @@ -43,4 +43,4 @@ class Tags implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php index 6f21ebb355..ff6d4a1feb 100644 --- a/app/Import/Mapper/TransactionCurrencies.php +++ b/app/Import/Mapper/TransactionCurrencies.php @@ -39,4 +39,4 @@ class TransactionCurrencies implements MapperInterface return $list; } -} \ No newline at end of file +} diff --git a/app/Import/MapperPreProcess/PreProcessorInterface.php b/app/Import/MapperPreProcess/PreProcessorInterface.php index d577b90cc7..3f6187a1eb 100644 --- a/app/Import/MapperPreProcess/PreProcessorInterface.php +++ b/app/Import/MapperPreProcess/PreProcessorInterface.php @@ -25,4 +25,4 @@ interface PreProcessorInterface */ public function run(string $value): array; -} \ No newline at end of file +} diff --git a/app/Import/MapperPreProcess/TagsComma.php b/app/Import/MapperPreProcess/TagsComma.php index f9a45110db..19ec5f60a9 100644 --- a/app/Import/MapperPreProcess/TagsComma.php +++ b/app/Import/MapperPreProcess/TagsComma.php @@ -28,4 +28,4 @@ class TagsComma implements PreProcessorInterface { return explode(',', $value); } -} \ No newline at end of file +} diff --git a/app/Import/MapperPreProcess/TagsSpace.php b/app/Import/MapperPreProcess/TagsSpace.php index a3384de75a..c87108885d 100644 --- a/app/Import/MapperPreProcess/TagsSpace.php +++ b/app/Import/MapperPreProcess/TagsSpace.php @@ -27,4 +27,4 @@ class TagsSpace implements PreProcessorInterface { return explode(' ', $value); } -} \ No newline at end of file +} diff --git a/app/Import/Role/Map.php b/app/Import/Role/Map.php index ca5c173975..594578e97f 100644 --- a/app/Import/Role/Map.php +++ b/app/Import/Role/Map.php @@ -15,4 +15,4 @@ namespace FireflyIII\Import\Role; class Map { -} \ No newline at end of file +} diff --git a/app/Import/Role/Role.php b/app/Import/Role/Role.php index ec5246290c..a0781a18b7 100644 --- a/app/Import/Role/Role.php +++ b/app/Import/Role/Role.php @@ -15,4 +15,4 @@ namespace FireflyIII\Import\Role; class Role { -} \ No newline at end of file +} diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index cb656e37f5..9295183689 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -469,4 +469,4 @@ class CsvSetup implements SetupInterface } -} \ No newline at end of file +} diff --git a/app/Import/Setup/SetupInterface.php b/app/Import/Setup/SetupInterface.php index 9055c5f98e..b45c4337c0 100644 --- a/app/Import/Setup/SetupInterface.php +++ b/app/Import/Setup/SetupInterface.php @@ -82,4 +82,4 @@ interface SetupInterface * */ public function setJob(ImportJob $job); -} \ No newline at end of file +} diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index 33408e7c77..a98d36f728 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -29,7 +29,7 @@ class AbnAmroDescription implements SpecificInterface /** * @return string */ - static public function getDescription(): string + public static function getDescription(): string { return 'Fixes possible problems with ABN Amro descriptions.'; } @@ -37,7 +37,7 @@ class AbnAmroDescription implements SpecificInterface /** * @return string */ - static public function getName(): string + public static function getName(): string { return 'ABN Amro description'; } @@ -218,4 +218,4 @@ class AbnAmroDescription implements SpecificInterface } -} \ No newline at end of file +} diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 7372ba3dd0..75e074acb9 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -23,7 +23,7 @@ class RabobankDescription implements SpecificInterface /** * @return string */ - static public function getDescription(): string + public static function getDescription(): string { return 'Fixes possible problems with Rabobank descriptions.'; } @@ -31,7 +31,7 @@ class RabobankDescription implements SpecificInterface /** * @return string */ - static public function getName(): string + public static function getName(): string { return 'Rabobank description'; } @@ -61,4 +61,4 @@ class RabobankDescription implements SpecificInterface return $row; } -} \ No newline at end of file +} diff --git a/app/Import/Specifics/SpecificInterface.php b/app/Import/Specifics/SpecificInterface.php index 847e930af9..b3e0b7d7df 100644 --- a/app/Import/Specifics/SpecificInterface.php +++ b/app/Import/Specifics/SpecificInterface.php @@ -21,12 +21,12 @@ interface SpecificInterface /** * @return string */ - static public function getName(): string; + public static function getName(): string; /** * @return string */ - static public function getDescription(): string; + public static function getDescription(): string; /** * @param array $row @@ -35,4 +35,4 @@ interface SpecificInterface */ public function run(array $row): array; -} \ No newline at end of file +} diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 1f679e0d70..3b106bbbb2 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -28,7 +28,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $key * @property string $file_type * @property string $status - * @property string $configuration + * @property array $configuration * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereCreatedAt($value) diff --git a/app/Providers/CrudServiceProvider.php b/app/Providers/CrudServiceProvider.php index 815236b605..1eeacfa735 100644 --- a/app/Providers/CrudServiceProvider.php +++ b/app/Providers/CrudServiceProvider.php @@ -58,8 +58,6 @@ class CrudServiceProvider extends ServiceProvider if (!isset($arguments[0]) && !$app->auth->check()) { throw new FireflyException('There is no user present.'); } - // Log::debug('AccountCrud constructor, run with default arguments.', $arguments); - return app('FireflyIII\Crud\Account\AccountCrud', $arguments); } ); diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 380578e174..e0a662b355 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -444,12 +444,6 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function store(array $data): Category { - // TODO use validation, not this. - if (strlen($data['name']) > 200 || strlen($data['name']) === 0) { - - } - - $newCategory = Category::firstOrCreateEncrypted( [ 'user_id' => $data['user'], diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 15c02b5e60..8badf97189 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -78,4 +78,4 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $result; } -} \ No newline at end of file +} diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index 24cdd2aca9..3d6c46b94d 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -33,4 +33,4 @@ interface ImportJobRepositoryInterface * @return ImportJob */ public function findByKey(string $key): ImportJob; -} \ No newline at end of file +} diff --git a/app/Support/Models/TagSupport.php b/app/Support/Models/TagSupport.php index 5af0e7c8fc..a0decf17e4 100644 --- a/app/Support/Models/TagSupport.php +++ b/app/Support/Models/TagSupport.php @@ -88,4 +88,4 @@ class TagSupport extends Model } -} \ No newline at end of file +} diff --git a/config/csv.php b/config/csv.php index d4561c8a1a..5644b0f60f 100644 --- a/config/csv.php +++ b/config/csv.php @@ -276,203 +276,4 @@ return [ 'field' => 'description', ], ], - - - /* - - - 'specifix' => [ - 'RabobankDescription', - 'AbnAmroDescription', - 'Dummy' - ], - 'post_processors' => [ - 'Description', - 'Amount', - 'Currency', - 'Bill', - 'OpposingAccount', // must be after Amount! - 'AssetAccount', - - ], - 'roles' => [ - '_ignore' => [ - 'mappable' => false, - 'converter' => 'Ignore', - 'field' => 'ignored', - ], - 'bill-id' => [ - 'mappable' => false, - 'field' => 'bill', - 'converter' => 'BillId', - 'mapper' => 'Bill', - ], - 'bill-name' => [ - 'mappable' => true, - 'converter' => 'BillName', - 'field' => 'bill', - 'mapper' => 'Bill', - ], - 'currency-id' => [ - 'mappable' => true, - 'converter' => 'CurrencyId', - 'field' => 'currency', - 'mapper' => 'TransactionCurrency' - ], - 'currency-name' => [ - 'mappable' => true, - 'converter' => 'CurrencyName', - 'field' => 'currency', - 'mapper' => 'TransactionCurrency' - ], - 'currency-code' => [ - 'mappable' => true, - 'converter' => 'CurrencyCode', - 'field' => 'currency', - 'mapper' => 'TransactionCurrency' - ], - 'currency-symbol' => [ - 'mappable' => true, - 'converter' => 'CurrencySymbol', - 'field' => 'currency', - 'mapper' => 'TransactionCurrency' - ], - 'description' => [ - 'mappable' => false, - 'converter' => 'Description', - 'field' => 'description', - ], - 'date-transaction' => [ - 'mappable' => false, - 'converter' => 'Date', - 'field' => 'date', - ], - 'date-rent' => [ - 'mappable' => false, - 'converter' => 'Date', - 'field' => 'date-rent', - ], - 'budget-id' => [ - 'mappable' => true, - 'converter' => 'BudgetId', - 'field' => 'budget', - 'mapper' => 'Budget', - ], - 'budget-name' => [ - 'mappable' => true, - 'converter' => 'BudgetName', - 'field' => 'budget', - 'mapper' => 'Budget', - ], - 'rabo-debet-credit' => [ - 'mappable' => false, - 'converter' => 'RabobankDebetCredit', - 'field' => 'amount-modifier', - ], - 'ing-debet-credit' => [ - 'mappable' => false, - 'converter' => 'INGDebetCredit', - 'field' => 'amount-modifier', - ], - 'category-id' => [ - 'mappable' => true, - 'converter' => 'CategoryId', - 'field' => 'category', - 'mapper' => 'Category', - ], - 'category-name' => [ - 'mappable' => true, - 'converter' => 'CategoryName', - 'field' => 'category', - 'mapper' => 'Category', - ], - 'tags-comma' => [ - 'mappable' => true, - 'field' => 'tags', - 'converter' => 'TagsComma', - 'mapper' => 'Tag', - ], - 'tags-space' => [ - 'mappable' => true, - 'field' => 'tags', - 'converter' => 'TagsSpace', - 'mapper' => 'Tag', - ], - 'account-id' => [ - 'mappable' => true, - 'mapper' => 'AssetAccount', - 'field' => 'asset-account-id', - 'converter' => 'AccountId' - ], - 'account-name' => [ - 'mappable' => true, - 'mapper' => 'AssetAccount', - 'field' => 'asset-account-name', - 'converter' => 'AssetAccountName' - ], - 'account-iban' => [ - 'mappable' => true, - 'converter' => 'AssetAccountIban', - 'field' => 'asset-account-iban', - 'mapper' => 'AssetAccount' - ], - 'account-number' => [ - 'mappable' => true, - 'converter' => 'AssetAccountNumber', - 'field' => 'asset-account-number', - 'mapper' => 'AssetAccount' - ], - 'opposing-id' => [ - 'mappable' => true, - 'field' => 'opposing-account-id', - 'converter' => 'OpposingAccountId', - 'mapper' => 'AnyAccount', - ], - 'opposing-name' => [ - 'mappable' => true, - 'field' => 'opposing-account-name', - 'converter' => 'OpposingAccountName', - 'mapper' => 'AnyAccount', - ], - 'opposing-iban' => [ - 'mappable' => true, - 'field' => 'opposing-account-iban', - 'converter' => 'OpposingAccountIban', - 'mapper' => 'AnyAccount', - ], - 'opposing-number' => [ - 'mappable' => true, - 'field' => 'opposing-account-number', - 'converter' => 'OpposingAccountNumber', - 'mapper' => 'AnyAccount', - ], - 'amount' => [ - 'mappable' => false, - 'converter' => 'Amount', - 'field' => 'amount', - ], - 'amount-comma-separated' => [ - 'mappable' => false, - 'converter' => 'AmountComma', - 'field' => 'amount', - ], - 'sepa-ct-id' => [ - 'mappable' => false, - 'converter' => 'Description', - 'field' => 'description', - ], - 'sepa-ct-op' => [ - 'mappable' => false, - 'converter' => 'Description', - 'field' => 'description', - ], - 'sepa-db' => [ - 'mappable' => false, - 'converter' => 'Description', - 'field' => 'description', - ], - ] - - - */ ]; diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php index b46f633232..fb89335598 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -56,7 +56,6 @@ class CreateMainTables extends Migration $this->createBudgetTables(); $this->createCategoriesTable(); $this->createExportJobsTable(); - // $this->createImportJobsTable(); $this->createPreferencesTable(); $this->createRoleTable(); $this->createRuleTables(); diff --git a/phpunit.xml b/phpunit.xml old mode 100755 new mode 100644 diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php index 858026dad6..fef82823e3 100644 --- a/resources/lang/en_US/csv.php +++ b/resources/lang/en_US/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 858026dad6..fef82823e3 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index 5c87f2ee00..668cbb1748 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (spatiegescheiden)', 'column_account-number' => 'Betaalrekening (rekeningnummer)', 'column_opposing-number' => 'Tegenrekening (rekeningnummer)', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index 858026dad6..fef82823e3 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh-HK/csv.php b/resources/lang/zh-HK/csv.php index 858026dad6..fef82823e3 100644 --- a/resources/lang/zh-HK/csv.php +++ b/resources/lang/zh-HK/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh-TW/csv.php b/resources/lang/zh-TW/csv.php index 858026dad6..fef82823e3 100644 --- a/resources/lang/zh-TW/csv.php +++ b/resources/lang/zh-TW/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/views/form/options.twig b/resources/views/form/options.twig index 4692b300b8..83212c903b 100644 --- a/resources/views/form/options.twig +++ b/resources/views/form/options.twig @@ -45,4 +45,4 @@ -{% endif %} \ No newline at end of file +{% endif %} diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig index 3a4854efe3..ed169cd487 100644 --- a/resources/views/piggy-banks/add-mobile.twig +++ b/resources/views/piggy-banks/add-mobile.twig @@ -36,4 +36,4 @@ {{ Form.close|raw }} -{% endblock %} \ No newline at end of file +{% endblock %}