allow phpdocumentor/reflection-docblock >=3.2.1
This commit is contained in:
parent
f693fcd2ea
commit
2f3ac8f53e
@ -102,7 +102,7 @@
|
||||
"sensio/framework-extra-bundle": "^3.0.2"
|
||||
},
|
||||
"conflict": {
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
|
||||
"phpdocumentor/type-resolver": "<0.2.0",
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
|
@ -34,7 +34,7 @@
|
||||
"doctrine/annotations": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
|
||||
"phpdocumentor/type-resolver": "<0.2.0",
|
||||
"symfony/dependency-injection": "<3.3"
|
||||
},
|
||||
|
Reference in New Issue
Block a user