From e0193327bd2661fc68a7b3541cf977f2baf0ac4f Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 23 May 2018 16:23:42 -0700 Subject: [PATCH] Fix MediaWiki.Commenting.LicenseComment.InvalidLicenseTag errors Change-Id: I936c3f5fca1a0061f215e80469f5d882cb32ee29 --- .phpcs.xml | 1 - includes/cache/CacheHelper.php | 2 +- includes/composer/ComposerHookHandler.php | 2 +- includes/composer/ComposerPackageModifier.php | 2 +- includes/composer/ComposerVersionNormalizer.php | 2 +- includes/dao/DBAccessBase.php | 2 +- includes/interwiki/InterwikiLookupAdapter.php | 2 +- includes/libs/CSSMin.php | 2 +- includes/libs/GenericArrayObject.php | 2 +- includes/libs/JavaScriptMinifier.php | 5 ++++- includes/logging/BlockLogFormatter.php | 2 +- includes/logging/DeleteLogFormatter.php | 2 +- includes/logging/ImportLogFormatter.php | 2 +- includes/logging/LogEntry.php | 2 +- includes/logging/LogFormatter.php | 2 +- includes/logging/MergeLogFormatter.php | 2 +- includes/logging/MoveLogFormatter.php | 2 +- includes/logging/NewUsersLogFormatter.php | 2 +- includes/logging/PageLangLogFormatter.php | 2 +- includes/logging/PatrolLogFormatter.php | 2 +- includes/logging/ProtectLogFormatter.php | 2 +- includes/logging/RightsLogFormatter.php | 2 +- includes/logging/UploadLogFormatter.php | 2 +- includes/logging/WikitextLogFormatter.php | 2 +- includes/media/Exif.php | 2 +- includes/media/FormatMetadata.php | 2 +- includes/media/SVGMetadataExtractor.php | 2 +- includes/site/CachingSiteStore.php | 2 +- includes/site/DBSiteStore.php | 2 +- includes/site/FileBasedSiteLookup.php | 2 +- includes/site/MediaWikiPageNameNormalizer.php | 2 +- includes/site/MediaWikiSite.php | 2 +- includes/site/Site.php | 2 +- includes/site/SiteExporter.php | 2 +- includes/site/SiteImporter.php | 2 +- includes/site/SiteList.php | 2 +- includes/site/SiteLookup.php | 2 +- includes/site/SiteSQLStore.php | 2 +- includes/site/SiteStore.php | 2 +- includes/site/SitesCacheFileBuilder.php | 2 +- includes/specials/helpers/License.php | 2 +- includes/watcheditem/WatchedItemQueryService.php | 2 +- includes/watcheditem/WatchedItemQueryServiceExtension.php | 2 +- includes/widget/SizeFilterWidget.php | 2 +- languages/classes/LanguageBe_tarask.php | 4 ++-- languages/messages/MessagesLv.php | 2 +- languages/messages/MessagesNn.php | 4 ++-- maintenance/addSite.php | 2 +- maintenance/exportSites.php | 2 +- maintenance/importSites.php | 2 +- maintenance/parse.php | 2 +- maintenance/reassignEdits.php | 2 +- maintenance/showSiteStats.php | 2 +- tests/phpunit/includes/actions/ActionTest.php | 2 +- tests/phpunit/includes/htmlform/HTMLFormTest.php | 2 +- tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php | 2 +- .../jobqueue/jobs/CategoryMembershipChangeJobTest.php | 2 +- .../includes/jobqueue/jobs/ClearUserWatchlistJobTest.php | 2 +- tests/phpunit/includes/specials/SpecialBlankPageTest.php | 2 +- tests/phpunit/includes/specials/SpecialPageTestBase.php | 2 +- tests/phpunit/includes/specials/SpecialShortpagesTest.php | 2 +- 61 files changed, 65 insertions(+), 63 deletions(-) diff --git a/.phpcs.xml b/.phpcs.xml index 440adafc03..fb9d232605 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -10,7 +10,6 @@ - diff --git a/includes/cache/CacheHelper.php b/includes/cache/CacheHelper.php index e77e251586..b2a91c2974 100644 --- a/includes/cache/CacheHelper.php +++ b/includes/cache/CacheHelper.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GNU GPL v2 or later + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ diff --git a/includes/composer/ComposerHookHandler.php b/includes/composer/ComposerHookHandler.php index a1943be5ac..b26a47998f 100644 --- a/includes/composer/ComposerHookHandler.php +++ b/includes/composer/ComposerHookHandler.php @@ -7,7 +7,7 @@ $GLOBALS['IP'] = __DIR__ . '/../../'; require_once __DIR__ . '/../AutoLoader.php'; /** - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class ComposerHookHandler { diff --git a/includes/composer/ComposerPackageModifier.php b/includes/composer/ComposerPackageModifier.php index 168336b214..6aa0b5b8db 100644 --- a/includes/composer/ComposerPackageModifier.php +++ b/includes/composer/ComposerPackageModifier.php @@ -5,7 +5,7 @@ use Composer\Package\Package; use Composer\Semver\Constraint\Constraint; /** - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class ComposerPackageModifier { diff --git a/includes/composer/ComposerVersionNormalizer.php b/includes/composer/ComposerVersionNormalizer.php index 2194bede69..52bc0cd121 100644 --- a/includes/composer/ComposerVersionNormalizer.php +++ b/includes/composer/ComposerVersionNormalizer.php @@ -1,7 +1,7 @@ */ class ComposerVersionNormalizer { diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php index beac91e0e1..b6ccb53dec 100644 --- a/includes/dao/DBAccessBase.php +++ b/includes/dao/DBAccessBase.php @@ -28,7 +28,7 @@ use Wikimedia\Rdbms\LoadBalancer; * @file * @ingroup Database * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ abstract class DBAccessBase implements IDBAccessObject { diff --git a/includes/interwiki/InterwikiLookupAdapter.php b/includes/interwiki/InterwikiLookupAdapter.php index 076c37fe1f..d906498b51 100644 --- a/includes/interwiki/InterwikiLookupAdapter.php +++ b/includes/interwiki/InterwikiLookupAdapter.php @@ -24,7 +24,7 @@ namespace MediaWiki\Interwiki; * @since 1.29 * @ingroup InterwikiLookup * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ use Interwiki; diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php index 454fd41f92..dd734af513 100644 --- a/includes/libs/CSSMin.php +++ b/includes/libs/CSSMin.php @@ -19,7 +19,7 @@ * @version 0.1.1 -- 2010-09-11 * @author Trevor Parscal * @copyright Copyright 2010 Wikimedia Foundation - * @license http://www.apache.org/licenses/LICENSE-2.0 + * @license Apache-2.0 */ /** diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php index 79d13741e2..a9b26ac913 100644 --- a/includes/libs/GenericArrayObject.php +++ b/includes/libs/GenericArrayObject.php @@ -29,7 +29,7 @@ * * @file * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ abstract class GenericArrayObject extends ArrayObject { diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php index 5ecfc7cc9b..43cd7db2d1 100644 --- a/includes/libs/JavaScriptMinifier.php +++ b/includes/libs/JavaScriptMinifier.php @@ -4,7 +4,10 @@ * * @file * @author Paul Copperman - * @license Choose any of Apache, MIT, GPL, LGPL + * @license Apache-2.0 + * @license MIT + * @license GPL-2.0-or-later + * @license LGPL-2.1-or-later */ /** diff --git a/includes/logging/BlockLogFormatter.php b/includes/logging/BlockLogFormatter.php index a5af02691e..0d22382785 100644 --- a/includes/logging/BlockLogFormatter.php +++ b/includes/logging/BlockLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.25 */ diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php index ef00634520..8078e2e02c 100644 --- a/includes/logging/DeleteLogFormatter.php +++ b/includes/logging/DeleteLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.22 */ diff --git a/includes/logging/ImportLogFormatter.php b/includes/logging/ImportLogFormatter.php index a2a899b097..ee676188bf 100644 --- a/includes/logging/ImportLogFormatter.php +++ b/includes/logging/ImportLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.27 */ diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php index 31c196af7f..e9e338dc3a 100644 --- a/includes/logging/LogEntry.php +++ b/includes/logging/LogEntry.php @@ -24,7 +24,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.19 */ diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index 0ffe691d65..0cf3e6d251 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.19 */ use MediaWiki\Linker\LinkRenderer; diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php index 8775097dd6..7a6fb9df48 100644 --- a/includes/logging/MergeLogFormatter.php +++ b/includes/logging/MergeLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.25 */ diff --git a/includes/logging/MoveLogFormatter.php b/includes/logging/MoveLogFormatter.php index 43ca0ea1d5..637a8e7821 100644 --- a/includes/logging/MoveLogFormatter.php +++ b/includes/logging/MoveLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.22 */ diff --git a/includes/logging/NewUsersLogFormatter.php b/includes/logging/NewUsersLogFormatter.php index 382e4adb5c..911ab95b9c 100644 --- a/includes/logging/NewUsersLogFormatter.php +++ b/includes/logging/NewUsersLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.22 */ diff --git a/includes/logging/PageLangLogFormatter.php b/includes/logging/PageLangLogFormatter.php index 694fa7f300..a08427a0d8 100644 --- a/includes/logging/PageLangLogFormatter.php +++ b/includes/logging/PageLangLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Kunal Grover - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.24 */ diff --git a/includes/logging/PatrolLogFormatter.php b/includes/logging/PatrolLogFormatter.php index 894f59b0ac..e02a7037a9 100644 --- a/includes/logging/PatrolLogFormatter.php +++ b/includes/logging/PatrolLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.22 */ diff --git a/includes/logging/ProtectLogFormatter.php b/includes/logging/ProtectLogFormatter.php index 64ec626935..931829ab20 100644 --- a/includes/logging/ProtectLogFormatter.php +++ b/includes/logging/ProtectLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.26 */ diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php index 4b4d19f4fb..8cdd2afb25 100644 --- a/includes/logging/RightsLogFormatter.php +++ b/includes/logging/RightsLogFormatter.php @@ -19,7 +19,7 @@ * * @file * @author Alexandre Emsenhuber - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.22 */ diff --git a/includes/logging/UploadLogFormatter.php b/includes/logging/UploadLogFormatter.php index 6c5367172f..a73052da64 100644 --- a/includes/logging/UploadLogFormatter.php +++ b/includes/logging/UploadLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later * @since 1.25 */ diff --git a/includes/logging/WikitextLogFormatter.php b/includes/logging/WikitextLogFormatter.php index 13b55595d2..19f5144b04 100644 --- a/includes/logging/WikitextLogFormatter.php +++ b/includes/logging/WikitextLogFormatter.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later */ /** diff --git a/includes/media/Exif.php b/includes/media/Exif.php index a38e79b725..e4de0a1b5f 100644 --- a/includes/media/Exif.php +++ b/includes/media/Exif.php @@ -20,7 +20,7 @@ * @ingroup Media * @author Ævar Arnfjörð Bjarmason * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason, 2009 Brent Garber - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license GPL-2.0-or-later * @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification * @file */ diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php index f683da2c02..2a8b375a40 100644 --- a/includes/media/FormatMetadata.php +++ b/includes/media/FormatMetadata.php @@ -20,7 +20,7 @@ * @ingroup Media * @author Ævar Arnfjörð Bjarmason * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason, 2009 Brent Garber, 2010 Brian Wolff - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license GPL-2.0-or-later * @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification * @file */ diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php index fc93b2331f..e00a5b380c 100644 --- a/includes/media/SVGMetadataExtractor.php +++ b/includes/media/SVGMetadataExtractor.php @@ -22,7 +22,7 @@ * @author "Derk-Jan Hartman " * @author Brion Vibber * @copyright Copyright © 2010-2010 Brion Vibber, Derk-Jan Hartman - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license GPL-2.0-or-later */ /** diff --git a/includes/site/CachingSiteStore.php b/includes/site/CachingSiteStore.php index f3cd1e81a2..625c8997c5 100644 --- a/includes/site/CachingSiteStore.php +++ b/includes/site/CachingSiteStore.php @@ -24,7 +24,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > * @author Katie Filbert < aude.wiki@gmail.com > */ diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php index 7fcfbe59e9..b1da25c865 100644 --- a/includes/site/DBSiteStore.php +++ b/includes/site/DBSiteStore.php @@ -26,7 +26,7 @@ use Wikimedia\Rdbms\LoadBalancer; * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > * @author Daniel Kinzler */ diff --git a/includes/site/FileBasedSiteLookup.php b/includes/site/FileBasedSiteLookup.php index 965444038f..c168a47ffb 100644 --- a/includes/site/FileBasedSiteLookup.php +++ b/includes/site/FileBasedSiteLookup.php @@ -17,7 +17,7 @@ * * @file * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ /** diff --git a/includes/site/MediaWikiPageNameNormalizer.php b/includes/site/MediaWikiPageNameNormalizer.php index 8a12c4f7ce..a81ddca924 100644 --- a/includes/site/MediaWikiPageNameNormalizer.php +++ b/includes/site/MediaWikiPageNameNormalizer.php @@ -26,7 +26,7 @@ use UtfNormal\Validator; * * @since 1.27 * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author John Erling Blad < jeblad@gmail.com > * @author Daniel Kinzler * @author Jeroen De Dauw < jeroendedauw@gmail.com > diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php index e1e7ce69cf..14c9a7315d 100644 --- a/includes/site/MediaWikiSite.php +++ b/includes/site/MediaWikiSite.php @@ -22,7 +22,7 @@ use MediaWiki\Site\MediaWikiPageNameNormalizer; * * @file * @ingroup Site - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author John Erling Blad < jeblad@gmail.com > * @author Daniel Kinzler * @author Jeroen De Dauw < jeroendedauw@gmail.com > diff --git a/includes/site/Site.php b/includes/site/Site.php index f5e3f22ee6..01b2a3c491 100644 --- a/includes/site/Site.php +++ b/includes/site/Site.php @@ -23,7 +23,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class Site implements Serializable { diff --git a/includes/site/SiteExporter.php b/includes/site/SiteExporter.php index 01b838ef14..0c9f9963cc 100644 --- a/includes/site/SiteExporter.php +++ b/includes/site/SiteExporter.php @@ -24,7 +24,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ class SiteExporter { diff --git a/includes/site/SiteImporter.php b/includes/site/SiteImporter.php index 5e13d06152..956bdab37e 100644 --- a/includes/site/SiteImporter.php +++ b/includes/site/SiteImporter.php @@ -24,7 +24,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ class SiteImporter { diff --git a/includes/site/SiteList.php b/includes/site/SiteList.php index b942d6e4fe..726ab46837 100644 --- a/includes/site/SiteList.php +++ b/includes/site/SiteList.php @@ -23,7 +23,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class SiteList extends GenericArrayObject { diff --git a/includes/site/SiteLookup.php b/includes/site/SiteLookup.php index 610bf0b78f..70fc453dd1 100644 --- a/includes/site/SiteLookup.php +++ b/includes/site/SiteLookup.php @@ -23,7 +23,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ interface SiteLookup { diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php index 2f8a113ca4..e0b8d27b4d 100644 --- a/includes/site/SiteSQLStore.php +++ b/includes/site/SiteSQLStore.php @@ -23,7 +23,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ class SiteSQLStore { diff --git a/includes/site/SiteStore.php b/includes/site/SiteStore.php index 10e0c1b93d..13800d0ded 100644 --- a/includes/site/SiteStore.php +++ b/includes/site/SiteStore.php @@ -23,7 +23,7 @@ * @file * @ingroup Site * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ interface SiteStore extends SiteLookup { diff --git a/includes/site/SitesCacheFileBuilder.php b/includes/site/SitesCacheFileBuilder.php index b4046e364c..f0d6ce1026 100644 --- a/includes/site/SitesCacheFileBuilder.php +++ b/includes/site/SitesCacheFileBuilder.php @@ -20,7 +20,7 @@ * * @file * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ class SitesCacheFileBuilder { diff --git a/includes/specials/helpers/License.php b/includes/specials/helpers/License.php index 940f69c765..fbd801d06e 100644 --- a/includes/specials/helpers/License.php +++ b/includes/specials/helpers/License.php @@ -21,7 +21,7 @@ * @ingroup SpecialPage * @author Ævar Arnfjörð Bjarmason * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later */ /** diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php index 506ee0092c..a477b644d8 100644 --- a/includes/watcheditem/WatchedItemQueryService.php +++ b/includes/watcheditem/WatchedItemQueryService.php @@ -13,7 +13,7 @@ use Wikimedia\Rdbms\LoadBalancer; * @file * @ingroup Watchlist * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ class WatchedItemQueryService { diff --git a/includes/watcheditem/WatchedItemQueryServiceExtension.php b/includes/watcheditem/WatchedItemQueryServiceExtension.php index 93d5033089..873ae2d76c 100644 --- a/includes/watcheditem/WatchedItemQueryServiceExtension.php +++ b/includes/watcheditem/WatchedItemQueryServiceExtension.php @@ -11,7 +11,7 @@ use Wikimedia\Rdbms\IDatabase; * @file * @ingroup Watchlist * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ interface WatchedItemQueryServiceExtension { diff --git a/includes/widget/SizeFilterWidget.php b/includes/widget/SizeFilterWidget.php index c4d1dfc85c..18c05bf6bc 100644 --- a/includes/widget/SizeFilterWidget.php +++ b/includes/widget/SizeFilterWidget.php @@ -10,7 +10,7 @@ use \OOUI\LabelWidget; * Select and input widget. * * @copyright 2011-2018 MediaWiki Widgets Team and others; see AUTHORS.txt - * @license The MIT License (MIT); see LICENSE.txt + * @license MIT */ class SizeFilterWidget extends \OOUI\Widget { diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php index 1f9b767aab..07005d4d2f 100644 --- a/languages/classes/LanguageBe_tarask.php +++ b/languages/classes/LanguageBe_tarask.php @@ -19,8 +19,8 @@ * * @file * @author Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License - * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License + * @license GPL-2.0-or-later + * @license GFDL-1.3-or-later * @ingroup Language */ diff --git a/languages/messages/MessagesLv.php b/languages/messages/MessagesLv.php index 4c75a514d6..94aac6018c 100644 --- a/languages/messages/MessagesLv.php +++ b/languages/messages/MessagesLv.php @@ -29,7 +29,7 @@ /** * @copyright Copyright © 2006, Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @license GPL-2.0-or-later */ $linkTrail = '/^([a-zA-ZĀāČčĒēĢģĪīĶķĻļŅņŠšŪūŽž]+)(.*)$/sDu'; diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php index 7572c67e01..816cff046c 100644 --- a/languages/messages/MessagesNn.php +++ b/languages/messages/MessagesNn.php @@ -35,8 +35,8 @@ */ /** - * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license GFDL-1.3-or-later + * @license GPL-2.0-or-later * * @see https://meta.wikimedia.org/w/index.php?title=LanguageNn.php&action=history * @see https://nn.wikipedia.org/w/index.php?title=Brukar:Dittaeva/LanguageNn.php&action=history diff --git a/maintenance/addSite.php b/maintenance/addSite.php index 4953343fd9..b0ee966711 100644 --- a/maintenance/addSite.php +++ b/maintenance/addSite.php @@ -11,7 +11,7 @@ require_once $basePath . '/maintenance/Maintenance.php'; * * @since 1.29 * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Florian Schmidt */ class AddSite extends Maintenance { diff --git a/maintenance/exportSites.php b/maintenance/exportSites.php index 736b12b304..4456c754f8 100644 --- a/maintenance/exportSites.php +++ b/maintenance/exportSites.php @@ -9,7 +9,7 @@ require_once $basePath . '/maintenance/Maintenance.php'; * * @since 1.25 * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ class ExportSites extends Maintenance { diff --git a/maintenance/importSites.php b/maintenance/importSites.php index be6cc052b1..6859eb4c96 100644 --- a/maintenance/importSites.php +++ b/maintenance/importSites.php @@ -9,7 +9,7 @@ require_once $basePath . '/maintenance/Maintenance.php'; * * @since 1.25 * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ class ImportSites extends Maintenance { diff --git a/maintenance/parse.php b/maintenance/parse.php index b87a716f62..cf2fe541f2 100644 --- a/maintenance/parse.php +++ b/maintenance/parse.php @@ -46,7 +46,7 @@ * @file * @ingroup Maintenance * @author Antoine Musso - * @license GNU General Public License 2.0 or later + * @license GPL-2.0-or-later */ require_once __DIR__ . '/Maintenance.php'; diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 44589016af..d90a4a75eb 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -20,7 +20,7 @@ * @file * @ingroup Maintenance * @author Rob Church - * @license GNU General Public Licence 2.0 or later + * @license GPL-2.0-or-later */ use Wikimedia\Rdbms\IDatabase; diff --git a/maintenance/showSiteStats.php b/maintenance/showSiteStats.php index 08f009bd88..1adb13ef41 100644 --- a/maintenance/showSiteStats.php +++ b/maintenance/showSiteStats.php @@ -26,7 +26,7 @@ * @author Brion Vibber * @author Rob Church * - * @license GNU General Public License 2.0 or later + * @license GPL-2.0-or-later */ require_once __DIR__ . '/Maintenance.php'; diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php index b96b49143e..9c8b957b27 100644 --- a/tests/phpunit/includes/actions/ActionTest.php +++ b/tests/phpunit/includes/actions/ActionTest.php @@ -6,7 +6,7 @@ * @group Action * @group Database * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Thiemo Kreuz */ class ActionTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/htmlform/HTMLFormTest.php b/tests/phpunit/includes/htmlform/HTMLFormTest.php index e20cf94201..05e15a33d6 100644 --- a/tests/phpunit/includes/htmlform/HTMLFormTest.php +++ b/tests/phpunit/includes/htmlform/HTMLFormTest.php @@ -3,7 +3,7 @@ /** * @covers HTMLForm * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Gergő Tisza * @author Thiemo Mättig */ diff --git a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php index bf8603dd9e..b2e7ea4e55 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php @@ -5,7 +5,7 @@ * * @group JobQueue * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Thiemo Kreuz */ class JobQueueMemoryTest extends PHPUnit\Framework\TestCase { diff --git a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php index 5960a16b00..1f73324931 100644 --- a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php @@ -6,7 +6,7 @@ * @group JobQueue * @group Database * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Addshore */ class CategoryMembershipChangeJobTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php index 6ae7d60527..27cae8aa2f 100644 --- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php @@ -7,7 +7,7 @@ use MediaWiki\MediaWikiServices; * @group JobQueue * @group Database * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later * @author Addshore */ class ClearUserWatchlistJobTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/specials/SpecialBlankPageTest.php b/tests/phpunit/includes/specials/SpecialBlankPageTest.php index e0d059fb67..879acfece1 100644 --- a/tests/phpunit/includes/specials/SpecialBlankPageTest.php +++ b/tests/phpunit/includes/specials/SpecialBlankPageTest.php @@ -1,7 +1,7 @@ * @author Daniel Kinzler * @author Addshore diff --git a/tests/phpunit/includes/specials/SpecialShortpagesTest.php b/tests/phpunit/includes/specials/SpecialShortpagesTest.php index f799b11586..236c5c4e58 100644 --- a/tests/phpunit/includes/specials/SpecialShortpagesTest.php +++ b/tests/phpunit/includes/specials/SpecialShortpagesTest.php @@ -5,7 +5,7 @@ * * @since 1.30 * - * @license GNU GPL v2+ + * @license GPL-2.0-or-later */ class SpecialShortpagesTest extends MediaWikiTestCase { -- 2.20.1