aboutsummaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-16 09:46:09 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-16 09:46:09 +0100
commit4c2bdc9dc021418563040929fbd0363e08591f9f (patch)
tree64d832524131b7a40d83baf5770e29fe2942d8e0 /composer.json
parenta73ea134cd09af039e01e4f6ae7f455ecb76279e (diff)
parent16df1c1ad4251db369a9b90889c12c186a2f12fb (diff)
downloadvolse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.tar.gz
volse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.tar.bz2
volse-hubzilla-4c2bdc9dc021418563040929fbd0363e08591f9f.zip
Merge branch 'dev' into bs4
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json7
1 files changed, 4 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index b59c81bba..868a89d19 100644
--- a/composer.json
+++ b/composer.json
@@ -33,11 +33,12 @@
"pixel418/markdownify": "^2.2"
},
"require-dev" : {
- "php" : ">=5.6",
- "phpunit/phpunit" : "^5.6",
+ "php" : ">=7.0",
+ "phpunit/phpunit" : "^6.0",
"behat/behat" : "@stable",
"behat/mink-extension": "@stable",
- "behat/mink-goutte-driver": "@stable"
+ "behat/mink-goutte-driver": "@stable",
+ "php-mock/php-mock-phpunit": "^2.0"
},
"autoload" : {
"psr-4" : {