Merge branch '6.0' into 6.1

* 6.0: 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 · 7a3a5bf · 7a3a5bf
2 parents f184c96 + a8593a4
commit 7a3a5bf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "symfony/dependency-injection": "^5.4|^6.0",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpstan/phpdoc-parser": "^1.0",
-        "doctrine/annotations": "^1.10.4"
+        "doctrine/annotations": "^1.10.4|^2"
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<5.2",