Skip to content

Commit 58d49f7

Browse files
committed
conflict for phpdocumentor/reflection-docblock 3.2
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; ```
1 parent d3ca508 commit 58d49f7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"sensio/framework-extra-bundle": "^3.0.2"
9696
},
9797
"conflict": {
98-
"phpdocumentor/reflection-docblock": "<3.0",
98+
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
9999
"phpdocumentor/type-resolver": "<0.2.0",
100100
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
101101
},

src/Symfony/Component/PropertyInfo/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"doctrine/annotations": "~1.0"
3434
},
3535
"conflict": {
36-
"phpdocumentor/reflection-docblock": "<3.0",
36+
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
3737
"phpdocumentor/type-resolver": "<0.2.0"
3838
},
3939
"suggest": {

0 commit comments

Comments
 (0)