X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=60de962c37c8b517b1b79438f113e910ef137665;hb=7ab5eb9508921d84b4b4ec84a59135d536da748e;hp=ed0e30c19b7486ea24c9a570cf535be0bac9b813;hpb=fa884b30ba0f8cb4231bd37fff23ef2f41ae6cfa;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index ed0e30c1..60de962c 100644
--- a/composer.json
+++ b/composer.json
@@ -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",
@@ -84,15 +84,16 @@
         "javibravo/simpleue": "^1.0",
         "symfony/dom-crawler": "^3.1",
         "friendsofsymfony/jsrouting-bundle": "^1.6",
-        "bdunogier/guzzle-site-authenticator": "dev-master"
+        "bdunogier/guzzle-site-authenticator": "^1.0.0@dev"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.0",
+        "symfony/phpunit-bridge": "^3.3",
         "friendsofphp/php-cs-fixer": "~1.9",
-        "m6web/redis-mock": "^2.0"
+        "m6web/redis-mock": "^2.0",
+        "dama/doctrine-test-bundle": "^1.0"
     },
     "scripts": {
         "post-cmd": [
@@ -115,7 +116,7 @@
         "symfony-var-dir": "var",
         "symfony-web-dir": "web",
         "symfony-tests-dir": "tests",
-        "symfony-assets-install": "symlink",
+        "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
         }