Skip to content

Commit 51f8cce

Browse files
committed
mark doctrine/orm 2.12.0 as conflict
ORM 2.12.0 has a BC break which is fixed with 2.12.1. This change marks 2.12.0 as a conflict, to prevent installation.
1 parent 6afaf00 commit 51f8cce

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
"require-dev": {
7070
"doctrine/coding-standard": "^9.0.0",
71-
"doctrine/orm": "^2.10.2",
71+
"doctrine/orm": "^2.10.5",
7272
"jangregor/phpstan-prophecy": "^1.0.0",
7373
"laminas/laminas-cache-storage-adapter-blackhole": "^1.2.1 || ^2.0.0",
7474
"laminas/laminas-cache-storage-adapter-memory": "^1.0.1 || ^2.0.0",
@@ -85,6 +85,9 @@
8585
"predis/predis": "^1.1.9",
8686
"vimeo/psalm": "^4.11.2"
8787
},
88+
"conflict": {
89+
"doctrine/orm": "2.12.0"
90+
},
8891
"suggest": {
8992
"doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",
9093
"laminas/laminas-mvc-console": "^1.1.11 if you want to use the Laminas console libraries"

0 commit comments

Comments
 (0)