Merge remote-tracking branch 'upstream/develop' into post-delivery-data

[friendica.git] / composer.json

diff --git a/composer.json b/composer.json
index 915c2b08ccc0fe8e52c032f8efea9bfc905aa498..108ea8473ded3b1a1b1ec1ea80b5a9cbe4c759f4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,6 @@
        "autoload": {
                "psr-4": {
                        "Friendica\\": "src/",
-                       "Friendica\\Test\\": "tests/",
                        "Friendica\\Addon\\": "addon/"
                },
                "psr-0": {
@@ -87,6 +86,11 @@
                        "boot.php"
                ]
        },
+       "autoload-dev": {
+               "psr-4": {
+                       "Friendica\\Test\\": "tests/"
+               }
+       },
        "config": {
                "autoloader-suffix": "Friendica",
                "optimize-autoloader": true,
@@ -120,7 +124,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"