X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=505514801622018820c1722ea2e72910067ae450;hb=f808b01692a835673f328d7221ba8c212caa9b61;hp=0f119377fe54d041a73e8df2ec4407628c28695d;hpb=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 0f119377..50551480 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,6 +2,7 @@
namespace Wallabag\CoreBundle\Command;
+use Craue\ConfigBundle\Entity\Setting;
use FOS\UserBundle\Event\UserEvent;
use FOS\UserBundle\FOSUserEvents;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -14,7 +15,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\Console\Question\Question;
use Wallabag\CoreBundle\Entity\Config;
-use Craue\ConfigBundle\Entity\Setting;
class InstallCommand extends ContainerAwareCommand
{
@@ -86,7 +86,7 @@ class InstallCommand extends ContainerAwareCommand
if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
+ $help = 'Database driver "' . $this->getContainer()->getParameter('database_driver') . '" is not installed.';
}
$rows[] = [sprintf($label, $this->getContainer()->getParameter('database_driver')), $status, $help];
@@ -101,10 +101,10 @@ class InstallCommand extends ContainerAwareCommand
$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')) {
+ && 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();
+ $help = 'Can\'t connect to the database: ' . $e->getMessage();
}
}
@@ -123,7 +123,7 @@ class InstallCommand extends ContainerAwareCommand
if (false === version_compare($version, $minimalVersion, '>')) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).';
+ $help = 'Your MySQL version (' . $version . ') is too old, consider upgrading (' . $minimalVersion . '+).';
}
}
@@ -137,21 +137,21 @@ class InstallCommand extends ContainerAwareCommand
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].')';
+ $help = 'PostgreSQL should be greater than 9.1 (actual version: ' . $matches[1] . ')';
}
}
$rows[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
- $label = ''.$functionRequired.'';
+ $label = '' . $functionRequired . '';
$status = 'OK!';
$help = '';
if (!function_exists($functionRequired)) {
$fulfilled = false;
$status = 'ERROR!';
- $help = 'You need the '.$functionRequired.' function activated';
+ $help = 'You need the ' . $functionRequired . ' function activated';
}
$rows[] = [$label, $status, $help];
@@ -313,6 +313,8 @@ class InstallCommand extends ContainerAwareCommand
$this
->runCommand('doctrine:migrations:migrate', ['--no-interaction' => true]);
+
+ return $this;
}
/**
@@ -349,8 +351,8 @@ class InstallCommand extends ContainerAwareCommand
$this->getApplication()->setAutoExit(true);
throw new \RuntimeException(
- 'The command "'.$command."\" generates some errors: \n\n"
- .$output->fetch());
+ 'The command "' . $command . "\" generates some errors: \n\n"
+ . $output->fetch());
}
return $this;
@@ -394,7 +396,7 @@ class InstallCommand extends ContainerAwareCommand
}
try {
- return in_array($databaseName, $schemaManager->listDatabases());
+ return in_array($databaseName, $schemaManager->listDatabases(), true);
} catch (\Doctrine\DBAL\Exception\DriverException $e) {
// it means we weren't able to get database list, assume the database doesn't exist