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

Code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-06-06 21:23:00 +02:00
parent 20044427b4
commit 4a12d4d156
75 changed files with 319 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Support\Import\JobConfiguration\Bunq;
use FireflyIII\Models\ImportJob;
use Illuminate\Support\MessageBag;

104
app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php
View File

@@ -35,61 +35,12 @@ use Log;
*/
class ConfigureUploadHandler implements FileConfigurationInterface
{
/** @var ImportJob */
private $importJob;
/** @var ImportJobRepositoryInterface */
private $repository;
/** @var AccountRepositoryInterface */
private $accountRepos;
/**
* Get the data necessary to show the configuration screen.
*
* @return array
*/
public function getNextData(): array
{
$delimiters = [
',' => trans('form.csv_comma'),
';' => trans('form.csv_semicolon'),
'tab' => trans('form.csv_tab'),
];
$config = $this->importJob->configuration;
$config['date-format'] = $config['date-format'] ?? 'Ymd';
$specifics = [];
$this->repository->setConfiguration($this->importJob, $config);
// collect specifics.
foreach (config('csv.import_specifics') as $name => $className) {
$specifics[$name] = [
'name' => trans($className::getName()),
'description' => trans($className::getDescription()),
];
}
$data = [
'accounts' => [],
'delimiters' => $delimiters,
'specifics' => $specifics,
];
return $data;
}
/**
* @param ImportJob $importJob
*/
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($importJob->user);
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->accountRepos->setUser($importJob->user);
}
/** @var ImportJob */
private $importJob;
/** @var ImportJobRepositoryInterface */
private $repository;
/**
* Store data associated with current stage.
@@ -137,6 +88,40 @@ class ConfigureUploadHandler implements FileConfigurationInterface
return new MessageBag;
}
/**
* Get the data necessary to show the configuration screen.
*
* @return array
*/
public function getNextData(): array
{
$delimiters = [
',' => trans('form.csv_comma'),
';' => trans('form.csv_semicolon'),
'tab' => trans('form.csv_tab'),
];
$config = $this->importJob->configuration;
$config['date-format'] = $config['date-format'] ?? 'Ymd';
$specifics = [];
$this->repository->setConfiguration($this->importJob, $config);
// collect specifics.
foreach (config('csv.import_specifics') as $name => $className) {
$specifics[$name] = [
'name' => trans($className::getName()),
'description' => trans($className::getDescription()),
];
}
$data = [
'accounts' => [],
'delimiters' => $delimiters,
'specifics' => $specifics,
];
return $data;
}
/**
* @param array $data
*
@@ -159,4 +144,17 @@ class ConfigureUploadHandler implements FileConfigurationInterface
return $return;
}
/**
* @param ImportJob $importJob
*/
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($importJob->user);
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->accountRepos->setUser($importJob->user);
}
}

1
app/Support/Import/JobConfiguration/File/NewFileJobHandler.php
View File

@@ -80,6 +80,7 @@ class NewFileJobHandler implements FileConfigurationInterface
/**
*
* Get the data necessary to show the configuration screen.
*
* @codeCoverageIgnore
* @return array
*/

5
app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php
View File

@@ -26,12 +26,7 @@ namespace FireflyIII\Support\Import\JobConfiguration\Spectre;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Services\Spectre\Object\Customer;
use FireflyIII\Services\Spectre\Object\Login;
use FireflyIII\Services\Spectre\Object\Token;
use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
use FireflyIII\Services\Spectre\Request\ListCustomersRequest;
use FireflyIII\Services\Spectre\Request\NewCustomerRequest;
use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait;
use FireflyIII\Support\Import\Information\GetSpectreTokenTrait;
use Illuminate\Support\MessageBag;

1
app/Support/Import/Placeholder/ColumnValue.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Support\Import\Placeholder;
/**
* Class ColumnValue
*
* @codeCoverageIgnore
*/
class ColumnValue

2
app/Support/Import/Routine/File/CSVProcessor.php
View File

@@ -62,7 +62,7 @@ class CSVProcessor implements FileProcessorInterface
// validate mapped values:
/** @var MappedValuesValidator $validator */
$validator = app(MappedValuesValidator::class);
$validator = app(MappedValuesValidator::class);
$validator->setImportJob($this->importJob);
$mappedValues = $validator->validate($mappingConverger->getMappedValues());

1
app/Support/Import/Routine/File/FileProcessorInterface.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Support\Import\Routine\File;
use FireflyIII\Models\ImportJob;

1
app/Support/Import/Routine/File/LineReader.php
View File

@@ -164,6 +164,7 @@ class LineReader
} catch (\League\Csv\Exception $e) {
throw new FireflyException(sprintf('Cannot set delimiter: %s', $e->getMessage()));
}
// @codeCoverageIgnoreEnd
return $reader;