From: Bryan Davis <bd808@wikimedia.org>
Date: Fri, 21 Mar 2014 04:10:46 +0000 (-0600)
Subject: Add Composer managed libraries
X-Git-Tag: 1.31.0-rc.0~15559
X-Git-Url: http://git.cyclocoop.org/%27.generer_url_ecrire%28%27admin_couteau_suisse%27%2C%27cmd=descrip&outil=boites_privees?a=commitdiff_plain;h=dd8dfe80152c21b170c83a131d537d384073c79e;p=lhc%2Fweb%2Fwiklou.git

Add Composer managed libraries

This is the initial step towards implementing the Structured logging RFC
[0].

The Psr\Log library is declared as a requirement in the composer.json
file and Monolog is suggested as a package that can enhance MediaWiki.

To use this in a local checkout:
* Install composer [1]
* `composer update`
* `composer require monolog/monolog 1.9.*`
* `composer dump-autoload --optimize`
* `git update-index --assume-unchanged composer.json`

Additional work will be needed to provide both the Psr\Log and Monolog
libraries available for deployment to the Wikimedia Foundation servers.
The Psr\Log library will also need to be packaged in the release
tarballs.

[0]: https://www.mediawiki.org/wiki/Requests_for_comment/Structured_logging
[1]: https://getcomposer.org/doc/00-intro.md#installation-nix

See also: I1431b24 (Monolithic implementation)

Change-Id: Ie667944416187cfd2ae6016c9e2fa28f4204bcd7
---

diff --git a/composer.json b/composer.json
index ded3365261..8389f0070f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
-		"php": ">=5.3.2"
+		"php": ">=5.3.2",
+		"psr/log": "1.0.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "*"
@@ -25,6 +26,7 @@
 		"ext-fileinfo": "*",
 		"ext-mbstring": "*",
 		"ext-wikidiff2": "*",
-		"ext-apc": "*"
+		"ext-apc": "*",
+		"monolog/monolog": "*"
 	}
 }