X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=8fc5ce5bfb1a688986703cddb91ed27f4429cdd6;hb=a6e27f74663637ecc4a4cf84028e6b5a3556a6ff;hp=babe9356da90e8a482165c19eab5cceea4d014a9;hpb=917040d4a0b7694ca4f695c02243ffb4283d6901;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index babe9356..8fc5ce5b 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",
@@ -53,13 +53,25 @@
         "pagerfanta/pagerfanta": "~1.0.3",
         "lexik/form-filter-bundle": "~4.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master"
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+        "scheb/two-factor-bundle": "~1.4",
+        "grandt/phpepub": "~4.0",
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10"
     },
     "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"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/wallabag/phpMobi"
+        }
+    ],
     "scripts": {
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",