X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=c7e714af2aa8b213cf6ef2d71b9f8bb4b7847a4a;hb=8a9604aafe8b8c6ddde4e1be78189af5238588fb;hp=857a8b4cfb2abed26a449d8ee270b8a4b9a224ab;hpb=f3b637fbfee2fa9f66e53cbadd05e85771eece9d;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 857a8b4c..c7e714af 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -40,7 +40,7 @@ class InstallCommand extends ContainerAwareCommand
{
$this
->setName('wallabag:install')
- ->setDescription('Wallabag installer.')
+ ->setDescription('wallabag installer.')
->addOption(
'reset',
null,
@@ -55,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
$this->defaultInput = $input;
$this->defaultOutput = $output;
- $output->writeln('Installing Wallabag...');
+ $output->writeln('Installing wallabag...');
$output->writeln('');
$this
@@ -65,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');
}
@@ -77,7 +77,7 @@ class InstallCommand extends ContainerAwareCommand
// testing if database driver exists
$fulfilled = true;
- $label = 'PDO Driver';
+ $label = 'PDO Driver (%s)';
$status = 'OK!';
$help = '';
@@ -87,7 +87,7 @@ class InstallCommand extends ContainerAwareCommand
$help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
}
- $rows[] = [$label, $status, $help];
+ $rows[] = [sprintf($label, $this->getContainer()->getParameter('database_driver')), $status, $help];
// testing if connection to the database can be etablished
$label = 'Database connection';
@@ -95,7 +95,8 @@ class InstallCommand extends ContainerAwareCommand
$help = '';
try {
- $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect();
+ $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')) {
@@ -107,6 +108,21 @@ class InstallCommand extends ContainerAwareCommand
$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!';
@@ -131,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('');
@@ -277,6 +293,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',
@@ -354,7 +380,7 @@ class InstallCommand extends ContainerAwareCommand
],
[
'name' => 'wallabag_url',
- 'value' => 'http://v2.wallabag.org',
+ 'value' => '',
'section' => 'misc',
],
[
@@ -382,6 +408,11 @@ class InstallCommand extends ContainerAwareCommand
'value' => 'wallabag',
'section' => 'misc',
],
+ [
+ 'name' => 'download_images_enabled',
+ 'value' => '0',
+ 'section' => 'misc',
+ ],
];
foreach ($settings as $setting) {