X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=f0738b9172a8f5cbda8bea7bb8be553dd2d54fd4;hb=6fb06904ecde15b1b07d0a2af945338b416cf0e2;hp=e56ee4af012b5b0ac51970ecf7957b9e4f6606ea;hpb=41e79f97924ca0fe19d4269dbdf94502aa387abb;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index e56ee4af..f0738b91 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,12 +2,14 @@
namespace Wallabag\CoreBundle\Command;
+use FOS\UserBundle\Event\UserEvent;
+use FOS\UserBundle\FOSUserEvents;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\BufferedOutput;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\Console\Question\Question;
@@ -38,7 +40,7 @@ class InstallCommand extends ContainerAwareCommand
{
$this
->setName('wallabag:install')
- ->setDescription('Wallabag installer.')
+ ->setDescription('wallabag installer.')
->addOption(
'reset',
null,
@@ -53,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
$this->defaultInput = $input;
$this->defaultOutput = $output;
- $output->writeln('Installing Wallabag...');
+ $output->writeln('Installing wallabag...');
$output->writeln('');
$this
@@ -61,20 +63,22 @@ class InstallCommand extends ContainerAwareCommand
->setupDatabase()
->setupAdmin()
->setupConfig()
- ->setupAsset()
;
- $output->writeln('Wallabag has been successfully installed.');
+ $output->writeln('wallabag has been successfully installed.');
$output->writeln('Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000');
}
protected function checkRequirements()
{
- $this->defaultOutput->writeln('Step 1 of 5. Checking system requirements.');
+ $this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
+ $doctrineManager = $this->getContainer()->get('doctrine')->getManager();
- $fulfilled = true;
+ $rows = [];
- $label = 'PDO Driver';
+ // testing if database driver exists
+ $fulfilled = true;
+ $label = 'PDO Driver (%s)';
$status = 'OK!';
$help = '';
@@ -84,7 +88,58 @@ class InstallCommand extends ContainerAwareCommand
$help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
}
- $rows = [];
+ $rows[] = [sprintf($label, $this->getContainer()->getParameter('database_driver')), $status, $help];
+
+ // testing if connection to the database can be etablished
+ $label = 'Database connection';
+ $status = 'OK!';
+ $help = '';
+
+ try {
+ $conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
+ $conn->connect();
+ } catch (\Exception $e) {
+ if (false === strpos($e->getMessage(), 'Unknown database')
+ && false === strpos($e->getMessage(), 'database "'.$this->getContainer()->getParameter('database_name').'" does not exist')) {
+ $fulfilled = false;
+ $status = 'ERROR!';
+ $help = 'Can\'t connect to the database: '.$e->getMessage();
+ }
+ }
+
+ $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() && 'mysql' === $conn->getDatabasePlatform()->getName()) {
+ $version = $conn->query('select version()')->fetchColumn();
+ $minimalVersion = '5.5.4';
+
+ if (false === version_compare($version, $minimalVersion, '>')) {
+ $fulfilled = false;
+ $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) {
@@ -111,7 +166,7 @@ class InstallCommand extends ContainerAwareCommand
throw new \RuntimeException('Some system requirements are not fulfilled. Please check output messages and fix them.');
}
- $this->defaultOutput->writeln('Success! Your system can run Wallabag properly.');
+ $this->defaultOutput->writeln('Success! Your system can run wallabag properly.');
$this->defaultOutput->writeln('');
@@ -120,7 +175,7 @@ class InstallCommand extends ContainerAwareCommand
protected function setupDatabase()
{
- $this->defaultOutput->writeln('Step 2 of 5. Setting up database.');
+ $this->defaultOutput->writeln('Step 2 of 4. Setting up database.');
// user want to reset everything? Don't care about what is already here
if (true === $this->defaultInput->getOption('reset')) {
@@ -191,7 +246,7 @@ class InstallCommand extends ContainerAwareCommand
protected function setupAdmin()
{
- $this->defaultOutput->writeln('Step 3 of 5. Administration setup.');
+ $this->defaultOutput->writeln('Step 3 of 4. Administration setup.');
$questionHelper = $this->getHelperSet()->get('question');
$question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -219,14 +274,9 @@ class InstallCommand extends ContainerAwareCommand
$em->persist($user);
- $config = new Config($user);
- $config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
- $config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
- $config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
- $config->setReadingSpeed($this->getContainer()->getParameter('wallabag_core.reading_speed'));
- $config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
-
- $em->persist($config);
+ // dispatch a created event so the associated config will be created
+ $event = new UserEvent($user);
+ $this->getContainer()->get('event_dispatcher')->dispatch(FOSUserEvents::USER_CREATED, $event);
$this->defaultOutput->writeln('');
@@ -235,13 +285,18 @@ class InstallCommand extends ContainerAwareCommand
protected function setupConfig()
{
- $this->defaultOutput->writeln('Step 4 of 5. Config setup.');
+ $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' => 'share_public',
+ 'value' => '1',
+ 'section' => 'entry',
+ ],
[
'name' => 'carrot',
'value' => '1',
@@ -257,6 +312,16 @@ class InstallCommand extends ContainerAwareCommand
'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',
@@ -313,8 +378,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',
],
[
@@ -329,7 +399,7 @@ class InstallCommand extends ContainerAwareCommand
],
[
'name' => 'wallabag_url',
- 'value' => 'http://v2.wallabag.org',
+ 'value' => '',
'section' => 'misc',
],
[
@@ -339,7 +409,7 @@ class InstallCommand extends ContainerAwareCommand
],
[
'name' => 'piwik_host',
- 'value' => 'http://v2.wallabag.org',
+ 'value' => 'v2.wallabag.org',
'section' => 'analytics',
],
[
@@ -357,6 +427,16 @@ class InstallCommand extends ContainerAwareCommand
'value' => 'wallabag',
'section' => 'misc',
],
+ [
+ 'name' => 'download_images_enabled',
+ 'value' => '0',
+ 'section' => 'misc',
+ ],
+ [
+ 'name' => 'restricted_access',
+ 'value' => '0',
+ 'section' => 'entry',
+ ],
];
foreach ($settings as $setting) {
@@ -374,20 +454,6 @@ class InstallCommand extends ContainerAwareCommand
return $this;
}
- protected function setupAsset()
- {
- $this->defaultOutput->writeln('Step 5 of 5. Installing assets.');
-
- $this
- ->runCommand('assets:install')
- ->runCommand('assetic:dump')
- ;
-
- $this->defaultOutput->writeln('');
-
- return $this;
- }
-
/**
* Run a command.
*
@@ -410,16 +476,18 @@ class InstallCommand extends ContainerAwareCommand
}
$this->getApplication()->setAutoExit(false);
- $exitCode = $this->getApplication()->run(new ArrayInput($parameters), new NullOutput());
+
+ $output = new BufferedOutput();
+ $exitCode = $this->getApplication()->run(new ArrayInput($parameters), $output);
if (0 !== $exitCode) {
$this->getApplication()->setAutoExit(true);
- $errorMessage = sprintf('The command "%s" terminated with an error code: %u.', $command, $exitCode);
- $this->defaultOutput->writeln("$errorMessage");
- $exception = new \Exception($errorMessage, $exitCode);
+ $this->defaultOutput->writeln('');
+ $this->defaultOutput->writeln('The command "'.$command.'" generates some errors: ');
+ $this->defaultOutput->writeln($output->fetch());
- throw $exception;
+ die();
}
// PDO does not always close the connection after Doctrine commands.
@@ -456,7 +524,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'])) {
@@ -468,7 +536,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;