Merge pull request #4152 from ldidry/add-env-var-dev.sh

[github/wallabag/wallabag.git] / composer.json

diff --git a/composer.json b/composer.json
index 46dc409b1e558b523b9eb5f0e1bea43a6db75bc9..0ce9622f38162d888f04bb161579b61e87f3c4e4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,7 @@
         "doctrine/orm": "^2.6",
         "doctrine/doctrine-bundle": "^1.9",
         "doctrine/doctrine-cache-bundle": "^1.3",
+        "doctrine/dbal": "2.9.2",
         "twig/extensions": "^1.5",
         "symfony/swiftmailer-bundle": "^3.2",
         "symfony/monolog-bundle": "^3.1",
@@ -71,13 +72,13 @@
         "friendsofsymfony/user-bundle": "2.0.*",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2",
-        "scheb/two-factor-bundle": "^3.0",
+        "scheb/two-factor-bundle": "^4.4",
         "grandt/phpepub": "dev-master",
         "wallabag/php-mobi": "~1.0",
         "kphoen/rulerz-bundle": "~0.13",
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.3",
-        "craue/config-bundle": "dev-utf8mb4",
+        "craue/config-bundle": "^2.3.0",
         "mnapoli/piwik-twig-extension": "^2.0",
         "ocramius/proxy-manager": "^2.1.1",
         "white-october/pagerfanta-bundle": "^1.1",
@@ -166,11 +167,6 @@
             "type": "vcs",
             "url": "https://github.com/Daniel-KM/PHPePub",
             "comment": "The most up-to-date PHPePub as of now"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/CraueConfigBundle",
-            "comment": "To handle utf8mb4 field size"
         }
     ]
 }