X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=813ac720de0c9d53c4a42c35d7bc49a76f2d2d48;hb=ceebf13fe8803bd7ac7b64797ce75da82cebc261;hp=2d73a9add8cafc66412a6da9ad1b2c61c4e62b69;hpb=ba2157b270095757eb5af8062df72ce16c497637;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 2d73a9ad..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,18 +70,18 @@ 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 = [];
@@ -88,11 +89,10 @@ class InstallCommand extends ContainerAwareCommand
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';
@@ -120,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')) {
@@ -191,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);
@@ -228,15 +228,20 @@ 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();
$settings = [
- [
- 'name' => 'download_pictures',
- 'value' => '1',
- 'section' => 'entry',
- ],
[
'name' => 'carrot',
'value' => '1',
@@ -371,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')
@@ -461,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;
+ }
}
/**