X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=0f119377fe54d041a73e8df2ec4407628c28695d;hb=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;hp=c7e714af2aa8b213cf6ef2d71b9f8bb4b7847a4a;hpb=644b340178136ef9465fdc3cf40f1de0f5f8c3d3;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index c7e714af..0f119377 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -63,6 +63,7 @@ class InstallCommand extends ContainerAwareCommand
->setupDatabase()
->setupAdmin()
->setupConfig()
+ ->runMigrations()
;
$output->writeln('wallabag has been successfully installed.');
@@ -71,7 +72,8 @@ 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.');
+ $doctrineManager = $this->getContainer()->get('doctrine')->getManager();
$rows = [];
@@ -108,21 +110,39 @@ class InstallCommand extends ContainerAwareCommand
$rows[] = [$label, $status, $help];
+ // check MySQL & PostgreSQL version
+ $label = 'Database version';
+ $status = 'OK!';
+ $help = '';
+
// now check if MySQL isn't too old to handle utf8mb4
- if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
+ if ($conn->isConnected() && 'mysql' === $conn->getDatabasePlatform()->getName()) {
$version = $conn->query('select version()')->fetchColumn();
$minimalVersion = '5.5.4';
if (false === version_compare($version, $minimalVersion, '>')) {
$fulfilled = false;
- $rows[] = [
- 'Database version',
- 'ERROR!',
- 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).',
- ];
+ $status = 'ERROR!';
+ $help = 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).';
}
}
+ // testing if PostgreSQL > 9.1
+ if ($conn->isConnected() && 'postgresql' === $conn->getDatabasePlatform()->getName()) {
+ // return version should be like "PostgreSQL 9.5.4 on x86_64-apple-darwin15.6.0, compiled by Apple LLVM version 8.0.0 (clang-800.0.38), 64-bit"
+ $version = $doctrineManager->getConnection()->query('SELECT version();')->fetchColumn();
+
+ preg_match('/PostgreSQL ([0-9\.]+)/i', $version, $matches);
+
+ if (isset($matches[1]) & version_compare($matches[1], '9.2.0', '<')) {
+ $fulfilled = false;
+ $status = 'ERROR!';
+ $help = 'PostgreSQL should be greater than 9.1 (actual version: '.$matches[1].')';
+ }
+ }
+
+ $rows[] = [$label, $status, $help];
+
foreach ($this->functionExists as $functionRequired) {
$label = ''.$functionRequired.'';
$status = 'OK!';
@@ -156,11 +176,11 @@ 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->defaultOutput->writeln('Dropping database, creating database and schema, clearing the cache');
$this
->runCommand('doctrine:database:drop', ['--force' => true])
@@ -192,7 +212,7 @@ class InstallCommand extends ContainerAwareCommand
$question = new ConfirmationQuestion('It appears that your database already exists. Would you like to reset it? (y/N)', false);
if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
- $this->defaultOutput->writeln('Droping database, creating database and schema');
+ $this->defaultOutput->writeln('Dropping database, creating database and schema');
$this
->runCommand('doctrine:database:drop', ['--force' => true])
@@ -202,7 +222,7 @@ class InstallCommand extends ContainerAwareCommand
} elseif ($this->isSchemaPresent()) {
$question = new ConfirmationQuestion('Seems like your database contains schema. Do you want to reset it? (y/N)', false);
if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
- $this->defaultOutput->writeln('Droping schema and creating schema');
+ $this->defaultOutput->writeln('Dropping schema and creating schema');
$this
->runCommand('doctrine:schema:drop', ['--force' => true])
@@ -227,7 +247,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);
@@ -266,156 +286,13 @@ class InstallCommand extends ContainerAwareCommand
protected function setupConfig()
{
- $this->defaultOutput->writeln('Step 4 of 4. Config setup.');
+ $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' => 'share_public',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'carrot',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_diaspora',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'diaspora_url',
- 'value' => 'http://diasporapod.com',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_unmark',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'unmark_url',
- 'value' => 'https://unmark.it',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_shaarli',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'shaarli_url',
- 'value' => 'http://myshaarli.com',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_mail',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'share_twitter',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'export_epub',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_mobi',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_pdf',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_csv',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_json',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_txt',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'export_xml',
- 'value' => '1',
- 'section' => 'export',
- ],
- [
- 'name' => 'import_with_redis',
- 'value' => '0',
- 'section' => 'import',
- ],
- [
- 'name' => 'import_with_rabbitmq',
- 'value' => '0',
- 'section' => 'import',
- ],
- [
- 'name' => 'show_printlink',
- 'value' => '1',
- 'section' => 'entry',
- ],
- [
- 'name' => 'wallabag_support_url',
- 'value' => 'https://www.wallabag.org/pages/support.html',
- 'section' => 'misc',
- ],
- [
- 'name' => 'wallabag_url',
- 'value' => '',
- 'section' => 'misc',
- ],
- [
- 'name' => 'piwik_enabled',
- 'value' => '0',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'piwik_host',
- 'value' => 'v2.wallabag.org',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'piwik_site_id',
- 'value' => '1',
- 'section' => 'analytics',
- ],
- [
- 'name' => 'demo_mode_enabled',
- 'value' => '0',
- 'section' => 'misc',
- ],
- [
- 'name' => 'demo_mode_username',
- 'value' => 'wallabag',
- 'section' => 'misc',
- ],
- [
- 'name' => 'download_images_enabled',
- 'value' => '0',
- 'section' => 'misc',
- ],
- ];
-
- foreach ($settings as $setting) {
+ foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
$newSetting = new Setting();
$newSetting->setName($setting['name']);
$newSetting->setValue($setting['value']);
@@ -430,6 +307,14 @@ class InstallCommand extends ContainerAwareCommand
return $this;
}
+ protected function runMigrations()
+ {
+ $this->defaultOutput->writeln('Step 5 of 5. Run migrations.');
+
+ $this
+ ->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true]);
+ }
+
/**
* Run a command.
*
@@ -456,20 +341,18 @@ class InstallCommand extends ContainerAwareCommand
$output = new BufferedOutput();
$exitCode = $this->getApplication()->run(new ArrayInput($parameters), $output);
+ // PDO does not always close the connection after Doctrine commands.
+ // See https://github.com/symfony/symfony/issues/11750.
+ $this->getContainer()->get('doctrine')->getManager()->getConnection()->close();
+
if (0 !== $exitCode) {
$this->getApplication()->setAutoExit(true);
- $this->defaultOutput->writeln('');
- $this->defaultOutput->writeln('The command "'.$command.'" generates some errors: ');
- $this->defaultOutput->writeln($output->fetch());
-
- die();
+ throw new \RuntimeException(
+ 'The command "'.$command."\" generates some errors: \n\n"
+ .$output->fetch());
}
- // PDO does not always close the connection after Doctrine commands.
- // See https://github.com/symfony/symfony/issues/11750.
- $this->getContainer()->get('doctrine')->getManager()->getConnection()->close();
-
return $this;
}