Some issues fixed for scrutiniser.

This commit is contained in:
James Cole
2016-09-25 08:20:17 +02:00
parent 9101d6a2c0
commit bb7c26b77c
4 changed files with 47 additions and 14 deletions

View File

@@ -416,17 +416,24 @@ class ImportController extends Controller
* @param ImportJob $job
*
* @return SetupInterface
* @throws FireflyException
*/
private function makeImporter(ImportJob $job): SetupInterface
{
// create proper importer (depends on job)
$type = $job->file_type;
$type = strtolower($job->file_type);
/** @var SetupInterface $importer */
$importer = app('FireflyIII\Import\Setup\\' . ucfirst($type) . 'Setup');
$importer->setJob($job);
// validate type:
$validTypes = array_keys('firefly.import_formats');
return $importer;
if (in_array($type, $validTypes)) {
/** @var SetupInterface $importer */
$importer = app('FireflyIII\Import\Setup\\' . ucfirst($type) . 'Setup');
$importer->setJob($job);
return $importer;
}
throw new FireflyException(sprintf('"%s" is not a valid file type', $type));
}