diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
commit | 47d55694a4c84b6c12c0db61a69bcac8b671b20e (patch) | |
tree | b15e96f4ea67e2214a66a9d28dafaf53d25b98ec /composer.json | |
parent | 087f9784e3c5a860ed2b86e7f9e8e9f312038546 (diff) | |
parent | f0e615dee529e031663576286345141ad2996974 (diff) | |
download | volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.tar.gz volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.tar.bz2 volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.zip |
Merge branch '2.4RC'2.4
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/composer.json b/composer.json index abf583875..44606ff2b 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,20 @@ "ext-mbstring" : "*", "ext-xml" : "*", "ext-openssl" : "*", - "sabre/dav" : "~3.2" + "sabre/dav" : "~3.2", + "michelf/php-markdown" : "^1.7", + "pixel418/markdownify": "^2.2", + "bshaffer/oauth2-server-php": "^1.9", + "ezyang/htmlpurifier": "^4.9", + "simplepie/simplepie": "~1.5" }, "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" : { @@ -51,5 +57,9 @@ "minimum-stability" : "stable", "config" : { "notify-on-install" : false - } -}
\ No newline at end of file + }, + "repositories": [{ + "type": "vcs", + "url": "https://github.com/simplepie/simplepie" + }] +} |