X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=813ac720de0c9d53c4a42c35d7bc49a76f2d2d48;hb=ceebf13fe8803bd7ac7b64797ce75da82cebc261;hp=771b3c5a4070a82f71ad5f9f96cc918f898db42c;hpb=b60bff0c2a25b05399b53579e660abc41a7ba6d5;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 771b3c5a..813ac720 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -60,6 +60,7 @@ class InstallCommand extends ContainerAwareCommand
->checkRequirements()
->setupDatabase()
->setupAdmin()
+ ->setupConfig()
->setupAsset()
;
@@ -69,40 +70,40 @@ class InstallCommand extends ContainerAwareCommand
protected function checkRequirements()
{
- $this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
+ $this->defaultOutput->writeln('Step 1 of 5. Checking system requirements.');
$fulfilled = true;
- $label = 'PDO Drivers';
- if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
- $status = 'OK!';
- $help = '';
- } else {
+ $label = 'PDO Driver';
+ $status = 'OK!';
+ $help = '';
+
+ if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
+ $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
}
- $rows[] = array($label, $status, $help);
+ $rows = [];
+ $rows[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
$label = ''.$functionRequired.'';
+ $status = 'OK!';
+ $help = '';
- if (function_exists($functionRequired)) {
- $status = 'OK!';
- $help = '';
- } else {
+ if (!function_exists($functionRequired)) {
$fulfilled = false;
$status = 'ERROR!';
$help = 'You need the '.$functionRequired.' function activated';
}
- $rows[] = array($label, $status, $help);
+ $rows[] = [$label, $status, $help];
}
$table = new Table($this->defaultOutput);
$table
- ->setHeaders(array('Checked', 'Status', 'Recommendation'))
+ ->setHeaders(['Checked', 'Status', 'Recommendation'])
->setRows($rows)
->render();
@@ -119,14 +120,14 @@ class InstallCommand extends ContainerAwareCommand
protected function setupDatabase()
{
- $this->defaultOutput->writeln('Step 2 of 4. Setting up database.');
+ $this->defaultOutput->writeln('Step 2 of 5. 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('Droping database, creating database and schema, clearing the cache');
$this
- ->runCommand('doctrine:database:drop', array('--force' => true))
+ ->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
->runCommand('doctrine:schema:create')
->runCommand('cache:clear')
@@ -158,7 +159,7 @@ class InstallCommand extends ContainerAwareCommand
$this->defaultOutput->writeln('Droping database, creating database and schema');
$this
- ->runCommand('doctrine:database:drop', array('--force' => true))
+ ->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
->runCommand('doctrine:schema:create')
;
@@ -168,7 +169,7 @@ class InstallCommand extends ContainerAwareCommand
$this->defaultOutput->writeln('Droping schema and creating schema');
$this
- ->runCommand('doctrine:schema:drop', array('--force' => true))
+ ->runCommand('doctrine:schema:drop', ['--force' => true])
->runCommand('doctrine:schema:create')
;
}
@@ -190,10 +191,10 @@ class InstallCommand extends ContainerAwareCommand
protected function setupAdmin()
{
- $this->defaultOutput->writeln('Step 3 of 4. Administration setup.');
+ $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);
+ $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
return $this;
@@ -222,19 +223,25 @@ class InstallCommand extends ContainerAwareCommand
$config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
$config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
$config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
+ $config->setReadingSpeed($this->getContainer()->getParameter('wallabag_core.reading_speed'));
$config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
$em->persist($config);
+ $this->defaultOutput->writeln('');
+
+ return $this;
+ }
+
+ protected function setupConfig()
+ {
+ $this->defaultOutput->writeln('Step 4 of 5. Config setup.');
+ $em = $this->getContainer()->get('doctrine.orm.entity_manager');
+
// cleanup before insert new stuff
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
$settings = [
- [
- 'name' => 'download_pictures',
- 'value' => '1',
- 'section' => 'entry',
- ],
[
'name' => 'carrot',
'value' => '1',
@@ -369,7 +376,7 @@ class InstallCommand extends ContainerAwareCommand
protected function setupAsset()
{
- $this->defaultOutput->writeln('Step 4 of 4. Installing assets.');
+ $this->defaultOutput->writeln('Step 5 of 5. Installing assets.');
$this
->runCommand('assets:install')
@@ -387,19 +394,19 @@ class InstallCommand extends ContainerAwareCommand
* @param string $command
* @param array $parameters Parameters to this command (usually 'force' => true)
*/
- protected function runCommand($command, $parameters = array())
+ protected function runCommand($command, $parameters = [])
{
$parameters = array_merge(
- array('command' => $command),
+ ['command' => $command],
$parameters,
- array(
+ [
'--no-debug' => true,
'--env' => $this->defaultInput->getOption('env') ?: 'dev',
- )
+ ]
);
if ($this->defaultInput->getOption('no-interaction')) {
- $parameters = array_merge($parameters, array('--no-interaction' => true));
+ $parameters = array_merge($parameters, ['--no-interaction' => true]);
}
$this->getApplication()->setAutoExit(false);
@@ -459,7 +466,13 @@ class InstallCommand extends ContainerAwareCommand
return false;
}
- return in_array($databaseName, $schemaManager->listDatabases());
+ try {
+ return in_array($databaseName, $schemaManager->listDatabases());
+ } catch (\Doctrine\DBAL\Exception\DriverException $e) {
+ // it means we weren't able to get database list, assume the database doesn't exist
+
+ return false;
+ }
}
/**