bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)

fabpot · fabpot · commit 09446473f9a7 · 2017-07-17T18:38:15.000+02:00
This PR was merged into the 3.2 branch. Discussion ---------- [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | `phpdocumentor/reflection-docblock` included a change in release 3.2.0 which required a tag to be followed by a space. This conflicts with our use of the `@Group` annotation: ```php /** * @var \DateTime[] * @groups({"a", "b"}) */ public $collection; ``` Commits ------- 58d49f7 conflict for phpdocumentor/reflection-docblock 3.2
diff --git a/composer.json b/composer.json
@@ -95,7 +95,7 @@
         "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
         "phpdocumentor/type-resolver": "<0.2.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -33,7 +33,7 @@
         "doctrine/annotations": "~1.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
         "phpdocumentor/type-resolver": "<0.2.0"
     },
     "suggest": {
