X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=3873d2d366762b88241874bb27415696b0b1cca3;hb=32e95760f567e5849dd71aaba9aabb1ab56bcd0a;hp=2d73a9add8cafc66412a6da9ad1b2c61c4e62b69;hpb=cc8c2d315f6868201ff32cc4895844c800624a87;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 2d73a9ad..3873d2d3 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -60,7 +60,7 @@ class InstallCommand extends ContainerAwareCommand
->checkRequirements()
->setupDatabase()
->setupAdmin()
- ->setupAsset()
+ ->setupConfig()
;
$output->writeln('Wallabag has been successfully installed.');
@@ -71,28 +71,45 @@ class InstallCommand extends ContainerAwareCommand
{
$this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
+ $rows = [];
+
+ // testing if database driver exists
$fulfilled = true;
+ $label = 'PDO Driver';
+ $status = 'OK!';
+ $help = '';
- $label = 'PDO Drivers';
- if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
- $status = 'OK!';
- $help = '';
- } else {
+ 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[] = [$label, $status, $help];
+
+ // testing if connection to the database can be etablished
+ $label = 'Database connection';
+ $status = 'OK!';
+ $help = '';
+
+ try {
+ $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect();
+ } catch (\Exception $e) {
+ if (false === strpos($e->getMessage(), 'Unknown database')) {
+ $fulfilled = false;
+ $status = 'ERROR!';
+ $help = 'Can\'t connect to the database: '.$e->getMessage();
+ }
}
- $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';
@@ -228,12 +245,22 @@ class InstallCommand extends ContainerAwareCommand
$em->persist($config);
+ $this->defaultOutput->writeln('');
+
+ return $this;
+ }
+
+ protected function setupConfig()
+ {
+ $this->defaultOutput->writeln('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' => 'download_pictures',
+ 'name' => 'share_public',
'value' => '1',
'section' => 'entry',
],
@@ -308,8 +335,13 @@ class InstallCommand extends ContainerAwareCommand
'section' => 'export',
],
[
- 'name' => 'pocket_consumer_key',
- 'value' => null,
+ 'name' => 'import_with_redis',
+ 'value' => '0',
+ 'section' => 'import',
+ ],
+ [
+ 'name' => 'import_with_rabbitmq',
+ 'value' => '0',
'section' => 'import',
],
[
@@ -369,20 +401,6 @@ class InstallCommand extends ContainerAwareCommand
return $this;
}
- protected function setupAsset()
- {
- $this->defaultOutput->writeln('Step 4 of 4. Installing assets.');
-
- $this
- ->runCommand('assets:install')
- ->runCommand('assetic:dump')
- ;
-
- $this->defaultOutput->writeln('');
-
- return $this;
- }
-
/**
* Run a command.
*
@@ -451,7 +469,7 @@ class InstallCommand extends ContainerAwareCommand
}
// custom verification for sqlite, since `getListDatabasesSQL` doesn't work for sqlite
- if ('sqlite' == $schemaManager->getDatabasePlatform()->getName()) {
+ if ('sqlite' === $schemaManager->getDatabasePlatform()->getName()) {
$params = $this->getContainer()->get('doctrine.dbal.default_connection')->getParams();
if (isset($params['path']) && file_exists($params['path'])) {
@@ -461,7 +479,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;
+ }
}
/**