Add doctrine/mongodb-odm 2.0 to composer conflict

Author: AkenRoberts

CHANGELOG.md

@@ -22,6 +22,7 @@ a release.
 ### Global / Shared
 #### Fixed
 - Add `parent::__construct()` calls to Listeners w/ custom constructors (#2012)
+- Add upcoming Doctrine ODM 2.0 to `composer.json` conflicts (#2027)
 
 ### Loggable
 #### Fixed

composer.json

@@ -39,11 +39,12 @@
         "doctrine/common": "~2.4"
     },
     "conflict": {
-        "doctrine/annotations": "<1.2"
+        "doctrine/annotations": "<1.2",
+        "doctrine/mongodb-odm": ">=2.0"
     },
     "require-dev": {
         "doctrine/common": ">=2.5.0",
-        "doctrine/mongodb-odm": ">=1.0.2",
+        "doctrine/mongodb-odm": ">=1.0.2 <2.0",
         "doctrine/orm": ">=2.5.0",
         "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
         "symfony/yaml": "~2.6 || ~3.0 || ~4.0"

composer7.json

@@ -47,7 +47,7 @@
     },
     "require-dev": {
         "alcaeus/mongo-php-adapter": "~1.0.4",
-        "doctrine/mongodb-odm": ">=1.0.2",
+        "doctrine/mongodb-odm": ">=1.0.2 <2.0",
         "doctrine/orm": ">=2.5.0",
         "doctrine/common": ">=2.5.0",
         "symfony/yaml": "~2.6|~3.0|~4.0",
@@ -56,6 +56,7 @@
     "conflict": {
         "doctrine/annotations": "<1.2",
         "doctrine/mongodb": "<1.3",
+        "doctrine/mongodb-odm": ">=2.0",
         "sebastian/comparator": "<2.0"
     },
     "suggest": {