Merge remote-tracking branch 'origin/2.0'

Author: dbu

composer.json

@@ -10,16 +10,30 @@
     ],
     "require": {
         "php": "^7.1",
-        "symfony/phpunit-bridge": "3.3 || ^4.0",
-        "symfony/monolog-bundle": "~3.1",
         "doctrine/common": "^2.4",
-        "doctrine/doctrine-bundle": "^1.0|^2.0",
-        "doctrine/phpcr-odm": "^1.4|^2.0",
-        "doctrine/phpcr-bundle": "^2.0@dev",
         "doctrine/data-fixtures": "^1.0",
+        "doctrine/doctrine-bundle": "^1.0 || ^2.0",
+        "doctrine/phpcr-bundle": "^2.0@dev",
+        "doctrine/phpcr-odm": "^1.4 || ^2.0",
+        "friendsofsymfony/jsrouting-bundle": "^1.1",
         "jackalope/jackalope": "^1.1.5",
         "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-        "symfony/yaml": "^2.8 || ^3.3 || ^4.0"
+        "symfony/browser-kit": "^2.8 || ^3.0",
+        "symfony/console": "^2.8 || ^3.0",
+        "symfony/css-selector": "^2.8 || ^3.0",
+        "symfony/debug": "^2.8 || ^3.0",
+        "symfony/dependency-injection": "^2.8 || ^3.0",
+        "symfony/doctrine-bridge": "^2.8 || ^3.0",
+        "symfony/framework-bundle": "^2.8.1 || ^3.0",
+        "symfony/http-foundation": "^2.8 || ^3.0",
+        "symfony/http-kernel": "^2.8 || ^3.0",
+        "symfony/monolog-bundle": "^3.1",
+        "symfony/process": "^2.8 || ^3.0",
+        "symfony/security-bundle": "^2.8 || ^3.0",
+        "symfony/twig-bundle": "^2.8 || ^3.0"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -31,6 +45,9 @@
             "Symfony\\Cmf\\Component\\Testing\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev"