Merge pull request #405 from doctrine/annotations

explicitly require doctrine/annotations
doctrine · Jul 3, 2024 · 3a52605 · 3a52605
2 parents fccf7e3 + 30356fa
commit 3a52605
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -25,6 +25,7 @@ jobs:
                       phpunit-version: "8.5"
                       phpunit-flags: "-v --coverage-text"
                       symfony-version: "^4.4"
+                      composer-require: "'doctrine/annotations: 1.*'"
 
                     - php-version: "7.4"
                       phpunit-version: "8.5"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ Changelog
 Version 2
 =========
 
+2.5.1
+-----
+
+* Fix dependencies: phpcr-odm 2.0 has BC breaks not supported by this legacy version of the bundle.
+  To use phpcr-odm `2.*`, please use version 3 of this bundle.
+
 2.5.0
 -----
 

diff --git a/composer.json b/composer.json
@@ -29,15 +29,16 @@
     },
     "conflict": {
         "doctrine/annotations": "< 1.7.0",
-        "doctrine/phpcr-odm": "< 1.5.2",
+        "doctrine/phpcr-odm": "< 1.5.2 || >= 2.0",
         "jackalope/jackalope": "< 1.3.1",
         "phpcr/phpcr-shell": "< 1.0.0-beta1",
         "symfony/dependency-injection": "4.0.0",
         "twig/twig": "< 1.42.3"
     },
     "require-dev": {
+        "doctrine/annotations": "^1.0 || ^2.0",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
-        "doctrine/phpcr-odm": "^1.5.2 || ^2.0",
+        "doctrine/phpcr-odm": "^1.5.2",
         "jackalope/jackalope-doctrine-dbal": "^1.3",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "symfony/asset": "^4.3 || ^5.0 || ^6.0",