X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=3300c0fbba5edb3f1bf3c6f197e7d918f68dd8e0;hb=78833672469f7beb0c4a195aa0a76f7ca4133057;hp=8fc5ce5bfb1a688986703cddb91ed27f4429cdd6;hpb=a6e27f74663637ecc4a4cf84028e6b5a3556a6ff;p=github%2Fwallabag%2Fwallabag.git diff --git a/composer.json b/composer.json index 8fc5ce5b..3300c0fb 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,13 @@ "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.10" + "kphoen/rulerz-bundle": "~0.10", + "guzzlehttp/guzzle": "^5.2.0", + "doctrine/doctrine-migrations-bundle": "^1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2.0", @@ -86,6 +89,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 +99,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": {