diff options
author | zotlabs <mike@macgirvin.com> | 2016-10-18 16:29:36 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2016-10-18 16:29:36 -0700 |
commit | d55fcd055d878d29864bdf609f6e3f26e24837d0 (patch) | |
tree | d29747f3b2fba12d686084c91136a4dc7b9f52a9 /composer.json | |
parent | 9e3032e919e4778aff99c2fac7b1bb102aa6c934 (diff) | |
parent | c2e299440380f04c55dc4cd77ea8e0ac6d09af53 (diff) | |
download | volse-hubzilla-d55fcd055d878d29864bdf609f6e3f26e24837d0.tar.gz volse-hubzilla-d55fcd055d878d29864bdf609f6e3f26e24837d0.tar.bz2 volse-hubzilla-d55fcd055d878d29864bdf609f6e3f26e24837d0.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/composer.json b/composer.json index 7326fbc6e..abf583875 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,15 @@ "ext-gd" : "*", "ext-mbstring" : "*", "ext-xml" : "*", - "sabre/dav" : "~3.2", - "ext-openssl" : "*" + "ext-openssl" : "*", + "sabre/dav" : "~3.2" + }, + "require-dev" : { + "php" : ">=5.6", + "phpunit/phpunit" : "^5.6", + "behat/behat" : "@stable", + "behat/mink-extension": "@stable", + "behat/mink-goutte-driver": "@stable" }, "autoload" : { "psr-4" : { @@ -36,8 +43,13 @@ "Zotlabs\\" : "Zotlabs/" } }, + "autoload-dev" : { + "psr-4" : { + "Zotlabs\\Tests\\Unit\\" : "tests/unit" + } + }, "minimum-stability" : "stable", "config" : { "notify-on-install" : false } -} +}
\ No newline at end of file |