Merge pull request #205 from patchlevel/fix-merge-schema

Fix merge_orm_schema
patchlevel · Apr 29, 2024 · 94b9ad0 · 94b9ad0
2 parents b7cd57d + 843b20b
commit 94b9ad0
Show file tree

Hide file tree

Showing 3 changed files with 643 additions and 196 deletions.
diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
   "require-dev": {
     "ext-pdo_sqlite": "*",
     "doctrine/migrations": "^3.3.2",
+    "doctrine/orm": "^2.19.4|^3.1.2",
     "infection/infection": "^0.27.0",
     "league/commonmark": "^2.4",
     "patchlevel/coding-standard": "^1.3.0",
@@ -49,6 +50,9 @@
     "patchlevel/event-sourcing-admin-bundle": "for admin ui",
     "patchlevel/event-sourcing-psalm-plugin": "for psalm integration"
   },
+  "conflict": {
+    "doctrine/doctrine-bundle": "<2.8"
+  },
   "config": {
     "preferred-install": {
       "*": "dist"