summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-04-01 10:07:19 +0200
committerRemi Collet <fedora@famillecollet.com>2017-04-01 10:07:19 +0200
commita0f48d5611835b0920dbe19e49e0c349ce3d5255 (patch)
treedba5cf3f76791c2e9f5a3af9b46c8292bc5064cd /composer.json
parentfa143b9f906c321b3a31e1c594a5b960d482b533 (diff)
v2.2.0
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json17
1 files changed, 12 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index fa6da1d..1df3181 100644
--- a/composer.json
+++ b/composer.json
@@ -15,12 +15,14 @@
],
"require": {
"php": "^5.3.6 || >=7.0 <7.2",
+ "doctrine/annotations": "^1.2",
"ext-tokenizer": "*",
"sebastian/diff": "^1.1",
- "symfony/console": "^2.3 || ^3.0",
+ "symfony/console": "^2.4 || ^3.0",
"symfony/event-dispatcher": "^2.1 || ^3.0",
"symfony/filesystem": "^2.4 || ^3.0",
"symfony/finder": "^2.2 || ^3.0",
+ "symfony/options-resolver": "^2.6 || ^3.0",
"symfony/polyfill-php54": "^1.0",
"symfony/polyfill-php55": "^1.3",
"symfony/polyfill-php70": "^1.0",
@@ -33,15 +35,15 @@
"justinrainbow/json-schema": "^5.0",
"phpunit/phpunit": "^4.5 || ^5.0",
"satooshi/php-coveralls": "^1.0",
- "symfony/phpunit-bridge": "^3.2"
+ "symfony/phpunit-bridge": "^3.2.2"
},
"suggest": {
- "ext-mbstring": "For handling non-UTF8 characters in cache singature.",
+ "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
"ext-xml": "For better performance.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"conflict": {
- "hhvm": "<3.9"
+ "hhvm": "<3.18"
},
"config": {
"sort-packages": true
@@ -52,5 +54,10 @@
"autoload-dev": {
"psr-4": { "PhpCsFixer\\Tests\\": "tests/" }
},
- "bin": ["php-cs-fixer"]
+ "bin": ["php-cs-fixer"],
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev"
+ }
+ }
}