X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=a46e990ade11d595cd990b08b2fa7de50c96377a;hb=53cf5106891fc64f3f66cb6b3316654a9620239c;hp=22cb277c4913cbec3cdf0504b632067208a94dc0;hpb=fcb1fba5c2fdb12c9f4041bd334aaced6f302d91;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index 22cb277c..a46e990a 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "php": ">=5.3.3",
         "symfony/symfony": "~2.7.0",
         "doctrine/orm": "~2.3",
-        "doctrine/doctrine-bundle": "~1.2",
+        "doctrine/doctrine-bundle": "1.5.2",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
@@ -54,12 +54,14 @@
         "lexik/form-filter-bundle": "~4.0",
         "j0k3r/graby": "~1.0",
         "friendsofsymfony/user-bundle": "dev-master",
-        "friendsofsymfony/oauth-server-bundle": "^1.4@dev"
+        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+        "scheb/two-factor-bundle": "~1.4"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2.0",
         "sensio/generator-bundle": "~2.5",
-        "phpunit/phpunit": "~4.4"
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "~2.7.0"
     },
     "scripts": {
         "post-install-cmd": [