Reorg: Move category-related classes from includes/ to Category/

Bug: T321882
Change-Id: I0b86acfdeaa3a2a0a14b7763fd088122820bafdc

autoload.php

@@ -214,14 +214,14 @@ $wgAutoloadLocalClasses = [
 	'CachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/CachedBagOStuff.php',
 	'CachingSiteStore' => __DIR__ . '/includes/site/CachingSiteStore.php',
 	'CannotCreateActorException' => __DIR__ . '/includes/exception/CannotCreateActorException.php',
-	'CategoriesRdf' => __DIR__ . '/includes/CategoriesRdf.php',
-	'Category' => __DIR__ . '/includes/Category.php',
+	'CategoriesRdf' => __DIR__ . '/includes/Category/CategoriesRdf.php',
+	'Category' => __DIR__ . '/includes/Category/Category.php',
 	'CategoryChangesAsRdf' => __DIR__ . '/maintenance/categoryChangesAsRdf.php',
 	'CategoryMembershipChange' => __DIR__ . '/includes/changes/CategoryMembershipChange.php',
 	'CategoryMembershipChangeJob' => __DIR__ . '/includes/jobqueue/jobs/CategoryMembershipChangeJob.php',
 	'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php',
 	'CategoryPager' => __DIR__ . '/includes/specials/pagers/CategoryPager.php',
-	'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php',
+	'CategoryViewer' => __DIR__ . '/includes/Category/CategoryViewer.php',
 	'CdnCacheUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php',
 	'CdnPurgeJob' => __DIR__ . '/includes/jobqueue/jobs/CdnPurgeJob.php',
 	'CentralIdLookup' => __DIR__ . '/includes/user/CentralId/CentralIdLookup.php',
@@ -958,6 +958,10 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Cache\\Hook\\MessageCache__getHook' => __DIR__ . '/includes/language/Hook/MessageCache__getHook.php',
 	'MediaWiki\\Cache\\Hook\\MessagesPreLoadHook' => __DIR__ . '/includes/language/Hook/MessagesPreLoadHook.php',
 	'MediaWiki\\Cache\\LinkBatchFactory' => __DIR__ . '/includes/cache/LinkBatchFactory.php',
+	'MediaWiki\\Category\\CategoriesRdf' => __DIR__ . '/includes/Category/CategoriesRdf.php',
+	'MediaWiki\\Category\\Category' => __DIR__ . '/includes/Category/Category.php',
+	'MediaWiki\\Category\\CategoryViewer' => __DIR__ . '/includes/Category/CategoryViewer.php',
+	'MediaWiki\\Category\\TrackingCategories' => __DIR__ . '/includes/Category/TrackingCategories.php',
 	'MediaWiki\\ChangeTags\\Hook\\ChangeTagAfterDeleteHook' => __DIR__ . '/includes/changetags/Hook/ChangeTagAfterDeleteHook.php',
 	'MediaWiki\\ChangeTags\\Hook\\ChangeTagCanCreateHook' => __DIR__ . '/includes/changetags/Hook/ChangeTagCanCreateHook.php',
 	'MediaWiki\\ChangeTags\\Hook\\ChangeTagCanDeleteHook' => __DIR__ . '/includes/changetags/Hook/ChangeTagCanDeleteHook.php',
@@ -2584,7 +2588,7 @@ $wgAutoloadLocalClasses = [
 	'TitlePrefixSearch' => __DIR__ . '/includes/search/TitlePrefixSearch.php',
 	'TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
 	'TlyConverter' => __DIR__ . '/includes/language/converters/TlyConverter.php',
-	'TrackingCategories' => __DIR__ . '/includes/TrackingCategories.php',
+	'TrackingCategories' => __DIR__ . '/includes/Category/TrackingCategories.php',
 	'TraditionalImageGallery' => __DIR__ . '/includes/gallery/TraditionalImageGallery.php',
 	'TransactionRoundAwareUpdate' => __DIR__ . '/includes/deferred/TransactionRoundAwareUpdate.php',
 	'TransactionRoundDefiningUpdate' => __DIR__ . '/includes/deferred/TransactionRoundDefiningUpdate.php',

includes/Category/CategoriesRdf.php

@@ -16,6 +16,10 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  */
+
+namespace MediaWiki\Category;
+
+use Title;
 use Wikimedia\Purtle\RdfWriter;
 
 /**
@@ -132,3 +136,5 @@ class CategoriesRdf {
 	}
 
 }
+
+class_alias( CategoriesRdf::class, 'CategoriesRdf' );

includes/Category/Category.php

@@ -21,9 +21,16 @@
  * @author Simetrical
  */
 
+namespace MediaWiki\Category;
+
+use DeferredUpdates;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Title\TitleArray;
+use MWException;
+use ReadOnlyMode;
+use stdClass;
+use Title;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
@@ -531,3 +538,5 @@ class Category {
 		return false;
 	}
 }
+
+class_alias( Category::class, 'Category' );

includes/Category/CategoryViewer.php

@@ -20,12 +20,27 @@
  * @file
  */
 
+namespace MediaWiki\Category;
+
+use Collation;
+use ContextSource;
+use DeprecationHelper;
+use Html;
+use HtmlArmor;
+use IContextSource;
+use ILanguageConverter;
+use ImageGalleryBase;
+use ImageGalleryClassNotFoundException;
+use LinkCache;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
+use MWException;
+use Title;
+use TitleValue;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
 class CategoryViewer extends ContextSource {
@@ -328,7 +343,10 @@ class CategoryViewer extends ContextSource {
 	 * @param bool $isRedirect
 	 */
 	public function addPage(
-		PageReference $page, string $sortkey, int $pageLength, bool $isRedirect = false
+		PageReference $page,
+		string $sortkey,
+		int $pageLength,
+		bool $isRedirect = false
 	): void {
 		$this->articles[] = $this->generateLink( 'page', $page, $isRedirect );
 
@@ -805,3 +823,5 @@ class CategoryViewer extends ContextSource {
 		return $this->msg( "category-$type-count" )->numParams( $rescnt, $totalcnt )->parseAsBlock();
 	}
 }
+
+class_alias( CategoryViewer::class, 'CategoryViewer' );

includes/Category/TrackingCategories.php

@@ -19,11 +19,18 @@
  * @ingroup Categories
  */
 
+namespace MediaWiki\Category;
+
+use ExtensionRegistry;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
+use NamespaceInfo;
+use ParserOutput;
 use Psr\Log\LoggerInterface;
+use Title;
+use TitleParser;
 
 /**
  * This class performs some operations related to tracking categories, such as creating
@@ -248,3 +255,5 @@ class TrackingCategories {
 		return true;
 	}
 }
+
+class_alias( TrackingCategories::class, 'TrackingCategories' );

includes/MediaWikiServices.php

@@ -57,6 +57,7 @@ use MediaWiki\Block\DatabaseBlockStore;
 use MediaWiki\Block\UnblockUserFactory;
 use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\CommentFormatter\RowCommentFormatter;
@@ -180,7 +181,6 @@ use SkinFactory;
 use TitleFormatter;
 use TitleMatcher;
 use TitleParser;
-use TrackingCategories;
 use UploadRevisionImporter;
 use UserCache;
 use VirtualRESTServiceClient;

includes/ServiceWiring.php

@@ -59,6 +59,7 @@ use MediaWiki\Block\UnblockUserFactory;
 use MediaWiki\Block\UserBlockCommandFactory;
 use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\CommentFormatter\CommentParserFactory;

includes/actions/InfoAction.php

@@ -23,6 +23,7 @@
  */
 
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Category\Category;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;

includes/deferred/LinksUpdate/LinksDeletionUpdate.php

@@ -22,11 +22,11 @@
 
 namespace MediaWiki\Deferred\LinksUpdate;
 
-use Category;
 use DeferredUpdates;
 use EnqueueableDataUpdate;
 use InvalidArgumentException;
 use JobSpecification;
+use MediaWiki\Category\Category;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MWException;

includes/page/CategoryPage.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Category\CategoryViewer;
+
 /**
  * Special handling for category description pages.
  *

includes/page/Hook/CategoryAfterPageAddedHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Page\Hook;
 
-use Category;
+use MediaWiki\Category\Category;
 use WikiPage;
 
 /**

includes/page/Hook/CategoryAfterPageRemovedHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Page\Hook;
 
-use Category;
+use MediaWiki\Category\Category;
 use WikiPage;
 
 /**

includes/page/WikiCategoryPage.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Category\Category;
 use MediaWiki\MediaWikiServices;
 
 /**

includes/page/WikiPage.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Category\Category;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\DAO\WikiAwareEntityTrait;
 use MediaWiki\Edit\PreparedEdit;

includes/parser/CoreParserFunctions.php

@@ -21,6 +21,7 @@
  * @ingroup Parser
  */
 
+use MediaWiki\Category\Category;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/parser/Parser.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\BadFileLookup;
 use MediaWiki\Cache\CacheKeyHelper;
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;

includes/parser/ParserFactory.php

@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\BadFileLookup;
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Http\HttpRequestFactory;

includes/search/ParserOutputSearchDataExtractor.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Search;
 
-use Category;
+use MediaWiki\Category\Category;
 use ParserOutput;
 use Title;
 

includes/search/searchwidgets/FullSearchResultWidget.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Search\SearchWidgets;
 
-use Category;
 use File;
 use Html;
 use HtmlArmor;
 use MediaTransformOutput;
+use MediaWiki\Category\Category;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkRenderer;

includes/specials/SpecialTrackingCategories.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Category\TrackingCategories;
 
 /**
  * A special page that displays list of tracking categories

maintenance/categoryChangesAsRdf.php

@@ -16,6 +16,8 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  */
+
+use MediaWiki\Category\CategoriesRdf;
 use MediaWiki\MainConfigNames;
 use Wikimedia\Purtle\RdfWriter;
 use Wikimedia\Purtle\TurtleRdfWriter;

maintenance/cleanupEmptyCategories.php

@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Category\Category;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**

maintenance/dumpCategoriesAsRdf.php

@@ -17,6 +17,7 @@
  *
  */
 
+use MediaWiki\Category\CategoriesRdf;
 use MediaWiki\MainConfigNames;
 use Wikimedia\Purtle\RdfWriter;
 use Wikimedia\Purtle\RdfWriterFactory;

tests/phpunit/includes/CategoryTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Category\Category;
 use MediaWiki\MainConfigNames;
 
 /**

tests/phpunit/includes/TrackingCategoriesTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\PageReferenceValue;

tests/phpunit/includes/page/WikiPageDbTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Category\Category;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\Edit\PreparedEdit;

tests/phpunit/includes/parser/ParserTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Page\PageReference;

tests/phpunit/unit/includes/parser/ParserFactoryTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\BadFileLookup;
+use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Languages\LanguageConverterFactory;