X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=dec2bf9c15c7e6477a65b088a20fb3c6b3212c05;hb=ceff312db8354049d97c2a84889cd7f56d37fd99;hp=0d9364f6aa4fb30a2c629f033126e254dbb5d722;hpb=d181bd728565454ec53d960f321ed0a4c3bf26c8;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 0d9364f6..dec2bf9c 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,19 +2,17 @@
namespace Wallabag\CoreBundle\Command;
+use Craue\ConfigBundle\Entity\Setting;
use FOS\UserBundle\Event\UserEvent;
use FOS\UserBundle\FOSUserEvents;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\BufferedOutput;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\Console\Question\Question;
-use Wallabag\CoreBundle\Entity\Config;
-use Craue\ConfigBundle\Entity\Setting;
+use Symfony\Component\Console\Style\SymfonyStyle;
class InstallCommand extends ContainerAwareCommand
{
@@ -24,9 +22,9 @@ class InstallCommand extends ContainerAwareCommand
protected $defaultInput;
/**
- * @var OutputInterface
+ * @var SymfonyStyle
*/
- protected $defaultOutput;
+ protected $io;
/**
* @var array
@@ -53,26 +51,26 @@ class InstallCommand extends ContainerAwareCommand
protected function execute(InputInterface $input, OutputInterface $output)
{
$this->defaultInput = $input;
- $this->defaultOutput = $output;
- $output->writeln('Installing wallabag...');
- $output->writeln('');
+ $this->io = new SymfonyStyle($input, $output);
+
+ $this->io->title('Wallabag installer');
$this
->checkRequirements()
->setupDatabase()
->setupAdmin()
->setupConfig()
- ->runMigrations()
;
- $output->writeln('wallabag has been successfully installed.');
- $output->writeln('Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000');
+ $this->io->success('Wallabag has been successfully installed.');
+ $this->io->note('Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000');
}
protected function checkRequirements()
{
- $this->defaultOutput->writeln('Step 1 of 5. Checking system requirements.');
+ $this->io->section('Step 1 of 4: Checking system requirements.');
+
$doctrineManager = $this->getContainer()->get('doctrine')->getManager();
$rows = [];
@@ -86,7 +84,7 @@ class InstallCommand extends ContainerAwareCommand
if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
+ $help = 'Database driver "' . $this->getContainer()->getParameter('database_driver') . '" is not installed.';
}
$rows[] = [sprintf($label, $this->getContainer()->getParameter('database_driver')), $status, $help];
@@ -101,10 +99,10 @@ class InstallCommand extends ContainerAwareCommand
$conn->connect();
} catch (\Exception $e) {
if (false === strpos($e->getMessage(), 'Unknown database')
- && false === strpos($e->getMessage(), 'database "'.$this->getContainer()->getParameter('database_name').'" does not exist')) {
+ && false === strpos($e->getMessage(), 'database "' . $this->getContainer()->getParameter('database_name') . '" does not exist')) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Can\'t connect to the database: '.$e->getMessage();
+ $help = 'Can\'t connect to the database: ' . $e->getMessage();
}
}
@@ -123,7 +121,7 @@ class InstallCommand extends ContainerAwareCommand
if (false === version_compare($version, $minimalVersion, '>')) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).';
+ $help = 'Your MySQL version (' . $version . ') is too old, consider upgrading (' . $minimalVersion . '+).';
}
}
@@ -137,122 +135,110 @@ class InstallCommand extends ContainerAwareCommand
if (isset($matches[1]) & version_compare($matches[1], '9.2.0', '<')) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'PostgreSQL should be greater than 9.1 (actual version: '.$matches[1].')';
+ $help = 'PostgreSQL should be greater than 9.1 (actual version: ' . $matches[1] . ')';
}
}
$rows[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
- $label = ''.$functionRequired.'';
+ $label = '' . $functionRequired . '';
$status = 'OK!';
$help = '';
if (!function_exists($functionRequired)) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'You need the '.$functionRequired.' function activated';
+ $help = 'You need the ' . $functionRequired . ' function activated';
}
$rows[] = [$label, $status, $help];
}
- $table = new Table($this->defaultOutput);
- $table
- ->setHeaders(['Checked', 'Status', 'Recommendation'])
- ->setRows($rows)
- ->render();
+ $this->io->table(['Checked', 'Status', 'Recommendation'], $rows);
if (!$fulfilled) {
throw new \RuntimeException('Some system requirements are not fulfilled. Please check output messages and fix them.');
}
- $this->defaultOutput->writeln('Success! Your system can run wallabag properly.');
-
- $this->defaultOutput->writeln('');
+ $this->io->success('Success! Your system can run wallabag properly.');
return $this;
}
protected function setupDatabase()
{
- $this->defaultOutput->writeln('Step 2 of 5. Setting up database.');
+ $this->io->section('Step 2 of 4: Setting up database.');
// user want to reset everything? Don't care about what is already here
if (true === $this->defaultInput->getOption('reset')) {
- $this->defaultOutput->writeln('Dropping database, creating database and schema, clearing the cache');
+ $this->io->text('Dropping database, creating database and schema, clearing the cache');
$this
->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
- ->runCommand('doctrine:schema:create')
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true])
->runCommand('cache:clear')
;
- $this->defaultOutput->writeln('');
+ $this->io->newLine();
return $this;
}
if (!$this->isDatabasePresent()) {
- $this->defaultOutput->writeln('Creating database and schema, clearing the cache');
+ $this->io->text('Creating database and schema, clearing the cache');
$this
->runCommand('doctrine:database:create')
- ->runCommand('doctrine:schema:create')
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true])
->runCommand('cache:clear')
;
- $this->defaultOutput->writeln('');
+ $this->io->newLine();
return $this;
}
- $questionHelper = $this->getHelper('question');
- $question = new ConfirmationQuestion('It appears that your database already exists. Would you like to reset it? (y/N)', false);
-
- if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
- $this->defaultOutput->writeln('Dropping database, creating database and schema');
+ if ($this->io->confirm('It appears that your database already exists. Would you like to reset it?', false)) {
+ $this->io->text('Dropping database, creating database and schema...');
$this
->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
- ->runCommand('doctrine:schema:create')
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true])
;
} elseif ($this->isSchemaPresent()) {
- $question = new ConfirmationQuestion('Seems like your database contains schema. Do you want to reset it? (y/N)', false);
- if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
- $this->defaultOutput->writeln('Dropping schema and creating schema');
+ if ($this->io->confirm('Seems like your database contains schema. Do you want to reset it?', false)) {
+ $this->io->text('Dropping schema and creating schema...');
$this
->runCommand('doctrine:schema:drop', ['--force' => true])
- ->runCommand('doctrine:schema:create')
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true])
;
}
} else {
- $this->defaultOutput->writeln('Creating schema');
+ $this->io->text('Creating schema...');
$this
- ->runCommand('doctrine:schema:create')
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true])
;
}
- $this->defaultOutput->writeln('Clearing the cache');
+ $this->io->text('Clearing the cache...');
$this->runCommand('cache:clear');
- $this->defaultOutput->writeln('');
+ $this->io->newLine();
+ $this->io->text('Database successfully setup.');
return $this;
}
protected function setupAdmin()
{
- $this->defaultOutput->writeln('Step 3 of 5. Administration setup.');
-
- $questionHelper = $this->getHelperSet()->get('question');
- $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
+ $this->io->section('Step 3 of 4: Administration setup.');
- if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
+ if (!$this->io->confirm('Would you like to create a new admin user (recommended)?', true)) {
return $this;
}
@@ -261,14 +247,13 @@ class InstallCommand extends ContainerAwareCommand
$userManager = $this->getContainer()->get('fos_user.user_manager');
$user = $userManager->createUser();
- $question = new Question('Username (default: wallabag) :', 'wallabag');
- $user->setUsername($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+ $user->setUsername($this->io->ask('Username', 'wallabag'));
- $question = new Question('Password (default: wallabag) :', 'wallabag');
- $user->setPlainPassword($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+ $question = new Question('Password', 'wallabag');
+ $question->setHidden(true);
+ $user->setPlainPassword($this->io->askQuestion($question));
- $question = new Question('Email:', '');
- $user->setEmail($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+ $user->setEmail($this->io->ask('Email', ''));
$user->setEnabled(true);
$user->addRole('ROLE_SUPER_ADMIN');
@@ -279,178 +264,20 @@ class InstallCommand extends ContainerAwareCommand
$event = new UserEvent($user);
$this->getContainer()->get('event_dispatcher')->dispatch(FOSUserEvents::USER_CREATED, $event);
- $this->defaultOutput->writeln('');
+ $this->io->text('Administration successfully setup.');
return $this;
}
protected function setupConfig()
{
- $this->defaultOutput->writeln('Step 4 of 5. Config setup.');
+ $this->io->section('Step 4 of 4: Config setup.');
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
// cleanup before insert new stuff
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
- $settings = [
- [
- 'name' => 'share_public',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'carrot',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_diaspora',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'diaspora_url',
- 'value' => 'http://diasporapod.com',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_unmark',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'unmark_url',
- 'value' => 'https://unmark.it',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_shaarli',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'shaarli_url',
- 'value' => 'http://myshaarli.com',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_scuttle',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'scuttle_url',
- 'value' => 'http://scuttle.org',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_mail',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_twitter',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'export_epub',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_mobi',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_pdf',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_csv',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_json',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_txt',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_xml',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'import_with_redis',
- 'value' => '0',
- 'section' => 'import',
- ],
- [
- 'name' => 'import_with_rabbitmq',
- 'value' => '0',
- 'section' => 'import',
- ],
- [
- 'name' => 'show_printlink',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'wallabag_support_url',
- 'value' => 'https://www.wallabag.org/pages/support.html',
- 'section' => 'misc',
- ],
- [
- 'name' => 'wallabag_url',
- 'value' => '',
- 'section' => 'misc',
- ],
- [
- 'name' => 'piwik_enabled',
- 'value' => '0',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'piwik_host',
- 'value' => 'v2.wallabag.org',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'piwik_site_id',
- 'value' => '1',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'demo_mode_enabled',
- 'value' => '0',
- 'section' => 'misc',
- ],
- [
- 'name' => 'demo_mode_username',
- 'value' => 'wallabag',
- 'section' => 'misc',
- ],
- [
- 'name' => 'download_images_enabled',
- 'value' => '0',
- 'section' => 'misc',
- ],
- [
- 'name' => 'restricted_access',
- 'value' => '0',
- 'section' => 'entry',
- ],
- ];
-
- foreach ($settings as $setting) {
+ foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
$newSetting = new Setting();
$newSetting->setName($setting['name']);
$newSetting->setValue($setting['value']);
@@ -460,19 +287,11 @@ class InstallCommand extends ContainerAwareCommand
$em->flush();
- $this->defaultOutput->writeln('');
+ $this->io->text('Config successfully setup.');
return $this;
}
- protected function runMigrations()
- {
- $this->defaultOutput->writeln('Step 5 of 5. Run migrations.');
-
- $this
- ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true]);
- }
-
/**
* Run a command.
*
@@ -499,20 +318,18 @@ class InstallCommand extends ContainerAwareCommand
$output = new BufferedOutput();
$exitCode = $this->getApplication()->run(new ArrayInput($parameters), $output);
+ // PDO does not always close the connection after Doctrine commands.
+ // See https://github.com/symfony/symfony/issues/11750.
+ $this->getContainer()->get('doctrine')->getManager()->getConnection()->close();
+
if (0 !== $exitCode) {
$this->getApplication()->setAutoExit(true);
- $this->defaultOutput->writeln('');
- $this->defaultOutput->writeln('The command "'.$command.'" generates some errors: ');
- $this->defaultOutput->writeln($output->fetch());
-
- die();
+ throw new \RuntimeException(
+ 'The command "' . $command . "\" generates some errors: \n\n"
+ . $output->fetch());
}
- // PDO does not always close the connection after Doctrine commands.
- // See https://github.com/symfony/symfony/issues/11750.
- $this->getContainer()->get('doctrine')->getManager()->getConnection()->close();
-
return $this;
}
@@ -554,7 +371,7 @@ class InstallCommand extends ContainerAwareCommand
}
try {
- return in_array($databaseName, $schemaManager->listDatabases());
+ return in_array($databaseName, $schemaManager->listDatabases(), true);
} catch (\Doctrine\DBAL\Exception\DriverException $e) {
// it means we weren't able to get database list, assume the database doesn't exist