X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=26608cdceadd04522b83ab77d062dfa7351a2dd5;hb=da2240f9d409a8301a1d469823a265780e6f1b7b;hp=b8c936f0d0cc78285f1b7a62cbf63ea0dae29a86;hpb=4529d0f4b6b20cbbd1ccb5339a753aff7d35552b;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index b8c936f0..26608cdc 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",
@@ -55,7 +55,10 @@
         "j0k3r/graby": "~1.0",
         "friendsofsymfony/user-bundle": "dev-master",
         "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
-        "scheb/two-factor-bundle": "~1.4"
+        "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",
@@ -63,6 +66,12 @@
         "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",
@@ -77,6 +86,9 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ],
+        "build-parameters": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
         ]
     },
     "extra": {
@@ -84,7 +96,13 @@
         "symfony-web-dir": "web",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
+            "file": "app/config/parameters.yml",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
         }
     },
     "autoload": {