X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=bf519faf229f0391c99018f08f00a4f44f9f96db;hb=10b40f85d664da2b3ebcfd24d6e7145c9cd90d64;hp=0136ed2e4dbf90edb3b19838c11dfa30245901a6;hpb=cbce162b407024882d8c37a7e3298c85175d2651;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index 0136ed2e..bf519faf 100644
--- a/composer.json
+++ b/composer.json
@@ -16,47 +16,22 @@
             "name": "Thomas Citharel",
             "homepage": "http://tcit.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "homepage": "http://www.j0k3r.net",
+            "role": "Developer"
         }
     ],
     "support": {
         "email": "hello@wallabag.org",
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/PHP-Flash-Messages"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/kriss_php5"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/pagination"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/PHPePub"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/php-readability"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/phpMobi"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/Fivefilters_Libraries"
-        }
-    ],
     "require": {
-        "php": ">=5.3.3",
-        "symfony/symfony": "2.6.*",
-        "doctrine/orm": "~2.2,>=2.2.3",
-        "doctrine/doctrine-bundle": "~1.2",
+        "php": ">=5.5.0",
+        "symfony/symfony": "~2.7.0",
+        "doctrine/orm": "~2.3",
+        "doctrine/doctrine-bundle": "1.5.2",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
@@ -64,29 +39,40 @@
         "sensio/distribution-bundle": "~3.0.12",
         "sensio/framework-extra-bundle": "~3.0",
         "incenteev/composer-parameter-handler": "~2.0",
-        "umpirsky/twig-gettext-extractor": "1.1.*",
+        "nelmio/cors-bundle": "~1.4.0",
         "friendsofsymfony/rest-bundle": "~1.4",
         "jms/serializer-bundle": "~0.13",
         "nelmio/api-doc-bundle": "~2.7",
         "ezyang/htmlpurifier": "~4.6",
         "mgargano/simplehtmldom": "~1.5",
-        "robmorgan/phinx": "~0.4",
-        "tecnick.com/tcpdf": "~6.2",
+        "tecnickcom/tcpdf": "~6.2",
         "simplepie/simplepie": "~1.3.1",
-        "htmlawed/htmlawed": "dev-master",
-        "wallabag/PHP-Flash-Messages": "dev-master",
-        "wallabag/kriss_php5": "dev-master",
-        "wallabag/pagination": "dev-master",
-        "wallabag/PHPePub": "dev-master",
-        "wallabag/php-readability": "dev-master",
-        "wallabag/phpMobi": "dev-master",
-        "wallabag/Fivefilters_Libraries": "dev-master"
+        "willdurand/hateoas-bundle": "~0.5.0",
+        "htmlawed/htmlawed": "~1.1.19",
+        "liip/theme-bundle": "~1.1.3",
+        "pagerfanta/pagerfanta": "~1.0.3",
+        "lexik/form-filter-bundle": "~4.0",
+        "j0k3r/graby": "~1.0",
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+        "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"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "dev-master",
+        "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",
@@ -101,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": {
@@ -108,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": {