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

Construct FinTS via service container so it can be mocked

Browse Source
This commit is contained in:
Ben
2018-10-05 16:30:05 +02:00
parent 306e1081e3
commit aaff40c4ad
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
View File

@@ -59,7 +59,7 @@ class ChooseAccountHandler implements FinTSConfigurationInterface
$this->repository->setConfiguration($this->importJob, $config); $this->repository->setConfiguration($this->importJob, $config);
try { try {
$finTS = new FinTS($this->importJob->configuration); $finTS = app(FinTS::class, ['config' => $this->importJob->configuration]);
$finTS->getAccount($config['fints_account']); $finTS->getAccount($config['fints_account']);
} catch (FireflyException $e) { } catch (FireflyException $e) {
return new MessageBag([$e->getMessage()]); return new MessageBag([$e->getMessage()]);
@@ -78,7 +78,7 @@ class ChooseAccountHandler implements FinTSConfigurationInterface
*/ */
public function getNextData(): array public function getNextData(): array
{ {
$finTS = new FinTS($this->importJob->configuration); $finTS = app(FinTS::class, ['config' => $this->importJob->configuration]);
$finTSAccounts = $finTS->getAccounts(); $finTSAccounts = $finTS->getAccounts();
$finTSAccountsData = []; $finTSAccountsData = [];
foreach ($finTSAccounts as $account) { foreach ($finTSAccounts as $account) {

2
app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
View File

@@ -66,7 +66,7 @@ class NewFinTSJobHandler implements FinTSConfigurationInterface
return new MessageBag([trans('import.incomplete_fints_form')]); return new MessageBag([trans('import.incomplete_fints_form')]);
} }
$finTS = new FinTS($this->importJob->configuration); $finTS = app(FinTS::class, ['config' => $this->importJob->configuration]);
if (($checkConnection = $finTS->checkConnection()) !== true) { if (($checkConnection = $finTS->checkConnection()) !== true) {
return new MessageBag([trans('import.fints_connection_failed', ['originalError' => $checkConnection])]); return new MessageBag([trans('import.fints_connection_failed', ['originalError' => $checkConnection])]);
} }

2
app/Support/Import/Routine/FinTS/StageImportDataHandler.php
View File

@@ -54,7 +54,7 @@ class StageImportDataHandler
Log::debug('Now in StageImportDataHandler::run()'); Log::debug('Now in StageImportDataHandler::run()');
$localAccount = $this->accountRepository->find($this->importJob->configuration['local_account']); $localAccount = $this->accountRepository->find($this->importJob->configuration['local_account']);
$finTS = new FinTS($this->importJob->configuration); $finTS = app(FinTS::class, ['config' => $this->importJob->configuration]);
$fintTSAccount = $finTS->getAccount($this->importJob->configuration['fints_account']); $fintTSAccount = $finTS->getAccount($this->importJob->configuration['fints_account']);
$statementOfAccount = $finTS->getStatementOfAccount($fintTSAccount, new \DateTime($this->importJob->configuration['from_date']), new \DateTime($this->importJob->configuration['to_date'])); $statementOfAccount = $finTS->getStatementOfAccount($fintTSAccount, new \DateTime($this->importJob->configuration['from_date']), new \DateTime($this->importJob->configuration['to_date']));
$collection = []; $collection = [];