summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
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 75e9c91..8730dd6 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
],
"require": {
"php": ">=5.5.9",
+ "ext-xml": "*",
"doctrine/common": "~2.4",
"twig/twig": "~1.34|~2.4",
"psr/cache": "~1.0",
@@ -94,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"
},