summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-02 14:18:02 +0200
committerRemi Collet <remi@remirepo.net>2019-10-02 14:18:02 +0200
commitedc780d93257c213b834ef773d8d4a3c0d7fdd9b (patch)
treee565d52f7b5f308853a67cd2c9b0d24b12cb116d /composer.json
parent79007103f51a1a22a735891ffef4c01e0c07fff3 (diff)
- update to 6.0.0
- raise dependency to PHP 7.2
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 83e12ba..f786366 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
],
"require": {
- "php": "^7.1, <7.4",
+ "php": "^7.2, <7.4",
"phpspec/prophecy": "^1.7",
"phpspec/php-diff": "^1.0.0",
"sebastian/exporter": "^1.0 || ^2.0 || ^3.0",
@@ -45,6 +45,10 @@
"phpspec/nyan-formatters": "Adds Nyan formatters"
},
+ "conflict": {
+ "sebastian/comparator" : "<1.2.4"
+ },
+
"autoload": {
"psr-0": {
"PhpSpec": "src/"
@@ -61,7 +65,7 @@
"extra": {
"branch-alias": {
- "dev-master": "5.1.x-dev"
+ "dev-master": "6.0.x-dev"
}
}