X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=composer.json;h=4e485e4e9975dcfa8afdd25c2a59e910cee143da;hb=0e2f4b682580ecf7d5c55044e484b98ea75f2047;hp=d587b721cb12641b5a74a153176b4eb50cfa4a64;hpb=08edeae2f996854d0028d0f73a08a1f3ee7741da;p=friendica.git diff --git a/composer.json b/composer.json index d587b721cb..4e485e4e99 100644 --- a/composer.json +++ b/composer.json @@ -32,36 +32,42 @@ "ezyang/htmlpurifier": "^4.7", "friendica/json-ld": "^1.0", "league/html-to-markdown": "^4.8", - "level-2/dice": "dev-master", + "level-2/dice": "^4", "lightopenid/lightopenid": "dev-master", + "matriphe/iso-639": "^1.2", "michelf/php-markdown": "^1.7", "mobiledetect/mobiledetectlib": "^2.8", "monolog/monolog": "^1.25", "nikic/fast-route": "^1.3", "paragonie/hidden-string": "^1.0", + "patrickschur/language-detection": "^3.4", "pear/console_table": "^1.3", - "pear/text_languagedetect": "1.*", + "phpseclib/phpseclib": "^2.0", "pragmarx/google2fa": "^5.0", "pragmarx/recovery": "^0.1.0", "psr/container": "^1.0", "seld/cli-prompt": "^1.0", "smarty/smarty": "^3.1", + "ua-parser/uap-php": "^3.9", + "xemlock/htmlpurifier-html5": "^0.1.11", "fxp/composer-asset-plugin": "^1.4", "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/textcomplete": "^0.18.2", + "npm-asset/typeahead.js": "^0.11.1" }, "repositories": [ { @@ -72,21 +78,24 @@ "autoload": { "psr-4": { "Friendica\\": "src/", - "Friendica\\Test\\": "tests/", "Friendica\\Addon\\": "addon/" }, - "psr-0": { - "": "library/" - }, "files": [ "include/conversation.php", "include/dba.php", "include/enotify.php", - "include/items.php", "boot.php" ] }, + "autoload-dev": { + "psr-4": { + "Friendica\\Test\\": "tests/" + } + }, "config": { + "platform": { + "php": "7.0" + }, "autoloader-suffix": "Friendica", "optimize-autoloader": true, "preferred-install": "dist", @@ -115,13 +124,14 @@ ] }, "require-dev": { - "phpdocumentor/reflection-docblock": "^3.0.2", - "phpunit/php-token-stream": "^1.4.2", - "mikey179/vfsstream": "^1.6", - "mockery/mockery": "^1.2", - "johnkary/phpunit-speedtrap": "1.1" + "mockery/mockery": "^1.3", + "mikey179/vfsstream": "^1.6" }, "scripts": { - "test": "phpunit" + "test": "phpunit", + "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l", + "cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer", + "cs:check": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"], + "cs:fix": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"] } }