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

Clean up various code.

Browse Source
This commit is contained in:
James Cole
2018-07-22 12:52:07 +02:00
parent d193a6aec4
commit d4ba014a8a
14 changed files with 171 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Import/JobConfiguration/FakeJobConfiguration.php
View File

@@ -40,20 +40,22 @@ class FakeJobConfiguration implements JobConfigurationInterface
/**
* Returns true when the initial configuration for this job is complete.
* configuration array of job must have two values:
* 'artist' must be 'david bowie', case insensitive
* 'song' must be 'golden years', case insensitive.
* if stage is not "new", then album must be 'station to station'
*
* @return bool
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function configurationComplete(): bool
{
// configuration array of job must have two values:
// 'artist' must be 'david bowie', case insensitive
// 'song' must be 'golden years', case insensitive.
// if stage is not "new", then album must be 'station to station'
$config = $this->importJob->configuration;
if ($this->importJob->stage === 'new') {
return (isset($config['artist']) && 'david bowie' === strtolower($config['artist']))
&& (isset($config['song']) && 'golden years' === strtolower($config['song']))
&& isset($config['apply-rules']);
if ('new' === $this->importJob->stage) {
return
isset($config['artist'], $config['song'], $config['apply-rules'])
&& 'david bowie' === strtolower($config['artist'])
&& 'golden years' === strtolower($config['song']);
}
return isset($config['album']) && 'station to station' === strtolower($config['album']);
@@ -80,12 +82,12 @@ class FakeJobConfiguration implements JobConfigurationInterface
$configuration['artist'] = $artist;
}
if ($song === 'golden years') {
if ('golden years' === $song) {
// store song
$configuration['song'] = $song;
}
if ($album === 'station to station') {
if ('station to station' === $album) {
// store album
$configuration['album'] = $album;
}
@@ -96,8 +98,7 @@ class FakeJobConfiguration implements JobConfigurationInterface
$this->repository->setConfiguration($this->importJob, $configuration);
$messages = new MessageBag();
if (\count($configuration) !== 3) {
if (3 !== \count($configuration)) {
$messages->add('some_key', 'Ignore this error: ' . \count($configuration));
}
@@ -136,13 +137,13 @@ class FakeJobConfiguration implements JobConfigurationInterface
if (null === $applyRules) {
return 'import.fake.apply-rules';
}
if (strtolower($artist) !== 'david bowie') {
if ('david bowie' !== strtolower($artist)) {
return 'import.fake.enter-artist';
}
if (strtolower($song) !== 'golden years') {
if ('golden years' !== strtolower($song)) {
return 'import.fake.enter-song';
}
if (strtolower($album) !== 'station to station' && $this->importJob->stage !== 'new') {
if ('new' !== $this->importJob->stage && 'station to station' !== strtolower($album)) {
return 'import.fake.enter-album';
}

2
app/Import/JobConfiguration/FileJobConfiguration.php
View File

@@ -52,7 +52,7 @@ class FileJobConfiguration implements JobConfigurationInterface
*/
public function configurationComplete(): bool
{
return $this->importJob->stage === 'ready_to_run';
return 'ready_to_run' === $this->importJob->stage;
}
/**