summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-09-12 07:20:45 +0200
committerRemi Collet <remi@remirepo.net>2017-09-12 07:20:45 +0200
commit497ad880d96b5264464962773bdd75fc02d8a16a (patch)
tree5f51f493965c71f2de24ed7358719ca14b39ca73 /composer.json
parentdf5bada935d619b2a5b258873ce72484efa882dd (diff)
Update to 2.6.0
add dependency on composer/semver
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 7 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index babbe95..e3d1045 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
"php": "^5.6 || >=7.0 <7.2",
"ext-json": "*",
"ext-tokenizer": "*",
+ "composer/semver": "^1.4",
"doctrine/annotations": "^1.2",
"gecko-packages/gecko-php-unit": "^2.0",
"sebastian/diff": "^1.4",
@@ -62,5 +63,10 @@
"autoload-dev": {
"psr-4": { "PhpCsFixer\\Tests\\": "tests/" }
},
- "bin": ["php-cs-fixer"]
+ "bin": ["php-cs-fixer"],
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev"
+ }
+ }
}