Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove conflict with doctrine/orm >= 2.16.0 #2687

Merged
merged 1 commit into from
Sep 3, 2023
Merged

Remove conflict with doctrine/orm >= 2.16.0 #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ a release.
---

## [Unreleased]
### Changed
- Add conflict with "doctrine/orm" >=2.16 (temporary change until code is fixed)
### Fixed
- References: fixed condition in `XML` Driver that did not allow to retrieve from the entity definition the `mappedBy` and `inversedBy` fields.

### Fixed
- Fix bug collecting metadata for inherited mapped classes

## [3.12.0] - 2023-07-08
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"conflict": {
"doctrine/dbal": "<2.13.1 || ^3.0 <3.2",
"doctrine/mongodb-odm": "<2.3",
"doctrine/orm": "<2.10.2 || >= 2.16.0",
"doctrine/orm": "<2.10.2 || 2.16.0 || 2.16.1",
"sebastian/comparator": "<2.0"
},
"suggest": {
Expand Down