diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 877c9ab084..c41a0b9f93 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -424,7 +424,8 @@ class ImportController extends Controller $type = strtolower($job->file_type); // validate type: - $validTypes = array_keys('firefly.import_formats'); + $validTypes = array_keys(config('firefly.import_formats')); + if (in_array($type, $validTypes)) { /** @var SetupInterface $importer */ diff --git a/app/Import/Importer/CsvImporter.php b/app/Import/Importer/CsvImporter.php index f356c25e47..92087771c7 100644 --- a/app/Import/Importer/CsvImporter.php +++ b/app/Import/Importer/CsvImporter.php @@ -123,7 +123,7 @@ class CsvImporter implements ImporterInterface // find the role for this column: $role = $config['column-roles'][$rowIndex] ?? '_ignore'; $doMap = $config['column-do-mapping'][$rowIndex] ?? false; - $validConverters = array_keys('csv.import_roles'); + $validConverters = array_keys(config('csv.import_roles')); // throw error when not a valid converter. if (!in_array($role, $validConverters)) { diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 545d79e1e1..e1201a7782 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -361,7 +361,7 @@ class CsvSetup implements SetupInterface $reader = Reader::createFromString($content); $reader->setDelimiter($config['delimiter']); $results = $reader->fetch(); - $validSpecifics = array_keys('csv.import_specifics'); + $validSpecifics = array_keys(config('csv.import_specifics')); foreach ($results as $rowIndex => $row) {