summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-11 08:58:21 +0100
committerRemi Collet <remi@remirepo.net>2017-11-11 08:58:21 +0100
commit645119efd1397fc824fdc362c6206cfc3c8183aa (patch)
tree1a118be779dba34f6a71d2f3afe4d4ceafd90a0b /composer.json
parentd84d49636501735826f7d09e2be09e1710da41a1 (diff)
v3.3.11
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index d55f29f..1c8a702 100644
--- a/composer.json
+++ b/composer.json
@@ -87,6 +87,7 @@
},
"require-dev": {
"cache/integration-tests": "dev-master",
+ "doctrine/annotations": "~1.0",
"doctrine/cache": "~1.6",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
@@ -103,7 +104,7 @@
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
- "phpdocumentor/type-resolver": "<0.2.0",
+ "phpdocumentor/type-resolver": "<0.2.1",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
"provide": {