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
symfony · Dec 20, 2022 · b2ba5c7 · b2ba5c7
2 parents f7770a3 + 5a35a66
commit b2ba5c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "twig/twig": "^2.13|^3.0.4"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.12",
+        "doctrine/annotations": "^1.12|^2",
         "egulias/email-validator": "^2.1.10|^3",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "symfony/asset": "^5.4|^6.0",