Merge pull request #1000 from ergebnis/feature/doctrine-annotations

Enhancement: Allow installation of `doctrine/annotations:^2.0.0`
ergebnis · Feb 9, 2023 · 0d1e24b · 0d1e24b
2 parents 3a64165 + 8caffe4
commit 0d1e24b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`1.3.0...main`][1.3.0...main].
 
+### Changed
+
+- Allowed installation of `doctrine/annotations:^2.0.0` ([#1000]), by [@localheinz]
+
 ## [`1.3.0`][1.3.0]
 
 For a full diff see [`1.2.0...1.3.0`][1.2.0...1.3.0].
@@ -312,6 +316,7 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0].
 [#922]: https://github.com/ergebnis/factory-bot/pull/922
 [#947]: https://github.com/ergebnis/factory-bot/pull/947
 [#948]: https://github.com/ergebnis/factory-bot/pull/948
+[#1000]: https://github.com/ergebnis/factory-bot/pull/1000
 
 [@abenerd]: https://github.com/abenerd
 [@localheinz]: https://github.com/localheinz

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   },
   "require": {
     "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
-    "doctrine/annotations": "^1.10.3",
+    "doctrine/annotations": "^1.10.3 || ^2.0.0",
     "doctrine/collections": "^1.6.5 || ^2.0.0",
     "doctrine/dbal": "^2.12.0 || ^3.0.0",
     "doctrine/orm": "^2.8.0",

diff --git a/composer.lock b/composer.lock