dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resources: Strip '$' and 'mw' from file closures"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
composer
/
ComposerLockTest.php
diff --git
a/tests/phpunit/includes/libs/composer/ComposerLockTest.php
b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
index
eef7e27
..
c765438
100644
(file)
--- a/
tests/phpunit/includes/libs/composer/ComposerLockTest.php
+++ b/
tests/phpunit/includes/libs/composer/ComposerLockTest.php
@@
-20,7
+20,7
@@
class ComposerLockTest extends MediaWikiTestCase {
'wikimedia/cdb' => [
'version' => '1.0.1',
'type' => 'library',
'wikimedia/cdb' => [
'version' => '1.0.1',
'type' => 'library',
- 'licenses' => [ 'GPL-2.0' ],
+ 'licenses' => [ 'GPL-2.0
-only
' ],
'authors' => [
[
'name' => 'Tim Starling',
'authors' => [
[
'name' => 'Tim Starling',
@@
-31,7
+31,7
@@
class ComposerLockTest extends MediaWikiTestCase {
'email' => 'chad@wikimedia.org',
],
],
'email' => 'chad@wikimedia.org',
],
],
- 'description' => 'Constant Database (CDB) wrapper library for PHP. '.
+ 'description' => 'Constant Database (CDB) wrapper library for PHP. '
.
'Provides pure-PHP fallback when dba_* functions are absent.',
],
'cssjanus/cssjanus' => [
'Provides pure-PHP fallback when dba_* functions are absent.',
],
'cssjanus/cssjanus' => [
@@
-44,7
+44,7
@@
class ComposerLockTest extends MediaWikiTestCase {
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
- 'licenses' => [ 'MIT', 'GPL-3.0' ],
+ 'licenses' => [ 'MIT', 'GPL-3.0
-only
' ],
'authors' => [
[
'name' => 'Leaf Corcoran',
'authors' => [
[
'name' => 'Leaf Corcoran',
@@
-89,7
+89,7
@@
class ComposerLockTest extends MediaWikiTestCase {
'mediawiki/translate' => [
'version' => '2014.12',
'type' => 'mediawiki-extension',
'mediawiki/translate' => [
'version' => '2014.12',
'type' => 'mediawiki-extension',
- 'licenses' => [ 'GPL-2.0
+
' ],
+ 'licenses' => [ 'GPL-2.0
-or-later
' ],
'authors' => [
[
'name' => 'Niklas Laxström',
'authors' => [
[
'name' => 'Niklas Laxström',
@@
-109,7
+109,7
@@
class ComposerLockTest extends MediaWikiTestCase {
'mediawiki/universal-language-selector' => [
'version' => '2014.12',
'type' => 'mediawiki-extension',
'mediawiki/universal-language-selector' => [
'version' => '2014.12',
'type' => 'mediawiki-extension',
- 'licenses' => [ 'GPL-2.0
+
', 'MIT' ],
+ 'licenses' => [ 'GPL-2.0
-or-later
', 'MIT' ],
'authors' => [],
'description' => 'The primary aim is to allow users to select a language ' .
'and configure its support in an easy way. ' .
'authors' => [],
'description' => 'The primary aim is to allow users to select a language ' .
'and configure its support in an easy way. ' .