2 files changed, 40 insertions, 8 deletions

diff --git a/composer.json b/composer.json
index fe6880aa..0a016049 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,23 @@
         "paragonie/random_compat": "~1.0",
         "craue/config-bundle": "~1.4",
         "mnapoli/piwik-twig-extension": "^1.0",
-        "lexik/maintenance-bundle": "~2.1"
+        "lexik/maintenance-bundle": "~2.1",
+        "ext-pcre": "*",
+        "ext-DOM": "*",
+        "ext-curl": "*",
+        "ext-gd": "*",
+        "ext-session": "*",
+        "ext-Ctype": "*",
+        "ext-hash": "*",
+        "ext-simplexml": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-xml": "*",
+        "ext-tidy": "*",
+        "ext-iconv": "*",
+        "ext-gettext": "*",
+        "ext-tokenizer": "*",
+        "ext-PDO": "*"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index f1111cce..114b8726 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -29,9 +29,11 @@ class InstallCommand extends ContainerAwareCommand
     /**
      * @var array
      */
-    protected $requirements = [
-        'pcre',
-        'DOM',
+    protected $functionExists = [
+        'tidy_parse_string',
+        'curl_exec',
+        'curl_multi_init',
+        'gettext',
     ];
 
     protected function configure()
@@ -73,16 +75,30 @@ class InstallCommand extends ContainerAwareCommand
 
         $fulfilled = true;
 
-        foreach ($this->requirements as $requirement) {
-            $label = '<comment>'.strtoupper($requirement).'</comment>';
-            if (extension_loaded($requirement)) {
+        $label = '<comment>PDO Drivers</comment>';
+        if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
+            $status = '<info>OK!</info>';
+            $help = '';
+        } else {
+            $fulfilled = false;
+            $status = '<error>ERROR!</error>';
+            $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
+        }
+
+        $rows[] = array($label, $status, $help);
+
+        foreach ($this->functionExists as $functionRequired) {
+            $label = '<comment>'.$functionRequired.'</comment>';
+
+            if (function_exists($functionRequired)) {
                 $status = '<info>OK!</info>';
                 $help = '';
             } else {
                 $fulfilled = false;
                 $status = '<error>ERROR!</error>';
-                $help = 'You should enabled '.$requirement.' extension';
+                $help = 'You need the '.$requirement.' function activated';
             }
+
             $rows[] = array($label, $status, $help);
         }