Merge remote-tracking branch 'origin/master' into 2.3

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

diff --git a/composer.json b/composer.json
index 9336e801b4147482f32fcd32a17975c3830afd8b..1c58516ebad74728cf5b10ea507c023d3eeea033 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=5.6.0",
         "ext-pcre": "*",
         "ext-dom": "*",
         "ext-curl": "*",
@@ -65,7 +65,7 @@
         "liip/theme-bundle": "~1.1",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "2.0.x-dev",
+        "friendsofsymfony/user-bundle": "^2.0",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2",
         "scheb/two-factor-bundle": "~2.0",
@@ -75,7 +75,7 @@
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "paragonie/random_compat": "~1.0",
-        "craue/config-bundle": "~1.4",
+        "craue/config-bundle": "~2.0",
         "mnapoli/piwik-twig-extension": "^1.0",
         "ocramius/proxy-manager": "1.*",
         "white-october/pagerfanta-bundle": "^1.0",
@@ -130,7 +130,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "5.5.9"
+            "php": "5.6.0"
         }
     },
     "minimum-stability": "dev",