Merge pull request #1422 from wallabag/v2-ebook

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

diff --git a/composer.json b/composer.json
index 82fe61bd2d77be764ef0d6ef03ead0ffd3961a8a..b6a9c8541bb00bf3c678e5011d222ab002187261 100644 (file)
--- 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",
@@ -45,7 +45,7 @@
         "nelmio/api-doc-bundle": "~2.7",
         "ezyang/htmlpurifier": "~4.6",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnick.com/tcpdf": "~6.2",
+        "tecnickcom/tcpdf": "~6.2",
         "simplepie/simplepie": "~1.3.1",
         "willdurand/hateoas-bundle": "~0.5.0",
         "htmlawed/htmlawed": "~1.1.19",
@@ -53,13 +53,24 @@
         "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"
     },
     "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",