X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=3873d2d366762b88241874bb27415696b0b1cca3;hb=55345331c47ca6f389e38a842584c3062476601d;hp=e134ced52b2cc5116bb97c7f6dc01bc5895d002a;hpb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index e134ced5..3873d2d3 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -71,8 +71,10 @@ class InstallCommand extends ContainerAwareCommand
{
$this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
- $fulfilled = true;
+ $rows = [];
+ // testing if database driver exists
+ $fulfilled = true;
$label = 'PDO Driver';
$status = 'OK!';
$help = '';
@@ -83,7 +85,23 @@ class InstallCommand extends ContainerAwareCommand
$help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
}
- $rows = [];
+ $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[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
@@ -241,6 +259,11 @@ class InstallCommand extends ContainerAwareCommand
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
$settings = [
+ [
+ 'name' => 'share_public',
+ 'value' => '1',
+ 'section' => 'entry',
+ ],
[
'name' => 'carrot',
'value' => '1',
@@ -312,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',
],
[
@@ -441,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'])) {