Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SPDX 3.0 license identifier

Browse source 
SPDX released version 3 of their license list (<https://spdx.org/licenses/>),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I4cbb98ea2bbacf46a57401dbba2bdb076fca1d3a
This commit is contained in:
Kunal Mehta 2018-03-05 17:14:07 -08:00 committed by Umherirrender
parent 26a38eb714
commit 2d5c742db3
12 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -9,7 +9,7 @@
"homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
}
],
"license": "GPL-2.0+",
"license": "GPL-2.0-or-later",
"support": {
"issues": "https://bugs.mediawiki.org/",
"irc": "irc://irc.freenode.net/mediawiki",

4
includes/DefaultSettings.php
View file

@ -7335,7 +7335,7 @@ $wgAutoloadAttemptLowercase = true;
* 'version' => '1.9.0',
* 'url' => 'https://example.org/example-extension/',
* 'descriptionmsg' => 'exampleextension-desc',
* 'license-name' => 'GPL-2.0+',
* 'license-name' => 'GPL-2.0-or-later',
* ];
* @endcode
*
@ -7369,7 +7369,7 @@ $wgAutoloadAttemptLowercase = true;
* localizable message (omit in favour of 'descriptionmsg').
*
* - license-name: Short name of the license (used as label for the link), such
* as "GPL-2.0+" or "MIT" (https://spdx.org/licenses/ for a list of identifiers).
* as "GPL-2.0-or-later" or "MIT" (https://spdx.org/licenses/ for a list of identifiers).
*/
$wgExtensionCredits = [];

2
includes/api/ApiBase.php
View file

@ -2465,7 +2465,7 @@ abstract class ApiBase extends ContextSource {
realpath( __DIR__ ) ?: __DIR__ => [
'path' => $IP,
'name' => 'MediaWiki',
'license-name' => 'GPL-2.0+',
'license-name' => 'GPL-2.0-or-later',
],
realpath( "$IP/extensions" ) ?: "$IP/extensions" => null,
realpath( $extDir ) ?: $extDir => null,

2
includes/libs/HtmlArmor.php
View file

@ -16,7 +16,7 @@
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @license GPL-2.0+
* @license GPL-2.0-or-later
* @author Kunal Mehta <legoktm@member.fsf.org>
*/

2
includes/libs/http/HttpAcceptNegotiator.php
View file

@ -10,7 +10,7 @@ namespace Wikimedia\Http;
* To use this with a request header, first parse the header value into an array of weights
* using HttpAcceptParser, then call getBestSupportedKey.
*
* @license GPL-2.0+
* @license GPL-2.0-or-later
* @author Daniel Kinzler
* @author Thiemo Kreuz
*/

2
includes/libs/http/HttpAcceptParser.php
View file

@ -4,7 +4,7 @@
* Utility for parsing a HTTP Accept header value into a weight map. May also be used with
* other, similar headers like Accept-Language, Accept-Encoding, etc.
*
* @license GPL-2.0+
* @license GPL-2.0-or-later
* @author Daniel Kinzler
*/

2
tests/phpunit/data/composer/composer.json
View file

@ -9,7 +9,7 @@
"homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
}
],
"license": "GPL-2.0",
"license": "GPL-2.0-only",
"support": {
"issues": "https://bugzilla.wikimedia.org/",
"irc": "irc://irc.freenode.net/mediawiki",

8
tests/phpunit/data/composer/composer.lock generated
View file

@ -162,7 +162,7 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT",
"GPL-3.0"
"GPL-3.0-only"
],
"authors": [
{
@ -207,7 +207,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
"GPL-2.0-or-later"
],
"authors": [
{
@ -265,7 +265,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+",
"GPL-2.0-or-later",
"MIT"
],
"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.",
@ -374,7 +374,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0"
"GPL-2.0-only"
],
"authors": [
{

2
tests/phpunit/data/composer/installed.json
View file

@ -30,7 +30,7 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT",
"GPL-3.0"
"GPL-3.0-only"
],
"authors": [
{

2
tests/phpunit/data/composer/new-composer.json
View file

@ -9,7 +9,7 @@
"homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
}
],
"license": "GPL-2.0",
"license": "GPL-2.0-only",
"support": {
"issues": "https://bugzilla.wikimedia.org/",
"irc": "irc://irc.freenode.net/mediawiki",

2
tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
View file

@ -20,7 +20,7 @@ class ComposerInstalledTest extends MediaWikiTestCase {
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
'licenses' => [ 'MIT', 'GPL-3.0' ],
'licenses' => [ 'MIT', 'GPL-3.0-only' ],
'authors' => [
[
'name' => 'Leaf Corcoran',

8
tests/phpunit/includes/libs/composer/ComposerLockTest.php
View file

@ -20,7 +20,7 @@ class ComposerLockTest extends MediaWikiTestCase {
'wikimedia/cdb' => [
'version' => '1.0.1',
'type' => 'library',
'licenses' => [ 'GPL-2.0' ],
'licenses' => [ 'GPL-2.0-only' ],
'authors' => [
[
'name' => 'Tim Starling',
@ -44,7 +44,7 @@ class ComposerLockTest extends MediaWikiTestCase {
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
'licenses' => [ 'MIT', 'GPL-3.0' ],
'licenses' => [ 'MIT', 'GPL-3.0-only' ],
'authors' => [
[
'name' => 'Leaf Corcoran',
@ -89,7 +89,7 @@ class ComposerLockTest extends MediaWikiTestCase {
'mediawiki/translate' => [
'version' => '2014.12',
'type' => 'mediawiki-extension',
'licenses' => [ 'GPL-2.0+' ],
'licenses' => [ 'GPL-2.0-or-later' ],
'authors' => [
[
'name' => 'Niklas Laxström',
@ -109,7 +109,7 @@ class ComposerLockTest extends MediaWikiTestCase {
'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. ' .