Skip to content

Commit a54acbc

Browse files
mbabkerfranmomu
authored andcommitted
Make the annotations package optional
1 parent e3da653 commit a54acbc

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ a release.
2222
- SoftDeleteable: `Gedmo\SoftDeleteable\Event\PreSoftDeleteEventArgs` and
2323
`Gedmo\SoftDeleteable\Event\PostSoftDeleteEventArgs` classes.
2424

25+
### Changed
26+
- Make doctrine/annotations an optional dependency.
27+
2528
### Deprecated
2629
- Do not add type-hinted parameters `Gedmo\SoftDeleteable\Event\PreSoftDeleteEventArgs` and
2730
`Gedmo\SoftDeleteable\Event\PostSoftDeleteEventArgs` classes to `preSoftDelete` and `postSoftDelete` events.

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"require": {
4343
"php": "^7.4 || ^8.0",
4444
"behat/transliterator": "^1.2",
45-
"doctrine/annotations": "^1.13 || ^2.0",
4645
"doctrine/collections": "^1.2 || ^2.0",
4746
"doctrine/common": "^2.13 || ^3.0",
4847
"doctrine/event-manager": "^1.2 || ^2.0",
@@ -52,6 +51,7 @@
5251
"symfony/deprecation-contracts": "^2.1 || ^3.0"
5352
},
5453
"require-dev": {
54+
"doctrine/annotations": "^1.13 || ^2.0",
5555
"doctrine/cache": "^1.11 || ^2.0",
5656
"doctrine/dbal": "^3.2",
5757
"doctrine/doctrine-bundle": "^2.3",
@@ -69,6 +69,7 @@
6969
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
7070
},
7171
"conflict": {
72+
"doctrine/annotations": "<1.13 || >=3.0",
7273
"doctrine/dbal": "<3.2",
7374
"doctrine/mongodb-odm": "<2.3",
7475
"doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1",

0 commit comments

Comments
 (0)