diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow phpdocumentor/reflection-docblock >=3.2.1

Browse Source
This commit is contained in:
Christian Flothmann 2017-08-05 08:05:00 +02:00
parent f693fcd2ea
commit 2f3ac8f53e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -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"
},

2
src/Symfony/Component/PropertyInfo/composer.json
View File

@ -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"
},