Skip to content

Commit 2973e1f

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 48927da + 5891533 commit 2973e1f

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
@@ -30,7 +30,7 @@
3030
"symfony/security-http": "^5.4|^6.0"
3131
},
3232
"require-dev": {
33-
"doctrine/annotations": "^1.10.4",
33+
"doctrine/annotations": "^1.10.4|^2",
3434
"symfony/asset": "^5.4|^6.0",
3535
"symfony/browser-kit": "^5.4|^6.0",
3636
"symfony/console": "^5.4|^6.0",

0 commit comments

Comments
 (0)