Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 480cd1237c98 · 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
@@ -22,7 +22,7 @@
         "symfony/polyfill-php84": "^1.30"
     },
     "require-dev": {
-        "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+        "phpdocumentor/reflection-docblock": "^5.2",
         "phpstan/phpdoc-parser": "^1.0|^2.0",
         "seld/jsonlint": "^1.10",
         "symfony/cache": "^6.4|^7.0|^8.0",
@@ -47,8 +47,8 @@
         "symfony/yaml": "^6.4|^7.0|^8.0"
     },
     "conflict": {
-        "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/dependency-injection": "<6.4",
         "symfony/property-access": "<6.4",
         "symfony/property-info": "<6.4",
