X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=813ac720de0c9d53c4a42c35d7bc49a76f2d2d48;hb=ceebf13fe8803bd7ac7b64797ce75da82cebc261;hp=2e4a59dfdb92910d32e7d360eb837b493cc41584;hpb=c5dede84451571c9cad5d0145aac6d73731f3f26;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 2e4a59df..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,7 +70,7 @@ 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;
@@ -119,7 +120,7 @@ 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')) {
@@ -190,7 +191,7 @@ 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);
@@ -227,6 +228,16 @@ class InstallCommand extends ContainerAwareCommand
$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();
@@ -365,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')
@@ -457,7 +468,7 @@ class InstallCommand extends ContainerAwareCommand
try {
return in_array($databaseName, $schemaManager->listDatabases());
- } catch (\Doctrine\DBAL\Exception\ConnectionException $e) {
+ } catch (\Doctrine\DBAL\Exception\DriverException $e) {
// it means we weren't able to get database list, assume the database doesn't exist
return false;