Skip to content

Commit

Permalink
Merge pull request #778 from driehle/fix/orm-incompatibility
Browse files Browse the repository at this point in the history
Mark doctrine/orm 2.12.0 as conflict
  • Loading branch information
driehle authored Apr 23, 2022
2 parents 6afaf00 + 51f8cce commit 8e47008
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"require-dev": {
"doctrine/coding-standard": "^9.0.0",
"doctrine/orm": "^2.10.2",
"doctrine/orm": "^2.10.5",
"jangregor/phpstan-prophecy": "^1.0.0",
"laminas/laminas-cache-storage-adapter-blackhole": "^1.2.1 || ^2.0.0",
"laminas/laminas-cache-storage-adapter-memory": "^1.0.1 || ^2.0.0",
Expand All @@ -85,6 +85,9 @@
"predis/predis": "^1.1.9",
"vimeo/psalm": "^4.11.2"
},
"conflict": {
"doctrine/orm": "2.12.0"
},
"suggest": {
"doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",
"laminas/laminas-mvc-console": "^1.1.11 if you want to use the Laminas console libraries"
Expand Down

0 comments on commit 8e47008

Please sign in to comment.