X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=composer.json;h=4e485e4e9975dcfa8afdd25c2a59e910cee143da;hb=acda145ceee17ea9bfc21b5733313547535fd10e;hp=20cbe46a773d42b5ac989baf4097375da05f7647;hpb=6d47324342782064df4716e5bd46b1489b0d6e08;p=friendica.git%2F.git

diff --git a/composer.json b/composer.json
index 20cbe46a77..4e485e4e99 100644
--- a/composer.json
+++ b/composer.json
@@ -34,34 +34,40 @@
 		"league/html-to-markdown": "^4.8",
 		"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/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": [
 		{
@@ -74,14 +80,10 @@
 			"Friendica\\": "src/",
 			"Friendica\\Addon\\": "addon/"
 		},
-		"psr-0": {
-			"": "library/"
-		},
 		"files": [
 			"include/conversation.php",
 			"include/dba.php",
 			"include/enotify.php",
-			"include/items.php",
 			"boot.php"
 		]
 	},
@@ -91,6 +93,9 @@
 		}
 	},
 	"config": {
+		"platform": {
+			"php": "7.0"
+		},
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,
 		"preferred-install": "dist",
@@ -119,14 +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",
-		"jakub-onderka/php-parallel-lint": "^1.0"
+		"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"]
 	}
 }