Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395074 )
Change subject: Remove various redundant '@license' tags in file headers ...................................................................... Remove various redundant '@license' tags in file headers Redundant given this is the project-wide license already, especially in file headers that already include the GPL license header. Based on feedback from Ie0cea0ef5027c7e5. Change-Id: I7067abb7abee1f0c238cb2536e16192e946d8daa --- M includes/changes/ChangesListBooleanFilter.php M includes/changes/ChangesListFilter.php M includes/changes/ChangesListFilterGroup.php M includes/changes/ChangesListStringOptionsFilterGroup.php M includes/libs/rdbms/connectionmanager/ConnectionManager.php M includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php M includes/linkeddata/PageDataRequestHandler.php M includes/linker/LinkRenderer.php M includes/linker/LinkRendererFactory.php M includes/linker/LinkTarget.php M includes/specials/SpecialPageData.php M includes/specials/formfields/Licenses.php M includes/title/ForeignTitleFactory.php M includes/title/ImportTitleFactory.php M includes/title/MediaWikiTitleCodec.php M includes/title/NaiveForeignTitleFactory.php M includes/title/NaiveImportTitleFactory.php M includes/title/NamespaceAwareForeignTitleFactory.php M includes/title/NamespaceImportTitleFactory.php M includes/title/SubpageImportTitleFactory.php M includes/title/TitleFormatter.php M includes/title/TitleParser.php M includes/title/TitleValue.php M tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php M tests/phpunit/includes/libs/http/HttpAcceptParserTest.php M tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php M tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php M tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php M tests/phpunit/includes/specials/SpecialPageDataTest.php M tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php M tests/phpunit/languages/LanguageCodeTest.php 31 files changed, 31 insertions(+), 47 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/395074/1 diff --git a/includes/changes/ChangesListBooleanFilter.php b/includes/changes/ChangesListBooleanFilter.php index 2a7ba88..f37ed2d 100644 --- a/includes/changes/ChangesListBooleanFilter.php +++ b/includes/changes/ChangesListBooleanFilter.php @@ -18,14 +18,13 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ use Wikimedia\Rdbms\IDatabase; /** - * An individual filter in a boolean group + * Represents a hide-based boolean filter (used on ChangesListSpecialPage and descendants) * * @since 1.29 */ diff --git a/includes/changes/ChangesListFilter.php b/includes/changes/ChangesListFilter.php index 2546f2b..17a94c5 100644 --- a/includes/changes/ChangesListFilter.php +++ b/includes/changes/ChangesListFilter.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ diff --git a/includes/changes/ChangesListFilterGroup.php b/includes/changes/ChangesListFilterGroup.php index 48c6e84..facc41b 100644 --- a/includes/changes/ChangesListFilterGroup.php +++ b/includes/changes/ChangesListFilterGroup.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php index 775fd76..d801d59 100644 --- a/includes/changes/ChangesListStringOptionsFilterGroup.php +++ b/includes/changes/ChangesListStringOptionsFilterGroup.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ diff --git a/includes/libs/rdbms/connectionmanager/ConnectionManager.php b/includes/libs/rdbms/connectionmanager/ConnectionManager.php index 212ff31..4099188 100644 --- a/includes/libs/rdbms/connectionmanager/ConnectionManager.php +++ b/includes/libs/rdbms/connectionmanager/ConnectionManager.php @@ -10,8 +10,6 @@ * This manages access to master and replica databases. * * @since 1.29 - * - * @license GPL-2.0+ * @author Addshore */ class ConnectionManager { diff --git a/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php b/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php index 30b1fb4..3ca6b38 100644 --- a/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php +++ b/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php @@ -20,7 +20,6 @@ * * @since 1.29 * - * @license GPL-2.0+ * @author Daniel Kinzler * @author Addshore */ diff --git a/includes/linkeddata/PageDataRequestHandler.php b/includes/linkeddata/PageDataRequestHandler.php index 43cb44c..5e4e14f 100644 --- a/includes/linkeddata/PageDataRequestHandler.php +++ b/includes/linkeddata/PageDataRequestHandler.php @@ -6,11 +6,9 @@ /** * Request handler implementing a data interface for mediawiki pages. * - * @license GPL-2.0+ * @author Daniel Kinzler * @author Amir Sarabadanai */ - class PageDataRequestHandler { /** diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php index c203a16..160d2d1 100644 --- a/includes/linker/LinkRenderer.php +++ b/includes/linker/LinkRenderer.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL-2.0+ * @author Kunal Mehta <[email protected]> */ namespace MediaWiki\Linker; diff --git a/includes/linker/LinkRendererFactory.php b/includes/linker/LinkRendererFactory.php index b7c05c2..240ea09 100644 --- a/includes/linker/LinkRendererFactory.php +++ b/includes/linker/LinkRendererFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL-2.0+ * @author Kunal Mehta <[email protected]> */ namespace MediaWiki\Linker; diff --git a/includes/linker/LinkTarget.php b/includes/linker/LinkTarget.php index 980a8bf..56407ae 100644 --- a/includes/linker/LinkTarget.php +++ b/includes/linker/LinkTarget.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Addshore */ namespace MediaWiki\Linker; diff --git a/includes/specials/SpecialPageData.php b/includes/specials/SpecialPageData.php index c52c426..f118df0 100644 --- a/includes/specials/SpecialPageData.php +++ b/includes/specials/SpecialPageData.php @@ -1,12 +1,33 @@ <?php - /** * Special page to act as an endpoint for accessing raw page data. - * The web server should generally be configured to make this accessible via a canonical URL/URI, - * such as <http://my.domain.org/data/main/Foo>. * - * @license GPL-2.0+ + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file */ + + + /** + * Special page to act as an endpoint for accessing raw page data. + * The web server should generally be configured to make this accessible via a canonical URL/URI, + * such as <http://my.domain.org/data/main/Foo>. + * @class + * @ingroup SpecialPage + */ class SpecialPageData extends SpecialPage { /** diff --git a/includes/specials/formfields/Licenses.php b/includes/specials/formfields/Licenses.php index f499cc1..603c62f 100644 --- a/includes/specials/formfields/Licenses.php +++ b/includes/specials/formfields/Licenses.php @@ -21,7 +21,6 @@ * @ingroup SpecialPage * @author Ævar Arnfjörð Bjarmason <[email protected]> * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ /** diff --git a/includes/title/ForeignTitleFactory.php b/includes/title/ForeignTitleFactory.php index 427afdf..07dd346 100644 --- a/includes/title/ForeignTitleFactory.php +++ b/includes/title/ForeignTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/ImportTitleFactory.php b/includes/title/ImportTitleFactory.php index 629616d..4baab22 100644 --- a/includes/title/ImportTitleFactory.php +++ b/includes/title/ImportTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php index efc0fd4..890a870 100644 --- a/includes/title/MediaWikiTitleCodec.php +++ b/includes/title/MediaWikiTitleCodec.php @@ -1,6 +1,6 @@ <?php /** - * A codec for %MediaWiki page titles. + * A codec for MediaWiki page titles. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Daniel Kinzler */ use MediaWiki\Interwiki\InterwikiLookup; @@ -26,7 +25,7 @@ use MediaWiki\Linker\LinkTarget; /** - * A codec for %MediaWiki page titles. + * A codec for MediaWiki page titles. * * @note Normalization and validation is applied while parsing, not when formatting. * It's possible to construct a TitleValue with an invalid title, and use MediaWikiTitleCodec diff --git a/includes/title/NaiveForeignTitleFactory.php b/includes/title/NaiveForeignTitleFactory.php index 2c2f94b..44cf90d 100644 --- a/includes/title/NaiveForeignTitleFactory.php +++ b/includes/title/NaiveForeignTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/NaiveImportTitleFactory.php b/includes/title/NaiveImportTitleFactory.php index 43c662e..5cb6112 100644 --- a/includes/title/NaiveImportTitleFactory.php +++ b/includes/title/NaiveImportTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/NamespaceAwareForeignTitleFactory.php b/includes/title/NamespaceAwareForeignTitleFactory.php index 4d24cb8..c271f26 100644 --- a/includes/title/NamespaceAwareForeignTitleFactory.php +++ b/includes/title/NamespaceAwareForeignTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/NamespaceImportTitleFactory.php b/includes/title/NamespaceImportTitleFactory.php index 0c1d0c4..7c756aa 100644 --- a/includes/title/NamespaceImportTitleFactory.php +++ b/includes/title/NamespaceImportTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/SubpageImportTitleFactory.php b/includes/title/SubpageImportTitleFactory.php index b0be7af..4244350 100644 --- a/includes/title/SubpageImportTitleFactory.php +++ b/includes/title/SubpageImportTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/TitleFormatter.php b/includes/title/TitleFormatter.php index 5177606..4551d75 100644 --- a/includes/title/TitleFormatter.php +++ b/includes/title/TitleFormatter.php @@ -1,6 +1,6 @@ <?php /** - * A title formatter service for %MediaWiki. + * A title formatter service for MediaWiki. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Daniel Kinzler */ use MediaWiki\Linker\LinkTarget; diff --git a/includes/title/TitleParser.php b/includes/title/TitleParser.php index 381b1d0..de65be8 100644 --- a/includes/title/TitleParser.php +++ b/includes/title/TitleParser.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Daniel Kinzler */ diff --git a/includes/title/TitleValue.php b/includes/title/TitleValue.php index 77c1953..3e13300 100644 --- a/includes/title/TitleValue.php +++ b/includes/title/TitleValue.php @@ -1,6 +1,6 @@ <?php /** - * Representation of a page title within %MediaWiki. + * Representation of a page title within MediaWiki. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,14 +18,13 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Daniel Kinzler */ use MediaWiki\Linker\LinkTarget; use Wikimedia\Assert\Assert; /** - * Represents a page (or page fragment) title within %MediaWiki. + * Represents a page (or page fragment) title within MediaWiki. * * @note In contrast to Title, this is designed to be a plain value object. That is, * it is immutable, does not use global state, and causes no side effects. diff --git a/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php index 4415bc9..10dca7d 100644 --- a/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php +++ b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php @@ -5,7 +5,6 @@ /** * @covers Wikimedia\Http\HttpAcceptNegotiator * - * @license GPL-2.0+ * @author Daniel Kinzler */ class HttpAcceptNegotiatorTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php index 5bd9425..788c297 100644 --- a/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php +++ b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php @@ -5,7 +5,6 @@ /** * @covers Wikimedia\Http\HttpAcceptParser * - * @license GPL-2.0+ * @author Daniel Kinzler */ class HttpAcceptParserTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php index a3f3981..8f02c7e 100644 --- a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php +++ b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php @@ -10,7 +10,6 @@ /** * @covers Wikimedia\Rdbms\ConnectionManager * - * @license GPL-2.0+ * @author Daniel Kinzler */ class ConnectionManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php index 4e76f2a..55df0d9 100644 --- a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php +++ b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php @@ -10,7 +10,6 @@ /** * @covers Wikimedia\Rdbms\SessionConsistentConnectionManager * - * @license GPL-2.0+ * @author Daniel Kinzler */ class SessionConsistentConnectionManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php index 2b18b08..ad0c3d1 100644 --- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php +++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php @@ -2,10 +2,7 @@ /** * @covers PageDataRequestHandler - * * @group PageData - * - * @license GPL-2.0+ */ class PageDataRequestHandlerTest extends \MediaWikiTestCase { diff --git a/tests/phpunit/includes/specials/SpecialPageDataTest.php b/tests/phpunit/includes/specials/SpecialPageDataTest.php index 3d0d344..4075406 100644 --- a/tests/phpunit/includes/specials/SpecialPageDataTest.php +++ b/tests/phpunit/includes/specials/SpecialPageDataTest.php @@ -2,12 +2,9 @@ /** * @covers SpecialPageData - * * @group Database - * * @group SpecialPage * - * @license GPL-2.0+ * @author Daniel Kinzler */ class SpecialPageDataTest extends SpecialPageTestBase { diff --git a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php index d711bac..6c55960 100644 --- a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php +++ b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php @@ -21,7 +21,6 @@ /** * @covers NaiveImportTitleFactory - * * @group Title */ class NaiveImportTitleFactoryTest extends MediaWikiTestCase { diff --git a/tests/phpunit/languages/LanguageCodeTest.php b/tests/phpunit/languages/LanguageCodeTest.php index 950d2df..ebf6b65 100644 --- a/tests/phpunit/languages/LanguageCodeTest.php +++ b/tests/phpunit/languages/LanguageCodeTest.php @@ -2,10 +2,8 @@ /** * @covers LanguageCode - * * @group Language * - * @license GPL-2.0+ * @author Thiemo Kreuz */ class LanguageCodeTest extends PHPUnit_Framework_TestCase { -- To view, visit https://gerrit.wikimedia.org/r/395074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7067abb7abee1f0c238cb2536e16192e946d8daa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
