Various code cleanup.

This commit is contained in:
James Cole
2017-02-17 06:42:36 +01:00
parent 1d979778e8
commit 5d0cdc4ffa
31 changed files with 168 additions and 169 deletions

View File

@@ -81,7 +81,7 @@ class CreateImport extends Command
/** @var ImportJobRepositoryInterface $jobRepository */
$jobRepository = app(ImportJobRepositoryInterface::class);
$jobRepository->setUser($user);
$job = $jobRepository->create($type);
$job = $jobRepository->create($type);
$this->line(sprintf('Created job "%s"...', $job->key));
Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]);

View File

@@ -84,21 +84,8 @@ class UpgradeFireflyInstructions extends Command
}
}
/**
* Show a line
*/
private function showLine()
private function installInstructions()
{
$line = '+';
for ($i = 0; $i < 78; $i++) {
$line .= '-';
}
$line .= '+';
$this->line($line);
}
private function installInstructions() {
/** @var string $version */
$version = config('firefly.version');
$config = config('upgrade.text.install');
@@ -120,6 +107,7 @@ class UpgradeFireflyInstructions extends Command
$this->boxed('Firefly III should be ready for use.');
$this->boxed('');
$this->showLine();
return;
}
@@ -129,6 +117,20 @@ class UpgradeFireflyInstructions extends Command
$this->showLine();
}
/**
* Show a line
*/
private function showLine()
{
$line = '+';
for ($i = 0; $i < 78; $i++) {
$line .= '-';
}
$line .= '+';
$this->line($line);
}
private function updateInstructions()
{
/** @var string $version */
@@ -152,6 +154,7 @@ class UpgradeFireflyInstructions extends Command
$this->boxed('Firefly III should be ready for use.');
$this->boxed('');
$this->showLine();
return;
}