Merge branch 'master' into 2.1

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

diff --git a/composer.json b/composer.json
index a8ab2a5961c19368dc17cd7f37a4515c22ee3884..7beb9bd92f74ed663634fe5c8ebff1fe007b7088 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "ext-iconv": "*",
         "ext-tokenizer": "*",
         "ext-pdo": "*",
-        "symfony/symfony": "3.0.*",
+        "symfony/symfony": "3.1.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
@@ -85,9 +85,10 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "^2.7",
+        "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9"
     },
     "scripts": {
@@ -119,6 +120,9 @@
         "psr-4": { "Wallabag\\": "src/Wallabag/" },
         "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "Tests\\": "tests/" }
+    },
     "config": {
         "bin-dir": "bin"
     },