Merge branch '2020.06-rc' into stable

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

diff --git a/composer.json b/composer.json
index e372547..2cb863c 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -50,18 +50,19 @@
                "bower-asset/base64": "^1.0",
                "bower-asset/chart-js": "^2.8",
                "bower-asset/dompurify": "^1.0",
-               "bower-asset/perfect-scrollbar": "^0.6",
+               "bower-asset/fork-awesome": "^1.1",
                "bower-asset/vue": "^2.6",
+               "npm-asset/cropperjs": "1.2.2",
+               "npm-asset/es-jquery-sortable": "^0.9.13",
+               "npm-asset/fullcalendar": "^3.10",
+               "npm-asset/imagesloaded": "4.1.4",
                "npm-asset/jquery": "^2.0",
                "npm-asset/jquery-colorbox": "^1.6",
                "npm-asset/jquery-datetimepicker": "^2.5",
                "npm-asset/jgrowl": "^1.4",
                "npm-asset/moment": "^2.24",
-               "npm-asset/fullcalendar": "^3.10",
-               "npm-asset/cropperjs": "1.2.2",
-               "npm-asset/imagesloaded": "4.1.4",
-               "npm-asset/typeahead.js": "^0.11.1",
-               "bower-asset/fork-awesome": "^1.1"
+               "npm-asset/perfect-scrollbar": "0.6.16",
+               "npm-asset/typeahead.js": "^0.11.1"
        },
        "repositories": [
                {
@@ -72,7 +73,6 @@
        "autoload": {
                "psr-4": {
                        "Friendica\\": "src/",
-                       "Friendica\\Test\\": "tests/",
                        "Friendica\\Addon\\": "addon/"
                },
                "psr-0": {
@@ -86,7 +86,15 @@
                        "boot.php"
                ]
        },
+       "autoload-dev": {
+               "psr-4": {
+                       "Friendica\\Test\\": "tests/"
+               }
+       },
        "config": {
+               "platform": {
+                       "php": "7.0"
+               },
                "autoloader-suffix": "Friendica",
                "optimize-autoloader": true,
                "preferred-install": "dist",
@@ -119,7 +127,8 @@
                "phpunit/php-token-stream": "^1.4.2",
                "mikey179/vfsstream": "^1.6",
                "mockery/mockery": "^1.2",
-               "johnkary/phpunit-speedtrap": "1.1"
+               "johnkary/phpunit-speedtrap": "1.1",
+               "jakub-onderka/php-parallel-lint": "^1.0"
        },
        "scripts": {
                "test": "phpunit"