minor #49727 [Serializer] re-allow phpdocumentor/type-resolver 1.7 (xabbuh)

xabbuh · xabbuh · commit 6fe10678d43c · 2023-03-19T11:50:42.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Serializer] re-allow phpdocumentor/type-resolver 1.7 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | reverts #48471 | License | MIT | Doc PR | Commits ------- 0776dec re-allow phpdocumentor/type-resolver 1.7
diff --git a/composer.json b/composer.json
@@ -158,7 +158,7 @@
         "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "phpdocumentor/reflection-docblock": "<3.2.2",
-        "phpdocumentor/type-resolver": "<1.4.0|>=1.7.0",
+        "phpdocumentor/type-resolver": "<1.4.0",
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
     },
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -44,7 +44,7 @@
     "conflict": {
         "doctrine/annotations": "<1.12",
         "phpdocumentor/reflection-docblock": "<3.2.2",
-        "phpdocumentor/type-resolver": "<1.4.0|>=1.7.0",
+        "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/dependency-injection": "<4.4",
         "symfony/property-access": "<5.4",
         "symfony/property-info": "<5.3.13",
