X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=8d08187a949562a73206b310aa2925797a629ea8;hb=0e8a0f77d0b643a884e6687bd9c463267852a970;hp=3c76545cd37c8411e6223ade425fe93ff965ae6e;hpb=2a1ceb67b4400f46f4d3067e887ff54aa906f0a2;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 3c76545c..8d08187a 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,7 +2,6 @@
namespace Wallabag\CoreBundle\Command;
-use Craue\ConfigBundle\Entity\Setting;
use FOS\UserBundle\Event\UserEvent;
use FOS\UserBundle\FOSUserEvents;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -13,6 +12,8 @@ use Symfony\Component\Console\Output\BufferedOutput;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
use Symfony\Component\Console\Style\SymfonyStyle;
+use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
+use Wallabag\CoreBundle\Entity\InternalSetting;
class InstallCommand extends ContainerAwareCommand
{
@@ -54,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
$this->io = new SymfonyStyle($input, $output);
- $this->io->title('Wallabag installer');
+ $this->io->title('wallabag installer');
$this
->checkRequirements()
@@ -63,7 +64,7 @@ class InstallCommand extends ContainerAwareCommand
->setupConfig()
;
- $this->io->success('Wallabag has been successfully installed.');
+ $this->io->success('wallabag has been successfully installed.');
$this->io->success('You can now configure your web server, see https://doc.wallabag.org');
}
@@ -94,8 +95,9 @@ class InstallCommand extends ContainerAwareCommand
$status = 'OK!';
$help = '';
+ $conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
+
try {
- $conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
$conn->connect();
} catch (\Exception $e) {
if (false === strpos($e->getMessage(), 'Unknown database')
@@ -253,7 +255,7 @@ class InstallCommand extends ContainerAwareCommand
$question->setHidden(true);
$user->setPlainPassword($this->io->askQuestion($question));
- $user->setEmail($this->io->ask('Email', ''));
+ $user->setEmail($this->io->ask('Email', 'wallabag@wallabag.io'));
$user->setEnabled(true);
$user->addRole('ROLE_SUPER_ADMIN');
@@ -275,16 +277,23 @@ class InstallCommand extends ContainerAwareCommand
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
// cleanup before insert new stuff
- $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
+ $em->createQuery('DELETE FROM WallabagCoreBundle:InternalSetting')->execute();
+ $em->createQuery('DELETE FROM WallabagCoreBundle:IgnoreOriginInstanceRule')->execute();
foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
- $newSetting = new Setting();
+ $newSetting = new InternalSetting();
$newSetting->setName($setting['name']);
$newSetting->setValue($setting['value']);
$newSetting->setSection($setting['section']);
$em->persist($newSetting);
}
+ foreach ($this->getContainer()->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
+ $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();
+ $newIgnoreOriginInstanceRule->setRule($ignore_origin_instance_rule['rule']);
+ $em->persist($newIgnoreOriginInstanceRule);
+ }
+
$em->flush();
$this->io->text('Config successfully setup.');
@@ -325,9 +334,7 @@ class InstallCommand extends ContainerAwareCommand
if (0 !== $exitCode) {
$this->getApplication()->setAutoExit(true);
- throw new \RuntimeException(
- 'The command "' . $command . "\" generates some errors: \n\n"
- . $output->fetch());
+ throw new \RuntimeException('The command "' . $command . "\" generates some errors: \n\n" . $output->fetch());
}
return $this;