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

Refactor code and fix tests.

Browse Source
This commit is contained in:
James Cole
2018-05-21 09:40:19 +02:00
parent 714b54ed06
commit ebf97f710f
16 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php
View File

@@ -40,7 +40,7 @@ use Log;
/**
* Class ConfigureMappingHandler
*/
class ConfigureMappingHandler implements ConfigurationInterface
class ConfigureMappingHandler implements FileConfigurationInterface
{
/** @var AttachmentHelperInterface */
private $attachments;

2
app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php
View File

@@ -39,7 +39,7 @@ use Log;
/**
* Class ConfigureRolesHandler
*/
class ConfigureRolesHandler implements ConfigurationInterface
class ConfigureRolesHandler implements FileConfigurationInterface
{
/** @var AttachmentHelperInterface */
private $attachments;

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

@@ -33,7 +33,7 @@ use Log;
/**
* Class ConfigureUploadHandler
*/
class ConfigureUploadHandler implements ConfigurationInterface
class ConfigureUploadHandler implements FileConfigurationInterface
{
/** @var ImportJob */
private $importJob;

4
app/Support/Import/JobConfiguration/File/ConfigurationInterface.php → app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php
View File

@@ -26,9 +26,9 @@ use FireflyIII\Models\ImportJob;
use Illuminate\Support\MessageBag;
/**
* Class ConfigurationInterface.
* Class FileConfigurationInterface.
*/
interface ConfigurationInterface
interface FileConfigurationInterface
{
/**
* Store data associated with current stage.

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

@@ -37,7 +37,7 @@ use Log;
/**
* Class NewFileJobHandler
*/
class NewFileJobHandler implements ConfigurationInterface
class NewFileJobHandler implements FileConfigurationInterface
{
/** @var AttachmentHelperInterface */
private $attachments;

5
app/Support/Import/JobConfiguration/Spectre/AuthenticatedConfigHandler.php → app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php
View File

@@ -28,7 +28,10 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use Illuminate\Support\MessageBag;
use Log;
class AuthenticatedConfigHandler implements SpectreJobConfig
/**
* Class AuthenticatedHandler
*/
class AuthenticatedHandler implements SpectreConfigurationInterface
{
/** @var ImportJob */
private $importJob;

4
app/Support/Import/JobConfiguration/Spectre/ChooseAccount.php → app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php
View File

@@ -38,10 +38,10 @@ use Illuminate\Support\MessageBag;
use Log;
/**
* Class ChooseAccount
* Class ChooseAccountsHandler
*
*/
class ChooseAccount implements SpectreJobConfig
class ChooseAccountsHandler implements SpectreConfigurationInterface
{
/** @var AccountRepositoryInterface */

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

@@ -40,7 +40,7 @@ use Log;
* Class ChooseLoginHandler
*
*/
class ChooseLoginHandler implements SpectreJobConfig
class ChooseLoginHandler implements SpectreConfigurationInterface
{
/** @var ImportJob */
private $importJob;
@@ -93,7 +93,7 @@ class ChooseLoginHandler implements SpectreJobConfig
$config['token'] = $token->toArray();
$this->repository->setConfiguration($this->importJob, $config);
// move job to correct stage to redirect to Spectre:
$this->repository->setStage($this->importJob, 'authenticate');
$this->repository->setStage($this->importJob, 'do-authenticate');
return new MessageBag;

2
app/Support/Import/JobConfiguration/Spectre/AuthenticateConfig.php → app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php
View File

@@ -38,7 +38,7 @@ use Log;
* Class AuthenticateConfig
*
*/
class AuthenticateConfig implements SpectreJobConfig
class DoAuthenticateHandler implements SpectreConfigurationInterface
{
/** @var ImportJob */
private $importJob;

2
app/Support/Import/JobConfiguration/Spectre/NewConfig.php → app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php
View File

@@ -31,7 +31,7 @@ use Illuminate\Support\MessageBag;
* Class NewConfig
*
*/
class NewConfig implements SpectreJobConfig
class NewSpectreJobHandler implements SpectreConfigurationInterface
{
/**

2
app/Support/Import/JobConfiguration/Spectre/SpectreJobConfig.php → app/Support/Import/JobConfiguration/Spectre/SpectreConfigurationInterface.php
View File

@@ -31,7 +31,7 @@ use Illuminate\Support\MessageBag;
* Interface SpectreJobConfig
*
*/
interface SpectreJobConfig
interface SpectreConfigurationInterface
{
/**
* Return true when this stage is complete.