Various code cleanup.

This commit is contained in:
James Cole
2017-12-22 18:32:43 +01:00
parent f13a93348f
commit 8bd76d1ff0
188 changed files with 383 additions and 396 deletions

View File

@@ -75,7 +75,6 @@ class Initial implements ConfigurationInterface
'specifix' => [],
'delimiters' => $delimiters,
'specifics' => $specifics,
];
return $data;

View File

@@ -188,6 +188,7 @@ class Map implements ConfigurationInterface
/**
* @return bool
*
* @throws FireflyException
*/
private function getMappableColumns(): bool

View File

@@ -48,15 +48,16 @@ class Roles implements ConfigurationInterface
* Get the data necessary to show the configuration screen.
*
* @return array
*
* @throws \League\Csv\Exception
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getData(): array
{
$config = $this->job->configuration;
$content = $this->job->uploadFileContents();
$headers = [];
$offset = 0;
$config = $this->job->configuration;
$content = $this->job->uploadFileContents();
$headers = [];
$offset = 0;
// create CSV reader.
$reader = Reader::createFromString($content);
$reader->setDelimiter($config['delimiter']);

View File

@@ -107,11 +107,10 @@ class Upload implements ConfigurationInterface
$config['has-file-upload'] = $uploaded;
$repository->setConfiguration($this->job, $config);
if ($uploaded === false) {
if (false === $uploaded) {
$this->warning = 'No valid upload.';
}
return true;
}
}