Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 61 insertions, 0 deletions

diff --git a/tests/phpunit/includes/libs/composer/ComposerLockTest.php b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
index b5fd5f6e..cac3b101 100644
--- a/tests/phpunit/includes/libs/composer/ComposerLockTest.php
+++ b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
@@ -27,34 +27,95 @@ class ComposerLockTest extends MediaWikiTestCase {
 			'wikimedia/cdb' => array(
 				'version' => '1.0.1',
 				'type' => 'library',
+				'licenses' => array( 'GPL-2.0' ),
+				'authors' => array(
+					array(
+						'name' => 'Tim Starling',
+						'email' => 'tstarling@wikimedia.org',
+					),
+					array(
+						'name' => 'Chad Horohoe',
+						'email' => 'chad@wikimedia.org',
+					),
+				),
+				'description' => 'Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.',
 			),
 			'cssjanus/cssjanus' => array(
 				'version' => '1.1.1',
 				'type' => 'library',
+				'licenses' => array( 'Apache-2.0' ),
+				'authors' => array(),
+				'description' => 'Convert CSS stylesheets between left-to-right and right-to-left.',
 			),
 			'leafo/lessphp' => array(
 				'version' => '0.5.0',
 				'type' => 'library',
+				'licenses' => array( 'MIT', 'GPL-3.0' ),
+				'authors' => array(
+					array(
+						'name' => 'Leaf Corcoran',
+						'email' => 'leafot@gmail.com',
+						'homepage' => 'http://leafo.net',
+					),
+				),
+				'description' => 'lessphp is a compiler for LESS written in PHP.',
 			),
 			'psr/log' => array(
 				'version' => '1.0.0',
 				'type' => 'library',
+				'licenses' => array( 'MIT' ),
+				'authors' => array(
+					array(
+						'name' => 'PHP-FIG',
+						'homepage' => 'http://www.php-fig.org/',
+					),
+				),
+				'description' => 'Common interface for logging libraries',
 			),
 			'oojs/oojs-ui' => array(
 				'version' => '0.6.0',
 				'type' => 'library',
+				'licenses' => array( 'MIT' ),
+				'authors' => array(),
+				'description' => '',
 			),
 			'composer/installers' => array(
 				'version' => '1.0.19',
 				'type' => 'composer-installer',
+				'licenses' => array( 'MIT' ),
+				'authors' => array(
+					array(
+						'name' => 'Kyle Robinson Young',
+						'email' => 'kyle@dontkry.com',
+						'homepage' => 'https://github.com/shama',
+					),
+				),
+				'description' => 'A multi-framework Composer library installer',
 			),
 			'mediawiki/translate' => array(
 				'version' => '2014.12',
 				'type' => 'mediawiki-extension',
+				'licenses' => array( 'GPL-2.0+' ),
+				'authors' => array(
+					array(
+						'name' => 'Niklas Laxström',
+						'email' => 'niklas.laxstrom@gmail.com',
+						'role' => 'Lead nitpicker',
+					),
+					array(
+						'name' => 'Siebrand Mazeland',
+						'email' => 's.mazeland@xs4all.nl',
+						'role' => 'Developer',
+					),
+				),
+				'description' => 'The only standard solution to translate any kind of text with an avant-garde web interface within MediaWiki, including your documentation and software',
 			),
 			'mediawiki/universal-language-selector' => array(
 				'version' => '2014.12',
 				'type' => 'mediawiki-extension',
+				'licenses' => array( 'GPL-2.0+', 'MIT' ),
+				'authors' => array(),
+				'description' => 'The primary aim is to allow users to select a language and configure its support in an easy way. Main features are language selection, input methods and web fonts.',
 			),
 		), $lock->getInstalledDependencies(), false, true );
 	}