Move remaining four classes in includes/content into Content namespace

Bug: T353458
Change-Id: Ia0f3e22078550be410c4b87faf6aa4eabe6e270d

RELEASE-NOTES-1.43

@@ -356,7 +356,10 @@ because of Phabricator reports.
   not yet (XYZ% done, up from 69% in MediaWiki 1.42.0). The following have newly
   been moved:
   - MediaWiki\Content:
+    - AbstractContent
     - CodeContentHandler
+    - Content
+    - ContentHandler
     - ContentModelChange
     - CssContent
     - CssContentHandler

autoload.php

@@ -999,7 +999,10 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Config\\MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
 	'MediaWiki\\Config\\ServiceOptions' => __DIR__ . '/includes/config/ServiceOptions.php',
 	'MediaWiki\\Config\\SiteConfiguration' => __DIR__ . '/includes/config/SiteConfiguration.php',
+	'MediaWiki\\Content\\AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php',
 	'MediaWiki\\Content\\CodeContentHandler' => __DIR__ . '/includes/content/CodeContentHandler.php',
+	'MediaWiki\\Content\\Content' => __DIR__ . '/includes/content/Content.php',
+	'MediaWiki\\Content\\ContentHandler' => __DIR__ . '/includes/content/ContentHandler.php',
 	'MediaWiki\\Content\\ContentHandlerFactory' => __DIR__ . '/includes/content/ContentHandlerFactory.php',
 	'MediaWiki\\Content\\ContentModelChange' => __DIR__ . '/includes/content/ContentModelChange.php',
 	'MediaWiki\\Content\\CssContent' => __DIR__ . '/includes/content/CssContent.php',

includes/ExternalLinks/LinkFilter.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\ExternalLinks;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\TextContent;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/Hook/AlternateEditPreviewHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Parser\ParserOutput;
 

includes/Hook/EditFilterMergedContentHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Status\Status;
 use MediaWiki\User\User;

includes/Hook/EditPageGetDiffContentHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\EditPage\EditPage;
 
 /**

includes/Hook/EditPageGetPreviewContentHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\EditPage\EditPage;
 
 /**

includes/Message/Message.php

@@ -21,9 +21,9 @@
 
 namespace MediaWiki\Message;
 
-use Content;
 use InvalidArgumentException;
 use Language;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Language\RawMessage;

includes/Output/OutputPage.php

@@ -23,7 +23,6 @@
 namespace MediaWiki\Output;
 
 use Article;
-use Content;
 use CSSJanus;
 use Exception;
 use ExtensionRegistry;
@@ -34,6 +33,7 @@ use Language;
 use LanguageCode;
 use MediaWiki\Cache\LinkCache;
 use MediaWiki\Config\Config;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\JavaScriptContent;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Context\ContextSource;

includes/ResourceLoader/WikiModule.php

@@ -22,8 +22,8 @@
 
 namespace MediaWiki\ResourceLoader;
 
-use Content;
 use CSSJanus;
+use MediaWiki\Content\Content;
 use MediaWiki\Json\FormatJson;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;

includes/Rest/Handler/Helper/HtmlInputTransformHelper.php

@@ -19,10 +19,10 @@
  */
 namespace MediaWiki\Rest\Handler\Helper;
 
-use Content;
 use InvalidArgumentException;
 use LanguageCode;
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
+use MediaWiki\Content\Content;
 use MediaWiki\Edit\ParsoidOutputStash;
 use MediaWiki\Edit\ParsoidRenderID;
 use MediaWiki\Edit\SelserContext;

includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php

@@ -19,12 +19,12 @@
  */
 namespace MediaWiki\Rest\Handler\Helper;
 
-use Content;
 use HttpError;
 use IBufferingStatsdDataFactory;
 use InvalidArgumentException;
 use LanguageCode;
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Edit\ParsoidOutputStash;
 use MediaWiki\Edit\ParsoidRenderID;

includes/Revision/MutableRevisionRecord.php

@@ -22,9 +22,9 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
 use InvalidArgumentException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Storage\RevisionSlotsUpdate;
 use MediaWiki\User\UserIdentity;

