aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json2
-rw-r--r--includes/DefaultSettings.php4
-rw-r--r--includes/api/ApiBase.php2
-rw-r--r--includes/libs/HtmlArmor.php2
-rw-r--r--includes/libs/http/HttpAcceptNegotiator.php2
-rw-r--r--includes/libs/http/HttpAcceptParser.php2
-rw-r--r--tests/phpunit/data/composer/composer.json2
-rw-r--r--tests/phpunit/data/composer/composer.lock8
-rw-r--r--tests/phpunit/data/composer/installed.json2
-rw-r--r--tests/phpunit/data/composer/new-composer.json2
-rw-r--r--tests/phpunit/includes/libs/composer/ComposerInstalledTest.php2
-rw-r--r--tests/phpunit/includes/libs/composer/ComposerLockTest.php8
12 files changed, 19 insertions, 19 deletions
diff --git a/composer.json b/composer.json
index 178c280c2f08..0569b0306982 100644
--- a/composer.json
+++ b/composer.json
@@ -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",
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index fad49e48c83e..538c1b25a9cb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -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 = [];
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 73315a096682..22202c0c11ed 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -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,
diff --git a/includes/libs/HtmlArmor.php b/includes/libs/HtmlArmor.php
index 1c141ab0bb0d..6e6ad7c9b42c 100644
--- a/includes/libs/HtmlArmor.php
+++ b/includes/libs/HtmlArmor.php
@@ -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>
*/
diff --git a/includes/libs/http/HttpAcceptNegotiator.php b/includes/libs/http/HttpAcceptNegotiator.php
index 84c1182c0cb0..4de8e77e394f 100644
--- a/includes/libs/http/HttpAcceptNegotiator.php
+++ b/includes/libs/http/HttpAcceptNegotiator.php
@@ -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
*/
diff --git a/includes/libs/http/HttpAcceptParser.php b/includes/libs/http/HttpAcceptParser.php
index bce071e726f3..df22b414f146 100644
--- a/includes/libs/http/HttpAcceptParser.php
+++ b/includes/libs/http/HttpAcceptParser.php
@@ -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
*/
diff --git a/tests/phpunit/data/composer/composer.json b/tests/phpunit/data/composer/composer.json
index bcd196f4fdd1..9b902ae8104a 100644
--- a/tests/phpunit/data/composer/composer.json
+++ b/tests/phpunit/data/composer/composer.json
@@ -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",
diff --git a/tests/phpunit/data/composer/composer.lock b/tests/phpunit/data/composer/composer.lock
index cae6a478a06d..5c030db8f4aa 100644
--- a/tests/phpunit/data/composer/composer.lock
+++ b/tests/phpunit/data/composer/composer.lock
@@ -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": [
{
diff --git a/tests/phpunit/data/composer/installed.json b/tests/phpunit/data/composer/installed.json
index ddac980156a4..88a6bae23775 100644
--- a/tests/phpunit/data/composer/installed.json
+++ b/tests/phpunit/data/composer/installed.json
@@ -30,7 +30,7 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT",
- "GPL-3.0"
+ "GPL-3.0-only"
],
"authors": [
{
diff --git a/tests/phpunit/data/composer/new-composer.json b/tests/phpunit/data/composer/new-composer.json
index 0634c2ddbffc..3a886769e2b5 100644
--- a/tests/phpunit/data/composer/new-composer.json
+++ b/tests/phpunit/data/composer/new-composer.json
@@ -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",
diff --git a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
index 23225b6b067d..05ae2a377b99 100644
--- a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
+++ b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
@@ -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',
diff --git a/tests/phpunit/includes/libs/composer/ComposerLockTest.php b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
index eef7e274a23a..dc81e1d38f22 100644
--- 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',
- '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. ' .
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 18:46:59 +0000