X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=bf519faf229f0391c99018f08f00a4f44f9f96db;hb=8c3c77c1bd5c3763c127bfea52e908e77dc751b9;hp=a9c734ab590a5b3dea4f0ccf2b63cbe747f6b1b0;hpb=cad8cda7af06234a63b86253da1d813e7b0fd0f2;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index a9c734ab..bf519faf 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5.0",
         "symfony/symfony": "~2.7.0",
         "doctrine/orm": "~2.3",
         "doctrine/doctrine-bundle": "1.5.2",
@@ -55,10 +55,11 @@
         "j0k3r/graby": "~1.0",
         "friendsofsymfony/user-bundle": "dev-master",
         "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
-        "scheb/two-factor-bundle": "~1.4",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "scheb/two-factor-bundle": "~1.4.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
-        "kphoen/rulerz-bundle": "~0.7,>=0.7.2"
+        "kphoen/rulerz-bundle": "~0.10"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2.0",
@@ -86,6 +87,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": {
@@ -93,7 +97,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": {