Skip to content

Commit 1b1c715

Browse files
franmomuphansys
authored andcommitted
Remove conflict with doctrine/orm >= 2.16.0
1 parent 14652bf commit 1b1c715

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ a release.
1818
---
1919

2020
## [Unreleased]
21-
### Changed
22-
- Add conflict with "doctrine/orm" >=2.16 (temporary change until code is fixed)
2321
### Fixed
2422
- References: fixed condition in `XML` Driver that did not allow to retrieve from the entity definition the `mappedBy` and `inversedBy` fields.
25-
26-
### Fixed
2723
- Fix bug collecting metadata for inherited mapped classes
2824

2925
## [3.12.0] - 2023-07-08

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"conflict": {
7272
"doctrine/dbal": "<2.13.1 || ^3.0 <3.2",
7373
"doctrine/mongodb-odm": "<2.3",
74-
"doctrine/orm": "<2.10.2 || >= 2.16.0",
74+
"doctrine/orm": "<2.10.2 || 2.16.0 || 2.16.1",
7575
"sebastian/comparator": "<2.0"
7676
},
7777
"suggest": {

0 commit comments

Comments
 (0)