Skip to content

Commit 2d10cb6

Browse files
authored
Merge pull request #853 from driehle/add-conflicts
Prevent installation with old versions of dependant modules
2 parents 5b1553f + cb44f70 commit 2d10cb6

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

composer.json

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,7 @@
88
"module",
99
"laminas"
1010
],
11-
"authors": [
12-
{
13-
"name": "Kyle Spraggs",
14-
"email": "[email protected]",
15-
"homepage": "http://www.spiffyjr.me/"
16-
},
17-
{
18-
"name": "Marco Pivetta",
19-
"email": "[email protected]",
20-
"homepage": "http://marco-pivetta.com/"
21-
},
22-
{
23-
"name": "Guilherme Blanco",
24-
"email": "[email protected]"
25-
},
26-
{
27-
"name": "Micha\u00ebl Gallego",
28-
"email": "[email protected]",
29-
"homepage": "http://www.michaelgallego.fr"
30-
},
31-
{
32-
"name": "Tom H Anderson",
33-
"email": "[email protected]",
34-
"homepage": "https://tomhanderson.com"
35-
}
36-
],
37-
"homepage": "http://www.doctrine-project.org/",
11+
"homepage": "https://www.doctrine-project.org/",
3812
"require": {
3913
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
4014
"composer-runtime-api": "^2.0.0",
@@ -73,7 +47,8 @@
7347
"phpunit/phpunit": "^10.5.40"
7448
},
7549
"conflict": {
76-
"doctrine/orm": "2.12.0"
50+
"doctrine/doctrine-mongo-odm-module": "<5.2.0",
51+
"doctrine/doctrine-orm-module": "<6.2.0"
7752
},
7853
"suggest": {
7954
"doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",

0 commit comments

Comments
 (0)