Merge branch '2018.08-rc'

[friendica.git/.git] / composer.json

diff --git a/composer.json b/composer.json
index 941464e..c717775 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -13,18 +13,17 @@
                "issues": "https://github.com/friendica/friendica/issues"
        },
        "require": {
-               "php": ">5.6",
+               "php": ">=5.6.1",
                "ext-xml": "*",
                "asika/simple-console": "^1.0",
                "divineomega/password_exposed": "^2.4",
                "ezyang/htmlpurifier": "~4.7.0",
-               "league/html-to-markdown": "~4.4.1",
+               "league/html-to-markdown": "~4.8.0",
                "lightopenid/lightopenid": "dev-master",
                "michelf/php-markdown": "^1.7",
                "mobiledetect/mobiledetectlib": "2.8.*",
                "paragonie/random_compat": "^2.0",
                "pear/Text_LanguageDetect": "1.*",
-               "pear/Text_Highlighter": "dev-master",
                "seld/cli-prompt": "^1.0",
                "smarty/smarty": "^3.1",
                "fxp/composer-asset-plugin": "~1.3",
@@ -74,7 +73,8 @@
        "require-dev": {
                "phpunit/dbunit": "^2.0",
                "phpdocumentor/reflection-docblock": "^3.0.2",
-               "phpunit/php-token-stream": "^1.4.2"
+               "phpunit/php-token-stream": "^1.4.2",
+               "mikey179/vfsStream": "^1.6"
        },
        "scripts": {
                "test": "phpunit"