diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-15 16:02:45 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-15 16:02:45 -0700 |
| commit | 472a824a1eaef00759ebbdc506384e8d521e408e (patch) | |
| tree | 1ec27204ee2df0bf2d049291b1c0a7b06e0a1dee /composer.json | |
| parent | 2dce86d38e58c0fc88c252d0a7f0b1b83a960451 (diff) | |
| parent | 16df1c1ad4251db369a9b90889c12c186a2f12fb (diff) | |
| download | volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.tar.gz volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.tar.bz2 volse-hubzilla-472a824a1eaef00759ebbdc506384e8d521e408e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 7 |
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" : { |