diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-04-02 14:57:10 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-04-02 14:57:10 +0200 |
| commit | 2ff626a451cb0a2fd942a25007a8452bf1e0866e (patch) | |
| tree | 0ea4b1c5f96b8fa07c748bb0572b0041bc483a4a | |
| parent | d92407041af37e0025a732ceaba378e10a5da04c (diff) | |
| parent | c61b68e8a62b64b1d177c0f58c4a28b4e7a67d1d (diff) | |
| download | wallabag-2ff626a451cb0a2fd942a25007a8452bf1e0866e.tar.gz wallabag-2ff626a451cb0a2fd942a25007a8452bf1e0866e.tar.zst wallabag-2ff626a451cb0a2fd942a25007a8452bf1e0866e.zip | |
Merge pull request #1832 from wallabag/pdo-driver
Check selected PDO driver on install
| -rw-r--r-- | src/Wallabag/CoreBundle/Command/InstallCommand.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 7c3d1c52..6665f4b5 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php | |||
| @@ -73,13 +73,14 @@ class InstallCommand extends ContainerAwareCommand | |||
| 73 | 73 | ||
| 74 | $fulfilled = true; | 74 | $fulfilled = true; |
| 75 | 75 | ||
| 76 | $label = '<comment>PDO Drivers</comment>'; | 76 | $label = '<comment>PDO Driver</comment>'; |
| 77 | $status = '<info>OK!</info>'; | 77 | $status = '<info>OK!</info>'; |
| 78 | $help = ''; | 78 | $help = ''; |
| 79 | if (!(extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql'))) { | 79 | |
| 80 | if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) { | ||
| 80 | $fulfilled = false; | 81 | $fulfilled = false; |
| 81 | $status = '<error>ERROR!</error>'; | 82 | $status = '<error>ERROR!</error>'; |
| 82 | $help = 'Needs one of sqlite, mysql or pgsql PDO drivers'; | 83 | $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.'; |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | $rows = []; | 86 | $rows = []; |