From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 composer.json | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 8389f007..a9cc4365 100644
--- a/composer.json
+++ b/composer.json
@@ -9,24 +9,63 @@
 			"homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
 		}
 	],
-	"license": "GPL-2.0",
+	"license": "GPL-2.0+",
 	"support": {
-		"issues": "https://bugzilla.wikimedia.org/",
+		"issues": "https://bugs.mediawiki.org/",
 		"irc": "irc://irc.freenode.net/mediawiki",
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
-		"php": ">=5.3.2",
-		"psr/log": "1.0.0"
+		"cssjanus/cssjanus": "1.1.1",
+		"ext-iconv": "*",
+		"leafo/lessphp": "0.5.0",
+		"liuggio/statsd-php-client": "1.0.12",
+		"oojs/oojs-ui": "0.11.3",
+		"php": ">=5.3.3",
+		"psr/log": "1.0.0",
+		"wikimedia/cdb": "1.0.1",
+		"wikimedia/composer-merge-plugin": "1.0.0",
+		"wikimedia/utfnormal": "1.0.2",
+		"zordius/lightncandy": "0.18"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "*"
+		"jakub-onderka/php-parallel-lint": "~0.8",
+		"justinrainbow/json-schema": "~1.3",
+		"phpunit/phpunit": "~4.5",
+		"mediawiki/mediawiki-codesniffer": "0.1.0"
 	},
 	"suggest": {
 		"ext-fileinfo": "*",
+		"ext-intl": "*",
 		"ext-mbstring": "*",
 		"ext-wikidiff2": "*",
 		"ext-apc": "*",
 		"monolog/monolog": "*"
+	},
+	"autoload": {
+		"psr-0": {
+			"ComposerHookHandler": "includes/composer"
+		}
+	},
+	"scripts": {
+		"lint": "parallel-lint --exclude vendor",
+		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor --encoding=utf-8 --extensions=php,php5,inc,sample",
+		"test": [
+			"composer lint",
+			"composer phpcs"
+		],
+		"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
+		"pre-install-cmd": "ComposerHookHandler::onPreInstall"
+	},
+	"config": {
+		"prepend-autoloader": false,
+		"optimize-autoloader": true
+	},
+	"extra": {
+		"merge-plugin": {
+			"include": [
+				"composer.local.json"
+			]
+		}
 	}
 }
-- 
cgit v1.2.2