includes/Revision/MutableRevisionSlots.php

@@ -22,7 +22,7 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
+use MediaWiki\Content\Content;
 
 /**
  * Mutable version of RevisionSlots, for constructing a new revision.

includes/Revision/RenderedRevision.php

@@ -22,9 +22,9 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
 use InvalidArgumentException;
 use LogicException;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Parser\ParserOutput;

includes/Revision/RevisionRecord.php

@@ -22,9 +22,9 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
 use InvalidArgumentException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\DAO\WikiAwareEntityTrait;
 use MediaWiki\Linker\LinkTarget;

includes/Revision/RevisionSlots.php

@@ -22,7 +22,7 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
+use MediaWiki\Content\Content;
 use Wikimedia\Assert\Assert;
 use Wikimedia\NonSerializable\NonSerializableTrait;
 

includes/Revision/RevisionStore.php

@@ -25,13 +25,13 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
 use DBAccessObjectUtils;
 use IDBAccessObject;
 use InvalidArgumentException;
 use LogicException;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\FallbackContent;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\DAO\WikiAwareEntity;

includes/Revision/SlotRecord.php

@@ -22,9 +22,9 @@
 
 namespace MediaWiki\Revision;
 
-use Content;
 use InvalidArgumentException;
 use LogicException;
+use MediaWiki\Content\Content;
 use OutOfBoundsException;
 use Wikimedia\Assert\Assert;
 use Wikimedia\NonSerializable\NonSerializableTrait;

includes/Storage/DerivedPageDataUpdater.php

@@ -21,14 +21,14 @@
 namespace MediaWiki\Storage;
 
 use CategoryMembershipChangeJob;
-use Content;
-use ContentHandler;
 use IDBAccessObject;
 use InvalidArgumentException;
 use JobQueueGroup;
 use Language;
 use LogicException;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Transform\ContentTransformer;
 use MediaWiki\Deferred\DeferrableUpdate;

includes/Storage/Hook/PageContentSaveHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Storage\Hook;
 
-use Content;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\User\User;
 use StatusValue;
 use WikiPage;

includes/Storage/Hook/ParserOutputStashForEditHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Storage\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\User\User;
 use WikiPage;

includes/Storage/PageEditStash.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Storage;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Page\PageIdentity;

includes/Storage/PageUpdater.php

@@ -21,14 +21,14 @@
 namespace MediaWiki\Storage;
 
 use ChangeTags;
-use Content;
-use ContentHandler;
 use IDBAccessObject;
 use InvalidArgumentException;
 use LogicException;
 use ManualLogEntry;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\ValidationParams;
 use MediaWiki\Deferred\AtomicSectionUpdate;

includes/Storage/PreparedUpdate.php

@@ -1,7 +1,7 @@
 <?php
 namespace MediaWiki\Storage;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RenderedRevision;

includes/Storage/RevisionSlotsUpdate.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Storage;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Revision\MutableRevisionSlots;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionSlots;

includes/content/AbstractContent.php

@@ -26,11 +26,14 @@
  * @author Daniel Kinzler
  */
 
-use MediaWiki\Content\IContentHandlerFactory;
+namespace MediaWiki\Content;
+
+use LogicException;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\MagicWord;
 use MediaWiki\Title\Title;
+use MWException;
 
 /**
  * Base implementation for content objects.
@@ -417,3 +420,6 @@ abstract class AbstractContent implements Content {
 	}
 
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( AbstractContent::class, 'AbstractContent' );

includes/content/CodeContentHandler.php

@@ -23,7 +23,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use Language;
 use LogicException;
 use MediaWiki\MediaWikiServices;

includes/content/Content.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+namespace MediaWiki\Content;
+
 use MediaWiki\Parser\MagicWord;
 use MediaWiki\Title\Title;
 
@@ -372,3 +374,6 @@ interface Content {
 	//   [12:00] <vvv> And default it to a DummyHighlighter
 
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( Content::class, 'Content' );

includes/content/ContentHandler.php

@@ -26,12 +26,21 @@
  * @author Daniel Kinzler
  */
 
