Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit dcf89ca6712d · 2026-01-27T09:59:58.000+01:00
* 7.3:
  [PropertyInfo] Conflict with phpdocumentor/reflection-docblock &gt;= 6
  [PropertyInfo] Fix resolution of self/parent types in inherited DocBlocks
  [PropertyInfo] Fix resolution of self/parent types in inherited DocBlocks
  chore(translation): remove state needs-review-translation fixes #59413
diff --git a/composer.json b/composer.json
@@ -36,6 +36,7 @@
     "require-dev": {
         "doctrine/persistence": "^1.3|^2|^3",
         "dragonmantank/cron-expression": "^3.1",
+        "phpdocumentor/reflection-docblock": "^5.2",
         "seld/jsonlint": "^1.10",
         "symfony/asset": "^6.4|^7.0|^8.0",
         "symfony/asset-mapper": "^6.4|^7.0|^8.0",
@@ -76,13 +77,12 @@
         "symfony/uid": "^6.4|^7.0|^8.0",
         "symfony/web-link": "^6.4|^7.0|^8.0",
         "symfony/webhook": "^7.2|^8.0",
-        "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "twig/twig": "^3.12"
     },
     "conflict": {
         "doctrine/persistence": "<1.3",
-        "phpdocumentor/reflection-docblock": "<3.2.2",
-        "phpdocumentor/type-resolver": "<1.4.0",
+        "phpdocumentor/reflection-docblock": "<5.2|>=6",
+        "phpdocumentor/type-resolver": "<1.5.1",
         "symfony/asset": "<6.4",
         "symfony/asset-mapper": "<6.4",
         "symfony/clock": "<6.4",
