Skip to content

Commit 8ad4439

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Fix CS Compatibility with doctrine/annotations 2 [Console] Fix a test when pcntl is not available (following #48329) [FrameworkBundle] fix: fix typo about help
2 parents 241c97a + ef7f872 commit 8ad4439

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"symfony/property-access": "^5.4|^6.0",
3939
"symfony/property-info": "^5.4|^6.0",
4040
"symfony/translation": "^5.4|^6.0",
41-
"doctrine/annotations": "^1.13",
41+
"doctrine/annotations": "^1.13|^2",
4242
"egulias/email-validator": "^2.1.10|^3"
4343
},
4444
"conflict": {

0 commit comments

Comments
 (0)