]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #1832 from wallabag/pdo-driver
authorNicolas Lœuillet <nicolas@loeuillet.org>
Sat, 2 Apr 2016 12:57:10 +0000 (14:57 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Sat, 2 Apr 2016 12:57:10 +0000 (14:57 +0200)
Check selected PDO driver on install

src/Wallabag/CoreBundle/Command/InstallCommand.php

index 7c3d1c523f95fdd2f41451355e43cef131b3f8eb..6665f4b5b7d503ad9cab5eb81ea1bd2da3995673 100644 (file)
@@ -73,13 +73,14 @@ class InstallCommand extends ContainerAwareCommand
 
         $fulfilled = true;
 
-        $label = '<comment>PDO Drivers</comment>';
+        $label = '<comment>PDO Driver</comment>';
         $status = '<info>OK!</info>';
         $help = '';
-        if (!(extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql'))) {
+
+        if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
             $fulfilled = false;
             $status = '<error>ERROR!</error>';
-            $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
+            $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
         }
 
         $rows = [];