kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-08-12 15:10:03 +02:00
parent 955306d877
commit 5c4d010bde
94 changed files with 106 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/EncryptFile.php
View File

@@ -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));

9
app/Console/Commands/Import.php
View File

@@ -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: