X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=277f852422f6d14afea83df85bbd2023dae31cfd;hb=64a8781e453c40ff144d03405abe2dc1ccfacbe0;hp=e134ced52b2cc5116bb97c7f6dc01bc5895d002a;hpb=f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index e134ced5..277f8524 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
@@ -63,7 +65,7 @@ class InstallCommand extends ContainerAwareCommand
->setupConfig()
;
- $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');
}
@@ -71,9 +73,11 @@ class InstallCommand extends ContainerAwareCommand
{
$this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
- $fulfilled = true;
+ $rows = [];
- $label = 'PDO Driver';
+ // testing if database driver exists
+ $fulfilled = true;
+ $label = 'PDO Driver (%s)';
$status = 'OK!';
$help = '';
@@ -83,9 +87,42 @@ 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];
+ // now check if MySQL isn't too old to handle utf8mb4
+ if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
+ $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.'+).',
+ ];
+ }
+ }
+
foreach ($this->functionExists as $functionRequired) {
$label = ''.$functionRequired.'';
$status = 'OK!';
@@ -110,7 +147,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('');
@@ -218,14 +255,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('');
@@ -241,6 +273,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 +349,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',
],
[
@@ -338,7 +380,7 @@ class InstallCommand extends ContainerAwareCommand
],
[
'name' => 'piwik_host',
- 'value' => 'http://v2.wallabag.org',
+ 'value' => 'v2.wallabag.org',
'section' => 'analytics',
],
[
@@ -395,16 +437,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.
@@ -441,7 +485,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'])) {