From: Bryan Davis <bd808@wikimedia.org>
Date: Tue, 30 Dec 2014 23:42:32 +0000 (-0700)
Subject: Introduce Composer merge plugin
X-Git-Tag: 1.31.0-rc.0~12746
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=578f2cc8b0c189b77fb251c60af5ccd990d9612e;p=lhc%2Fweb%2Fwiklou.git

Introduce Composer merge plugin

Require Composer merge plugin to allow easier local Composer dependency
management without composer.json edit conflicts. The configuration
provided will merge Composer configuration directives found in
a `composer.local.json` config file into those specified by MediaWiki's
composer.json file at Composer runtime.

Bug: T67188
Change-Id: I66a19d0154191e536aab37a5e183e4505bf3e9be
---

diff --git a/.gitignore b/.gitignore
index 93c429fc0a..550f017269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ node_modules/
 /vendor
 /composer.lock
 /composer.json
+/composer.local.json
 
 # MediaWiki UI documentation
 /docs/kss/static
diff --git a/composer.json b/composer.json
index 6591ac7f78..4717aa90c9 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,13 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
+		"cssjanus/cssjanus": "1.1.1",
 		"leafo/lessphp": "0.5.0",
+		"oojs/oojs-ui": "0.6.1",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
-		"cssjanus/cssjanus": "1.1.1",
 		"wikimedia/cdb": "1.0.1",
-		"oojs/oojs-ui": "0.6.1"
+		"wikimedia/composer-merge-plugin": "0.5.0"
 	},
 	"require-dev": {
 		"justinrainbow/json-schema": "~1.3",
@@ -46,5 +47,12 @@
 	"config": {
 		"prepend-autoloader": false,
 		"optimize-autoloader": true
+	},
+	"extra": {
+		"merge-plugin": {
+			"include": [
+				"composer.local.json"
+			]
+		}
 	}
 }