X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=941cb8cdc2c3f86fc04c8a6a1a71ee31235c41c3;hb=619cc45359ead519b64129181a07e14160fbbfcb;hp=ac7583ea7f7d74770a9fca4761dd6ba207fa9f71;hpb=732c2ad8971f427ec196acfac53dad034cefdef4;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index ac7583ea..941cb8cd 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -3,13 +3,16 @@
namespace Wallabag\CoreBundle\Command;
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\Input\ArrayInput;
-use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\NullOutput;
-use Wallabag\CoreBundle\Entity\User;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\UserBundle\Entity\User;
class InstallCommand extends ContainerAwareCommand
{
@@ -85,17 +88,18 @@ class InstallCommand extends ContainerAwareCommand
}
$rows[] = array($label, $status, $help);
- $this->getHelper('table')
+ $table = new Table($this->defaultOutput);
+ $table
->setHeaders(array('Checked', 'Status', 'Recommendation'))
->setRows($rows)
- ->render($this->defaultOutput);
+ ->render();
if (!$fulfilled) {
throw new \RuntimeException('Some system requirements are not fulfilled. Please check output messages and fix them.');
- } else {
- $this->defaultOutput->writeln('Success! Your system can run Wallabag properly.');
}
+ $this->defaultOutput->writeln('Success! Your system can run Wallabag properly.');
+
$this->defaultOutput->writeln('');
return $this;
@@ -107,14 +111,17 @@ class InstallCommand extends ContainerAwareCommand
// user want to reset everything? Don't care about what is already here
if (true === $this->defaultInput->getOption('reset')) {
- $this->defaultOutput->writeln('Droping database, creating database and schema');
+ $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
$this
->runCommand('doctrine:database:drop', array('--force' => true))
->runCommand('doctrine:database:create')
->runCommand('doctrine:schema:create')
+ ->runCommand('cache:clear')
;
+ $this->defaultOutput->writeln('');
+
return $this;
}
@@ -127,12 +134,15 @@ class InstallCommand extends ContainerAwareCommand
->runCommand('cache:clear')
;
+ $this->defaultOutput->writeln('');
+
return $this;
}
- $dialog = $this->getHelper('dialog');
+ $questionHelper = $this->getHelper('question');
+ $question = new ConfirmationQuestion('It appears that your database already exists. Would you like to reset it? (y/N)', false);
- if ($dialog->askConfirmation($this->defaultOutput, '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('Droping database, creating database and schema');
$this
@@ -141,7 +151,8 @@ class InstallCommand extends ContainerAwareCommand
->runCommand('doctrine:schema:create')
;
} elseif ($this->isSchemaPresent()) {
- if ($dialog->askConfirmation($this->defaultOutput, 'Seems like your database contains schema. Do you want to reset it? (y/N) ', false)) {
+ $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('Droping schema and creating schema');
$this
@@ -160,17 +171,6 @@ class InstallCommand extends ContainerAwareCommand
$this->defaultOutput->writeln('Clearing the cache');
$this->runCommand('cache:clear');
- /*
- if ($this->getHelperSet()->get('dialog')->askConfirmation($this->defaultOutput, 'Load fixtures (Y/N)?', false)) {
- $doctrineConfig = $this->getContainer()->get('doctrine.orm.entity_manager')->getConnection()->getConfiguration();
- $logger = $doctrineConfig->getSQLLogger();
- // speed up fixture load
- $doctrineConfig->setSQLLogger(null);
- $this->runCommand('doctrine:fixtures:load');
- $doctrineConfig->setSQLLogger($logger);
- }
- */
-
$this->defaultOutput->writeln('');
return $this;
@@ -180,24 +180,35 @@ class InstallCommand extends ContainerAwareCommand
{
$this->defaultOutput->writeln('Step 3 of 4. Administration setup.');
- $dialog = $this->getHelperSet()->get('dialog');
+ $questionHelper = $this->getHelperSet()->get('question');
+ $question = new ConfirmationQuestion('Would you like to create a new user ? (y/N)', false);
- if (false === $dialog->askConfirmation($this->defaultOutput, 'Would you like to create a new user ? (y/N)', true)) {
+ if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
return $this;
}
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
- $user = new User();
- $user->setUsername($dialog->ask($this->defaultOutput, 'Username (default: wallabag) :', 'wallabag'));
- $user->setPassword($dialog->ask($this->defaultOutput, 'Password (default: wallabag) :', 'wallabag'));
- $user->setEmail($dialog->ask($this->defaultOutput, 'Email:', ''));
+ $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));
+
+ $question = new Question('Password (default: wallabag) :', 'wallabag');
+ $user->setPlainPassword($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+
+ $question = new Question('Email:', '');
+ $user->setEmail($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+
+ $user->setEnabled(true);
$em->persist($user);
$config = new Config($user);
$config->setTheme($this->getContainer()->getParameter('theme'));
$config->setItemsPerPage($this->getContainer()->getParameter('items_on_page'));
+ $config->setRssLimit($this->getContainer()->getParameter('rss_limit'));
$config->setLanguage($this->getContainer()->getParameter('language'));
$em->persist($config);
@@ -224,7 +235,7 @@ class InstallCommand extends ContainerAwareCommand
}
/**
- * Run a command
+ * Run a command.
*
* @param string $command
* @param array $parameters Parameters to this command (usually 'force' => true)
@@ -265,21 +276,28 @@ class InstallCommand extends ContainerAwareCommand
}
/**
- * Check if the database already exists
+ * Check if the database already exists.
*
- * @return boolean
+ * @return bool
*/
private function isDatabasePresent()
{
- $databaseName = $this->getContainer()->getParameter('database_name');
+ $connection = $this->getContainer()->get('doctrine')->getManager()->getConnection();
+ $databaseName = $connection->getDatabase();
try {
- $schemaManager = $this->getContainer()->get('doctrine')->getManager()->getConnection()->getSchemaManager();
+ $schemaManager = $connection->getSchemaManager();
} catch (\Exception $exception) {
+ // mysql & sqlite
if (false !== strpos($exception->getMessage(), sprintf("Unknown database '%s'", $databaseName))) {
return false;
}
+ // pgsql
+ if (false !== strpos($exception->getMessage(), sprintf('database "%s" does not exist', $databaseName))) {
+ return false;
+ }
+
throw $exception;
}
@@ -298,14 +316,15 @@ class InstallCommand extends ContainerAwareCommand
}
/**
- * Check if the schema is already created
+ * Check if the schema is already created.
+ * If we found at least oen table, it means the schema exists.
*
- * @return boolean
+ * @return bool
*/
private function isSchemaPresent()
{
$schemaManager = $this->getContainer()->get('doctrine')->getManager()->getConnection()->getSchemaManager();
- return $schemaManager->tablesExist(array('entry'));
+ return count($schemaManager->listTableNames()) > 0 ? true : false;
}
}