diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
| commit | c95e9b9ba52b8376eea079850caf178e223a1a6d (patch) | |
| tree | d9f60eec35a69652311d46a7dbf3d1bb44871442 /composer.json | |
| parent | e1fe637dcd05f587a5974f5062fd4b2c31e109bb (diff) | |
| parent | 472a824a1eaef00759ebbdc506384e8d521e408e (diff) | |
| download | volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.gz volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.bz2 volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.zip | |
could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree.
also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically
change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file.
Merge branch 'dev' into red
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 e7577c41c..4e54720ff 100644 --- a/composer.json +++ b/composer.json @@ -34,11 +34,12 @@ "bshaffer/oauth2-server-php": "~1.8" }, "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" : { |