Merge branch '4.4' into 5.0

* 4.4: Allow doctrine/persistence 2 Fix Redis tests [DoctrineBridge] Bump doctrine/data-fixtures.
symfony · Jul 23, 2020 · e2ab3fe · e2ab3fe
2 parents f9d97a3 + b6062a8
commit e2ab3fe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=7.2.5",
         "doctrine/event-manager": "~1.0",
-        "doctrine/persistence": "^1.3",
+        "doctrine/persistence": "^1.3|^2",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/service-contracts": "^1.1|^2"
@@ -42,7 +42,7 @@
         "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
-        "doctrine/data-fixtures": "1.0.*",
+        "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "^2.6.3",
         "doctrine/reflection": "~1.0"