From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 2 Jan 2019 10:34:19 +0000 (+0000)
Subject: Merge "Revert "build: Run minus-x to check for executable files that shouldn't be""
X-Git-Tag: 1.34.0-rc.0~3170
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=a98f08bfddf6db33f5ac69a2408c1219fa0054dd;hp=06b70bbb47108545105be9065fe74302d1f82f05;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert "build: Run minus-x to check for executable files that shouldn't be""
---

diff --git a/.minus-x.json b/.minus-x.json
deleted file mode 100644
index 831a8abbf3..0000000000
--- a/.minus-x.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"ignoreDirectories": [
-		"./extensions",
-		"./images",
-		"./skins"
-	]
-}
diff --git a/composer.json b/composer.json
index 97c5183ff1..88f5daa590 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,6 @@
 		"jetbrains/phpstorm-stubs": "dev-master#38ff1a581b297f7901e961b8c923862ea80c3b96",
 		"justinrainbow/json-schema": "~5.2",
 		"mediawiki/mediawiki-codesniffer": "23.0.0",
-		"mediawiki/minus-x": "0.3.2",
 		"monolog/monolog": "~1.22.1",
 		"nikic/php-parser": "3.1.3",
 		"seld/jsonlint": "1.7.1",
@@ -105,19 +104,14 @@
 	"scripts": {
 		"lint": "parallel-lint --exclude vendor",
 		"phpcs": "phpcs -p -s",
-		"minus-x": "minus-x check",
-		"fix": [
-			"phpcbf",
-			"minus-x fix"
-		],
+		"fix": "phpcbf",
 		"pre-install-cmd": "ComposerHookHandler::onPreInstall",
 		"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
 		"post-install-cmd": "ComposerVendorHtaccessCreator::onEvent",
 		"post-update-cmd": "ComposerVendorHtaccessCreator::onEvent",
 		"test": [
 			"composer lint",
-			"composer phpcs",
-			"composer minus-x"
+			"composer phpcs"
 		]
 	},
 	"config": {