From 0be39da9b0acc9616e623279a3ca4d77530ccbc0 Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 25 May 2018 01:46:30 +0100 Subject: [PATCH] Rename ApiQueryContributions to ApiQueryUserContribs to match api module name Change-Id: I865628b87eda7be349522fcfaf94f5563142026e --- .phpcs.xml | 1 - autoload.php | 3 ++- includes/api/ApiQuery.php | 2 +- ...QueryUserContributions.php => ApiQueryUserContribs.php} | 7 +++++-- ...rContributionsTest.php => ApiQueryUserContribsTest.php} | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) rename includes/api/{ApiQueryUserContributions.php => ApiQueryUserContribs.php} (99%) rename tests/phpunit/includes/api/query/{ApiQueryUserContributionsTest.php => ApiQueryUserContribsTest.php} (98%) diff --git a/.phpcs.xml b/.phpcs.xml index d36d80d35b..e83198b5e4 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -72,7 +72,6 @@ Whitelist existing violations, but enable the sniff to prevent any new occurrences. --> - */includes/api/ApiQueryUserContributions\.php */includes/api/ApiMessage\.php */includes/api/ApiUsageException\.php */includes/media/XCF\.php diff --git a/autoload.php b/autoload.php index 20062636b9..d4533a51ee 100644 --- a/autoload.php +++ b/autoload.php @@ -93,7 +93,7 @@ $wgAutoloadLocalClasses = [ 'ApiQueryCategories' => __DIR__ . '/includes/api/ApiQueryCategories.php', 'ApiQueryCategoryInfo' => __DIR__ . '/includes/api/ApiQueryCategoryInfo.php', 'ApiQueryCategoryMembers' => __DIR__ . '/includes/api/ApiQueryCategoryMembers.php', - 'ApiQueryContributions' => __DIR__ . '/includes/api/ApiQueryUserContributions.php', + 'ApiQueryContributions' => __DIR__ . '/includes/api/ApiQueryUserContribs.php', 'ApiQueryContributors' => __DIR__ . '/includes/api/ApiQueryContributors.php', 'ApiQueryDeletedRevisions' => __DIR__ . '/includes/api/ApiQueryDeletedRevisions.php', 'ApiQueryDeletedrevs' => __DIR__ . '/includes/api/ApiQueryDeletedrevs.php', @@ -129,6 +129,7 @@ $wgAutoloadLocalClasses = [ 'ApiQueryStashImageInfo' => __DIR__ . '/includes/api/ApiQueryStashImageInfo.php', 'ApiQueryTags' => __DIR__ . '/includes/api/ApiQueryTags.php', 'ApiQueryTokens' => __DIR__ . '/includes/api/ApiQueryTokens.php', + 'ApiQueryUserContribs' => __DIR__ . '/includes/api/ApiQueryUserContribs.php', 'ApiQueryUserInfo' => __DIR__ . '/includes/api/ApiQueryUserInfo.php', 'ApiQueryUsers' => __DIR__ . '/includes/api/ApiQueryUsers.php', 'ApiQueryWatchlist' => __DIR__ . '/includes/api/ApiQueryWatchlist.php', diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index e49024d1ed..c68ec2b949 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -98,7 +98,7 @@ class ApiQuery extends ApiBase { 'recentchanges' => ApiQueryRecentChanges::class, 'search' => ApiQuerySearch::class, 'tags' => ApiQueryTags::class, - 'usercontribs' => ApiQueryContributions::class, + 'usercontribs' => ApiQueryUserContribs::class, 'users' => ApiQueryUsers::class, 'watchlist' => ApiQueryWatchlist::class, 'watchlistraw' => ApiQueryWatchlistRaw::class, diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContribs.php similarity index 99% rename from includes/api/ApiQueryUserContributions.php rename to includes/api/ApiQueryUserContribs.php index 12f42edc48..4c6672b7aa 100644 --- a/includes/api/ApiQueryUserContributions.php +++ b/includes/api/ApiQueryUserContribs.php @@ -25,13 +25,14 @@ * * @ingroup API */ -class ApiQueryContributions extends ApiQueryBase { +class ApiQueryUserContribs extends ApiQueryBase { public function __construct( ApiQuery $query, $moduleName ) { parent::__construct( $query, $moduleName, 'uc' ); } - private $params, $multiUserMode, $orderBy, $parentLens; + private $params, $multiUserMode, $orderBy, $parentLens, $commentStore; + private $fld_ids = false, $fld_title = false, $fld_timestamp = false, $fld_comment = false, $fld_parsedcomment = false, $fld_flags = false, $fld_patrolled = false, $fld_tags = false, $fld_size = false, $fld_sizediff = false; @@ -830,3 +831,5 @@ class ApiQueryContributions extends ApiQueryBase { return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Usercontribs'; } } + +class_alias( ApiQueryUserContribs::class, 'ApiQueryContributions' ); diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContributionsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php similarity index 98% rename from tests/phpunit/includes/api/query/ApiQueryUserContributionsTest.php rename to tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php index ca6a929ac8..1d0b47173e 100644 --- a/tests/phpunit/includes/api/query/ApiQueryUserContributionsTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php @@ -4,9 +4,9 @@ * @group API * @group Database * @group medium - * @covers ApiQueryContributions + * @covers ApiQueryUserContribs */ -class ApiQueryContributionsTest extends ApiTestCase { +class ApiQueryUserContribsTest extends ApiTestCase { public function addDBDataOnce() { global $wgActorTableSchemaMigrationStage; -- 2.20.1