X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=cc7c2c94cf268be86cd4de51d895404a7d433ec2;hb=dfbbf0e18ad585e318c2609e46963e4b9fd198ef;hp=f1111cce650c24ac800c724abf3ed33f4bdcbc67;hpb=fc6020b2c8f133052b82dd49337fbb3f2f480ebf;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index f1111cce..cc7c2c94 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -2,6 +2,8 @@ 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; @@ -29,9 +31,9 @@ class InstallCommand extends ContainerAwareCommand /** * @var array */ - protected $requirements = [ - 'pcre', - 'DOM', + protected $functionExists = [ + 'curl_exec', + 'curl_multi_init', ]; protected function configure() @@ -60,7 +62,7 @@ class InstallCommand extends ContainerAwareCommand ->checkRequirements() ->setupDatabase() ->setupAdmin() - ->setupAsset() + ->setupConfig() ; $output->writeln('Wallabag has been successfully installed.'); @@ -71,24 +73,56 @@ class InstallCommand extends ContainerAwareCommand { $this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.'); + $rows = []; + + // testing if database driver exists $fulfilled = true; + $label = 'PDO Driver'; + $status = 'OK!'; + $help = ''; + + if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) { + $fulfilled = false; + $status = 'ERROR!'; + $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.'; + } + + $rows[] = [$label, $status, $help]; - foreach ($this->requirements as $requirement) { - $label = ''.strtoupper($requirement).''; - if (extension_loaded($requirement)) { - $status = 'OK!'; - $help = ''; - } else { + // testing if connection to the database can be etablished + $label = 'Database connection'; + $status = 'OK!'; + $help = ''; + + try { + $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect(); + } catch (\Exception $e) { + if (false === strpos($e->getMessage(), 'Unknown database')) { $fulfilled = false; $status = 'ERROR!'; - $help = 'You should enabled '.$requirement.' extension'; + $help = 'Can\'t connect to the database: '.$e->getMessage(); } - $rows[] = array($label, $status, $help); + } + + $rows[] = [$label, $status, $help]; + + foreach ($this->functionExists as $functionRequired) { + $label = ''.$functionRequired.''; + $status = 'OK!'; + $help = ''; + + if (!function_exists($functionRequired)) { + $fulfilled = false; + $status = 'ERROR!'; + $help = 'You need the '.$functionRequired.' function activated'; + } + + $rows[] = [$label, $status, $help]; } $table = new Table($this->defaultOutput); $table - ->setHeaders(array('Checked', 'Status', 'Recommendation')) + ->setHeaders(['Checked', 'Status', 'Recommendation']) ->setRows($rows) ->render(); @@ -112,7 +146,7 @@ class InstallCommand extends ContainerAwareCommand $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache'); $this - ->runCommand('doctrine:database:drop', array('--force' => true)) + ->runCommand('doctrine:database:drop', ['--force' => true]) ->runCommand('doctrine:database:create') ->runCommand('doctrine:schema:create') ->runCommand('cache:clear') @@ -144,7 +178,7 @@ class InstallCommand extends ContainerAwareCommand $this->defaultOutput->writeln('Droping database, creating database and schema'); $this - ->runCommand('doctrine:database:drop', array('--force' => true)) + ->runCommand('doctrine:database:drop', ['--force' => true]) ->runCommand('doctrine:database:create') ->runCommand('doctrine:schema:create') ; @@ -154,7 +188,7 @@ class InstallCommand extends ContainerAwareCommand $this->defaultOutput->writeln('Droping schema and creating schema'); $this - ->runCommand('doctrine:schema:drop', array('--force' => true)) + ->runCommand('doctrine:schema:drop', ['--force' => true]) ->runCommand('doctrine:schema:create') ; } @@ -179,7 +213,7 @@ class InstallCommand extends ContainerAwareCommand $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); + $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true); if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) { return $this; @@ -204,20 +238,26 @@ 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->setLanguage($this->getContainer()->getParameter('wallabag_core.language')); + // 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(''); + + return $this; + } - $em->persist($config); + protected function setupConfig() + { + $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' => 'download_pictures', + 'name' => 'share_public', 'value' => '1', 'section' => 'entry', ], @@ -292,8 +332,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', ], [ @@ -353,39 +398,25 @@ class InstallCommand extends ContainerAwareCommand return $this; } - protected function setupAsset() - { - $this->defaultOutput->writeln('Step 4 of 4. Installing assets.'); - - $this - ->runCommand('assets:install') - ->runCommand('assetic:dump') - ; - - $this->defaultOutput->writeln(''); - - return $this; - } - /** * Run a command. * * @param string $command * @param array $parameters Parameters to this command (usually 'force' => true) */ - protected function runCommand($command, $parameters = array()) + protected function runCommand($command, $parameters = []) { $parameters = array_merge( - array('command' => $command), + ['command' => $command], $parameters, - array( + [ '--no-debug' => true, '--env' => $this->defaultInput->getOption('env') ?: 'dev', - ) + ] ); if ($this->defaultInput->getOption('no-interaction')) { - $parameters = array_merge($parameters, array('--no-interaction' => true)); + $parameters = array_merge($parameters, ['--no-interaction' => true]); } $this->getApplication()->setAutoExit(false); @@ -435,7 +466,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'])) { @@ -445,7 +476,13 @@ class InstallCommand extends ContainerAwareCommand return false; } - return in_array($databaseName, $schemaManager->listDatabases()); + try { + return in_array($databaseName, $schemaManager->listDatabases()); + } catch (\Doctrine\DBAL\Exception\DriverException $e) { + // it means we weren't able to get database list, assume the database doesn't exist + + return false; + } } /**