+namespace MediaWiki\Content;
+
+use Action;
+use ChangeTags;
+use DifferenceEngine;
+use DifferenceEngineSlotDiffRenderer;
+use IDBAccessObject;
+use ILanguageConverter;
+use InvalidArgumentException;
+use Language;
+use LogicException;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Content\Renderer\ContentParseParams;
-use MediaWiki\Content\TextContent;
 use MediaWiki\Content\Transform\PreloadTransformParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
-use MediaWiki\Content\ValidationParams;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\DeferrableUpdate;
@@ -48,8 +57,19 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SlotRenderingProvider;
 use MediaWiki\Search\ParserOutputSearchDataExtractor;
 use MediaWiki\Title\Title;
+use MWContentSerializationException;
+use MWException;
+use MWUnknownContentModelException;
+use ParserCache;
+use SearchEngine;
+use SearchIndexField;
+use SlotDiffRenderer;
+use StatusValue;
+use TextSlotDiffRenderer;
+use UnexpectedValueException;
 use Wikimedia\Assert\Assert;
 use Wikimedia\ScopedCallback;
+use WikiPage;
 
 /**
  * A content handler knows how do deal with a specific type of content on a wiki
@@ -1744,3 +1764,6 @@ abstract class ContentHandler {
 	}
 
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( ContentHandler::class, 'ContentHandler' );

includes/content/ContentHandlerFactory.php

@@ -24,7 +24,6 @@
 
 namespace MediaWiki\Content;
 
-use ContentHandler;
 use InvalidArgumentException;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;

includes/content/ContentModelChange.php

@@ -3,8 +3,6 @@
 namespace MediaWiki\Content;
 
 use ChangeTags;
-use Content;
-use ContentHandler;
 use LogFormatterFactory;
 use ManualLogEntry;
 use MediaWiki\Context\DerivativeContext;

includes/content/CssContentHandler.php

@@ -23,7 +23,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Html\Html;

includes/content/FallbackContent.php

@@ -27,9 +27,6 @@
 
 namespace MediaWiki\Content;
 
-use AbstractContent;
-use Content;
-
 /**
  * Content object implementation representing unknown content.
  *

includes/content/FallbackContentHandler.php

@@ -25,8 +25,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
-use ContentHandler;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;

includes/content/Hook/ContentAlterParserOutputHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 

includes/content/Hook/ContentGetParserOutputHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 use ParserOptions;

includes/content/Hook/ContentHandlerForModelIDHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/content/Hook/ConvertContentHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/content/Hook/GetSlotDiffRendererHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Context\IContextSource;
 use SlotDiffRenderer;
 

includes/content/Hook/PlaceNewSectionHook.php

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

includes/content/Hook/SearchDataForIndex2Hook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use SearchEngine;

includes/content/Hook/SearchDataForIndexHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Content\Hook;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Parser\ParserOutput;
 use SearchEngine;
 use WikiPage;

includes/content/IContentHandlerFactory.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Content;
 
-use ContentHandler;
 use MWUnknownContentModelException;
 
 interface IContentHandlerFactory {

includes/content/JavaScriptContentHandler.php

@@ -20,7 +20,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Html\Html;

includes/content/JsonContentHandler.php

@@ -20,7 +20,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\MediaWikiServices;

includes/content/Renderer/ContentRenderer.php

@@ -1,7 +1,7 @@
 <?php
 namespace MediaWiki\Content\Renderer;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Parser\ParserOutput;

includes/content/TextContent.php

@@ -27,8 +27,6 @@
 
 namespace MediaWiki\Content;
 
-use AbstractContent;
-use Content;
 use InvalidArgumentException;
 use Language;
 use MediaWiki\MainConfigNames;

includes/content/TextContentHandler.php

@@ -25,8 +25,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
-use ContentHandler;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\MainConfigNames;

includes/content/Transform/ContentTransformer.php

@@ -1,7 +1,7 @@
 <?php
 namespace MediaWiki\Content\Transform;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Page\PageReference;
 use MediaWiki\User\UserIdentity;

includes/content/WikitextContent.php

@@ -27,7 +27,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use InvalidArgumentException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;

includes/content/WikitextContentHandler.php

@@ -25,7 +25,6 @@
 
 namespace MediaWiki\Content;
 
-use Content;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreloadTransformParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;

includes/deferred/SearchUpdate.php

@@ -25,8 +25,8 @@
 
 namespace MediaWiki\Deferred;
 
-use Content;
 use IDBAccessObject;
+use MediaWiki\Content\Content;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/edit/PreparedEdit.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Edit;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
 use RuntimeException;

includes/edit/SelserContext.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Edit;
 
-use Content;
+use MediaWiki\Content\Content;
 use UnexpectedValueException;
 use Wikimedia\Parsoid\Core\PageBundle;
 use Wikimedia\Parsoid\Core\SelserData;

includes/editpage/Constraint/EditConstraintFactory.php

@@ -20,9 +20,9 @@
 
 namespace MediaWiki\EditPage\Constraint;
 
-use Content;
 use Language;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HookContainer\HookContainer;

includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php

@@ -21,8 +21,8 @@
 namespace MediaWiki\EditPage\Constraint;
 
 use ApiMessage;
-use Content;
 use Language;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;

includes/editpage/Constraint/ExistingSectionEditConstraint.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\EditPage\Constraint;
 
-use Content;
+use MediaWiki\Content\Content;
 use StatusValue;
 
 /**

includes/editpage/Constraint/ImageRedirectConstraint.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\EditPage\Constraint;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use StatusValue;

includes/editpage/Constraint/SelfRedirectConstraint.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\EditPage\Constraint;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Linker\LinkTarget;
 use StatusValue;
 

includes/editpage/EditPage.php

@@ -23,8 +23,6 @@ namespace MediaWiki\EditPage;
 use Article;
 use BadMethodCallException;
 use CategoryPage;
-use Content;
-use ContentHandler;
 use ErrorPageError;
 use IDBAccessObject;
 use LogPage;
@@ -35,6 +33,8 @@ use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\Config;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Context\DerivativeContext;

includes/editpage/PreloadedContentBuilder.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\EditPage;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Transform\ContentTransformer;
 use MediaWiki\HookContainer\HookContainer;

includes/editpage/TextConflictHelper.php

@@ -20,9 +20,9 @@
 
 namespace MediaWiki\EditPage;
 
-use Content;
-use ContentHandler;
 use IBufferingStatsdDataFactory;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Html\Html;
 use MediaWiki\Output\OutputPage;

includes/page/DeletePage.php

@@ -4,7 +4,6 @@ namespace MediaWiki\Page;
 
 use BadMethodCallException;
 use ChangeTags;
-use Content;
 use DeletePageJob;
 use Exception;
 use IDBAccessObject;
@@ -14,6 +13,7 @@ use ManualLogEntry;
 use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
 use MediaWiki\Deferred\DeferrableUpdate;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;

includes/page/Hook/ArticleDeleteCompleteHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Page\Hook;
 
-use Content;
 use ManualLogEntry;
+use MediaWiki\Content\Content;
 use MediaWiki\User\User;
 use WikiPage;
 

includes/page/Hook/WikiPageDeletionUpdatesHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Page\Hook;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Deferred\DeferrableUpdate;
 use WikiPage;
 

includes/page/MergeHistory.php

@@ -23,11 +23,11 @@
 
 namespace MediaWiki\Page;
 
-use Content;
 use InvalidArgumentException;
 use ManualLogEntry;
 use MediaWiki;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HookContainer\HookContainer;

includes/page/MovePage.php

@@ -21,7 +21,6 @@
 namespace MediaWiki\Page;
 
 use ChangeTags;
-use ContentHandler;
 use File;
 use IDBAccessObject;
 use LogFormatterFactory;
@@ -29,6 +28,7 @@ use ManualLogEntry;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\WikitextContent;
 use MediaWiki\Context\RequestContext;

includes/parser/ParserObserver.php

@@ -28,9 +28,9 @@
 
 namespace MediaWiki\Parser;
 
-use Content;
 use MapCacheLRU;
 use MediaWiki\Cache\CacheKeyHelper;
+use MediaWiki\Content\Content;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
 use ParserOptions;

includes/parser/Parsoid/Config/DataAccess.php

@@ -19,12 +19,12 @@
 
 namespace MediaWiki\Parser\Parsoid\Config;
 
-use ContentHandler;
 use File;
 use LanguageCode;
 use MediaTransformError;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\Transform\ContentTransformer;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;

includes/parser/Parsoid/HtmlToContentTransform.php

@@ -3,10 +3,10 @@
 namespace MediaWiki\Parser\Parsoid;
 
 use Composer\Semver\Semver;
-use Content;
-use ContentHandler;
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use LogicException;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;

includes/specials/SpecialChangeContentModel.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Specials;
 
-use ContentHandler;
 use ErrorPageError;
 use LogEventsList;
 use LogPage;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\CommentStore\CommentStore;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HTMLForm\HTMLForm;

tests/phpunit/includes/ResourceLoader/WikiModuleTest.php

@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Tests\ResourceLoader;
 
-use Content;
 use LinkCacheTestTrait;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\HashConfig;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\CssContent;
 use MediaWiki\Content\JavaScriptContent;
 use MediaWiki\Content\JavaScriptContentHandler;

tests/phpunit/includes/Revision/ArchivedRevisionLookupTest.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Revision;
 
-use ContentHandler;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;

tests/phpunit/includes/Revision/RenderedRevisionTest.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Revision;
 
-use Content;
 use InvalidArgumentException;
 use LogicException;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\WikitextContent;
 use MediaWiki\Page\PageIdentity;

tests/phpunit/includes/Revision/RevisionRendererTest.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Revision;
 
-use Content;
 use LogicException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\WikitextContent;

tests/phpunit/includes/Revision/RevisionStoreDbTest.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Revision;
 
-use Content;
 use Exception;
 use IDBAccessObject;
 use InvalidArgumentException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\FallbackContent;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Content\WikitextContent;

tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Storage;
 
-use Content;
-use ContentHandler;
 use DummyContentHandlerForTesting;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\JavaScriptContent;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Content\TextContentHandler;

tests/phpunit/includes/Storage/PageUpdaterFactoryIntegrationTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Storage;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Revision\SlotRecord;
 use MediaWikiIntegrationTestCase;

tests/phpunit/includes/Storage/PageUpdaterTest.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Tests\Storage;
 
 use ChangeTags;
-use Content;
 use LogicException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Content\WikitextContent;
 use MediaWiki\Deferred\DeferredUpdates;

tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Storage;
 
-use Content;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\WikitextContent;
 use MediaWiki\Revision\MutableRevisionSlots;
 use MediaWiki\Revision\RevisionAccessException;

tests/phpunit/includes/content/ContentHandlerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\CssContentHandler;
 use MediaWiki\Content\JavaScriptContentHandler;
 use MediaWiki\Content\JsonContent;
@@ -106,7 +107,7 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase {
 	 */
 	public function testGetDefaultModelFor( $title, $expectedModelId ) {
 		$title = Title::newFromText( $title );
-		$this->hideDeprecated( 'ContentHandler::getDefaultModelFor' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getDefaultModelFor' );
 		$this->assertEquals( $expectedModelId, ContentHandler::getDefaultModelFor( $title ) );
 	}
 
@@ -169,21 +170,21 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase {
 	}
 
 	public function testGetContentText_Null() {
-		$this->hideDeprecated( 'ContentHandler::getContentText' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getContentText' );
 		$content = null;
 		$text = ContentHandler::getContentText( $content );
 		$this->assertSame( '', $text );
 	}
 
 	public function testGetContentText_TextContent() {
-		$this->hideDeprecated( 'ContentHandler::getContentText' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getContentText' );
 		$content = new WikitextContent( "hello world" );
 		$text = ContentHandler::getContentText( $content );
 		$this->assertEquals( $content->getText(), $text );
 	}
 
 	public function testGetContentText_NonTextContent() {
-		$this->hideDeprecated( 'ContentHandler::getContentText' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getContentText' );
 		$content = new DummyContentForTesting( "hello world" );
 		$text = ContentHandler::getContentText( $content );
 		$this->assertNull( $text );
@@ -422,7 +423,7 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase {
 		$this->setTemporaryHook( 'GetContentModels', static function ( &$models ) {
 			$models[] = 'Ferrari';
 		} );
-		$this->hideDeprecated( 'ContentHandler::getContentModels' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getContentModels' );
 		$this->assertContains( 'Ferrari', ContentHandler::getContentModels() );
 	}
 

tests/phpunit/includes/content/WikitextContentHandlerTest.php

@@ -247,7 +247,7 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
 				return new DummySearchIndexFieldDefinition( $name, $type );
 			} );
 
-		$this->hideDeprecated( 'ContentHandler::getForModelID' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getForModelID' );
 
 		$fields = $this->handler->getFieldsForSearchIndex( $searchEngine );
 

tests/phpunit/includes/page/WikiPageDbTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Category\Category;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Content\WikitextContent;
@@ -1158,7 +1159,7 @@ more stuff
 		}
 
 		$this->hideDeprecated( 'WikiPage::getAutoDeleteReason:' );
-		$this->hideDeprecated( 'ContentHandler::getAutoDeleteReason:' );
+		$this->hideDeprecated( 'MediaWiki\\Content\\ContentHandler::getAutoDeleteReason:' );
 		$reason = $page->getAutoDeleteReason( $hasHistory );
 
 		if ( is_bool( $expectedResult ) || $expectedResult === null ) {

tests/phpunit/integration/includes/ExtensionJsonTestBase.php

@@ -6,10 +6,10 @@ namespace MediaWiki\Tests;
 
 use ApiMain;
 use ApiQuery;
-use ContentHandler;
 use MediaWiki\Auth\PreAuthenticationProvider;
 use MediaWiki\Auth\PrimaryAuthenticationProvider;
 use MediaWiki\Auth\SecondaryAuthenticationProvider;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;

tests/phpunit/integration/includes/page/DeletePageTest.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Page;
 
-use Content;
-use ContentHandler;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

tests/phpunit/maintenance/DumpTestCase.php

@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Tests\Maintenance;
 
-use Content;
 use DOMDocument;
 use ExecutableFinder;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\Content;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionRecord;

tests/phpunit/maintenance/FetchTextTest.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Maintenance;
 
-use ContentHandler;
 use Exception;
 use FetchText;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use MediaWikiIntegrationTestCase;

tests/phpunit/mocks/content/DummyContentHandlerForTesting.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Content\Content;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Parser\ParserOutput;
 

tests/phpunit/unit/includes/Revision/MainSlotRoleHandlerTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Unit\Revision;
 
-use ContentHandler;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Revision\MainSlotRoleHandler;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Tests\Unit\DummyServicesTrait;

tests/phpunit/unit/includes/Revision/MutableRevisionSlotsTest.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Unit\Revision;
 
-use Content;
 use InvalidArgumentException;
+use MediaWiki\Content\Content;
 use MediaWiki\Content\WikitextContent;
 use MediaWiki\Revision\MutableRevisionSlots;
 use MediaWiki\Revision\RevisionAccessException;

tests/phpunit/unit/includes/content/ContentHandlerFactoryTest.php

@@ -1,8 +1,18 @@
 <?php
 
+namespace MediaWiki\Tests\Unit\Content;
+
+use DummyContentHandlerForTesting;
+use Error;
+use InvalidArgumentException;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Content\ContentHandlerFactory;
 use MediaWiki\HookContainer\HookContainer;
+use MediaWikiUnitTestCase;
+use MWUnknownContentModelException;
 use Psr\Log\LogLevel;
+use TestLogger;
+use UnexpectedValueException;
 use Wikimedia\ObjectFactory\ObjectFactory;
 
 /**