Skip to content

Commit 0dce521

Browse files
Merge branch '5.1' into 5.2
* 5.1: [travis] always install ext-mongodb Fix circular loop with EntityManager
2 parents a79c06c + 195d7f0 commit 0dce521

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
"twig/markdown-extra": "^2.12"
5252
},
5353
"conflict": {
54+
"phpdocumentor/reflection-docblock": "<3.2.2",
55+
"phpdocumentor/type-resolver": "<1.4.0",
5456
"symfony/console": "<4.4",
5557
"symfony/form": "<5.1",
5658
"symfony/http-foundation": "<4.4",

0 commit comments

Comments
 (0)