Skip to content

Commit e887431

Browse files
Merge branch '5.0' into 5.1
* 5.0: Allow doctrine/persistence 2 Fix Redis tests [DoctrineBridge] Bump doctrine/data-fixtures.
2 parents f6f4863 + e2ab3fe commit e887431

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=7.2.5",
2020
"doctrine/event-manager": "~1.0",
21-
"doctrine/persistence": "^1.3",
21+
"doctrine/persistence": "^1.3|^2",
2222
"symfony/polyfill-ctype": "~1.8",
2323
"symfony/polyfill-mbstring": "~1.0",
2424
"symfony/polyfill-php80": "^1.15",
@@ -45,7 +45,7 @@
4545
"doctrine/annotations": "~1.7",
4646
"doctrine/cache": "~1.6",
4747
"doctrine/collections": "~1.0",
48-
"doctrine/data-fixtures": "1.0.*",
48+
"doctrine/data-fixtures": "^1.1",
4949
"doctrine/dbal": "~2.4",
5050
"doctrine/orm": "^2.6.3",
5151
"doctrine/reflection": "~1.0"

0 commit comments

Comments
 (0)