Merge 3.x into master

sonata-project · Dec 6, 2019 · bdfb6ce · bdfb6ce
2 parents 950181f + cdd30d7
commit bdfb6ce
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
     "require": {
         "php": "^7.1",
         "cocur/slugify": "^1.0 || ^2.0 || ^3.0",
+        "doctrine/doctrine-bundle": "^1.0",
         "sonata-project/admin-bundle": "^3.35",
         "sonata-project/block-bundle": "^3.18",
         "sonata-project/cache": "^2.0",
@@ -38,7 +39,7 @@
         "symfony/config": "^3.4 || ^4.2",
         "symfony/console": "^3.4 || ^4.2",
         "symfony/debug": "^3.4 || ^4.2",
-        "symfony/dependency-injection": "^3.4 || ^4.2",
+        "symfony/dependency-injection": "^3.4 || ^4.2,<4.4.0",
         "symfony/form": "^3.4 || ^4.2",
         "symfony/http-foundation": "^3.4.31 || ^4.2",
         "symfony/http-kernel": "^3.4 || ^4.2",