diff options
75 files changed, 138 insertions, 52 deletions
diff --git a/RELEASE-NOTES-1.43 b/RELEASE-NOTES-1.43 index 9644215d3a70..15feaf73ba32 100644 --- a/RELEASE-NOTES-1.43 +++ b/RELEASE-NOTES-1.43 @@ -354,6 +354,9 @@ because of Phabricator reports. - JsonContentHandler - TextContent - TextContentHandler + - WikitextContent + - WikitextContentHandler + - WikiTextStructure - MediaWiki\Debug: - DeprecationHelper - MWDebug diff --git a/autoload.php b/autoload.php index 4bf02a9813f4..c7cc1387407b 100644 --- a/autoload.php +++ b/autoload.php @@ -1033,6 +1033,9 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Content\\Transform\\PreloadTransformParams' => __DIR__ . '/includes/content/Transform/PreloadTransformParams.php', 'MediaWiki\\Content\\Transform\\PreloadTransformParamsValue' => __DIR__ . '/includes/content/Transform/PreloadTransformParamsValue.php', 'MediaWiki\\Content\\ValidationParams' => __DIR__ . '/includes/content/ValidationParams.php', + 'MediaWiki\\Content\\WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php', + 'MediaWiki\\Content\\WikitextContent' => __DIR__ . '/includes/content/WikitextContent.php', + 'MediaWiki\\Content\\WikitextContentHandler' => __DIR__ . '/includes/content/WikitextContentHandler.php', 'MediaWiki\\Context\\ContextSource' => __DIR__ . '/includes/context/ContextSource.php', 'MediaWiki\\Context\\DerivativeContext' => __DIR__ . '/includes/context/DerivativeContext.php', 'MediaWiki\\Context\\IContextSource' => __DIR__ . '/includes/context/IContextSource.php', diff --git a/docs/config-schema.yaml b/docs/config-schema.yaml index 9b4e721e0757..f3d755a23ebb 100644 --- a/docs/config-schema.yaml +++ b/docs/config-schema.yaml @@ -2013,7 +2013,7 @@ config-schema: - 1.41: Added ContentHandlers: default: - wikitext: { class: WikitextContentHandler, services: [TitleFactory, ParserFactory, GlobalIdGenerator, LanguageNameUtils, LinkRenderer, MagicWordFactory, ParsoidParserFactory] } + wikitext: { class: MediaWiki\Content\WikitextContentHandler, services: [TitleFactory, ParserFactory, GlobalIdGenerator, LanguageNameUtils, LinkRenderer, MagicWordFactory, ParsoidParserFactory] } javascript: MediaWiki\Content\JavaScriptContentHandler json: MediaWiki\Content\JsonContentHandler css: MediaWiki\Content\CssContentHandler diff --git a/includes/MainConfigSchema.php b/includes/MainConfigSchema.php index f3afe6f4cdb4..db9b8f4b35fc 100644 --- a/includes/MainConfigSchema.php +++ b/includes/MainConfigSchema.php @@ -45,6 +45,7 @@ use MediaWiki\Content\FallbackContentHandler; use MediaWiki\Content\JavaScriptContentHandler; use MediaWiki\Content\JsonContentHandler; use MediaWiki\Content\TextContentHandler; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\Password\Argon2Password; use MediaWiki\Password\BcryptPassword; @@ -96,7 +97,6 @@ use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\ObjectCache\MemcachedPeclBagOStuff; use Wikimedia\ObjectCache\MemcachedPhpBagOStuff; use Wikimedia\ObjectCache\WinCacheBagOStuff; -use WikitextContentHandler; /** * This class contains schema declarations for all configuration variables diff --git a/includes/Rest/Handler/Helper/PageContentHelper.php b/includes/Rest/Handler/Helper/PageContentHelper.php index c3fcbcd8b807..c7edba57c01e 100644 --- a/includes/Rest/Handler/Helper/PageContentHelper.php +++ b/includes/Rest/Handler/Helper/PageContentHelper.php @@ -4,6 +4,7 @@ namespace MediaWiki\Rest\Handler\Helper; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Message\Message; use MediaWiki\Page\ExistingPageRecord; @@ -23,7 +24,6 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleFormatter; use Wikimedia\Message\MessageValue; use Wikimedia\ParamValidator\ParamValidator; -use WikitextContent; /** * @internal for use by core REST infrastructure diff --git a/includes/Rest/Handler/ParsoidHandler.php b/includes/Rest/Handler/ParsoidHandler.php index d0c5cbd66fc8..8fbd03b26201 100644 --- a/includes/Rest/Handler/ParsoidHandler.php +++ b/includes/Rest/Handler/ParsoidHandler.php @@ -25,6 +25,7 @@ use InvalidArgumentException; use LanguageCode; use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use LogicException; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; @@ -63,7 +64,6 @@ use Wikimedia\Parsoid\Utils\ContentUtils; use Wikimedia\Parsoid\Utils\DOMCompat; use Wikimedia\Parsoid\Utils\DOMUtils; use Wikimedia\Parsoid\Utils\Timing; -use WikitextContent; // TODO logging, timeouts(?), CORS // TODO content negotiation (routes.js routes.acceptable) diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index 1d1b7d67d9c7..76c7b8f95d14 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -24,6 +24,7 @@ use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\DerivativeContext; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/config-schema.php b/includes/config-schema.php index 91d1424085b7..703be687dc2a 100644 --- a/includes/config-schema.php +++ b/includes/config-schema.php @@ -396,7 +396,7 @@ return [ ], 'ContentHandlers' => [ 'wikitext' => [ - 'class' => 'WikitextContentHandler', + 'class' => 'MediaWiki\\Content\\WikitextContentHandler', 'services' => [ 'TitleFactory', 'ParserFactory', diff --git a/includes/content/FileContentHandler.php b/includes/content/FileContentHandler.php index c7affed71447..ee12bf4ee404 100644 --- a/includes/content/FileContentHandler.php +++ b/includes/content/FileContentHandler.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\ParserOutput; use MediaWiki\Revision\RevisionRecord; diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php index fa5979f9f2c6..a88c304c5b61 100644 --- a/includes/content/TextContent.php +++ b/includes/content/TextContent.php @@ -35,7 +35,6 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MWUnknownContentModelException; use Wikimedia\Diff\Diff; -use WikitextContent; /** * Content object implementation for representing flat text. diff --git a/includes/content/WikiTextStructure.php b/includes/content/WikiTextStructure.php index 0bb1ca6a62c7..09c813667329 100644 --- a/includes/content/WikiTextStructure.php +++ b/includes/content/WikiTextStructure.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Content; + use HtmlFormatter\HtmlFormatter; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Sanitizer; @@ -64,6 +66,7 @@ class WikiTextStructure { /** * Gets headings from the page. + * * @return string[] * First strip out things that look like references. We can't use HTML filtering because * the references come back as <sup> tags without a class. To keep from breaking stuff like @@ -104,6 +107,7 @@ class WikiTextStructure { $headings[] = $heading; } } + return $headings; } @@ -112,6 +116,7 @@ class WikiTextStructure { * parse settings stored as i18n messages (see search-ignored-headings). * * @param string $message + * * @return string[] */ public static function parseSettingsInMessage( $message ) { @@ -120,12 +125,14 @@ class WikiTextStructure { $lines = preg_replace( '/#.*$/', '', $lines ); // Remove extra spaces $lines = array_map( 'trim', $lines ); + // Remove empty lines return array_filter( $lines ); } /** * Gets a list of heading to ignore. + * * @return string[] */ private function getIgnoredHeadings() { @@ -139,6 +146,7 @@ class WikiTextStructure { $ignoredHeadings = $lines; } } + return $ignoredHeadings; } @@ -152,6 +160,7 @@ class WikiTextStructure { $text = $this->parserOutput->getRawText(); if ( $text === '' ) { $this->allText = ""; + // empty text - nothing to seek here return; } @@ -178,7 +187,9 @@ class WikiTextStructure { /** * Get text before first heading. + * * @param string $text + * * @return string|null */ private function extractTextBeforeFirstHeading( $text ) { @@ -215,6 +226,7 @@ class WikiTextStructure { */ public function getOpeningText() { $this->extractWikitextParts(); + return $this->openingText; } @@ -223,6 +235,7 @@ class WikiTextStructure { */ public function getMainText() { $this->extractWikitextParts(); + return $this->allText; } @@ -231,11 +244,13 @@ class WikiTextStructure { */ public function getAuxiliaryText() { $this->extractWikitextParts(); + return $this->auxText; } /** * Get the "defaultsort" property + * * @return string|null */ public function getDefaultSort() { @@ -243,6 +258,10 @@ class WikiTextStructure { if ( $sort === false ) { return null; } + return $sort; } } + +/** @deprecated class alias since 1.43 */ +class_alias( WikiTextStructure::class, 'WikiTextStructure' ); diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index fb94cd4f97ae..28ed326ca6d5 100644 --- a/includes/content/WikitextContent.php +++ b/includes/content/WikitextContent.php @@ -25,7 +25,10 @@ * @author Daniel Kinzler */ -use MediaWiki\Content\TextContent; +namespace MediaWiki\Content; + +use Content; +use InvalidArgumentException; use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; @@ -78,6 +81,7 @@ class WikitextContent extends TextContent { * @param string|int|null|false $sectionId * @param Content $with New section content, must have the same content model as $this. * @param string $sectionTitle + * * @return Content * * @see Content::replaceSection() @@ -241,6 +245,7 @@ class WikitextContent extends TextContent { /** * @param int $maxlength + * * @return string */ public function getTextForSummary( $maxlength = 250 ) { @@ -269,7 +274,9 @@ class WikitextContent extends TextContent { /** * Records flags set by preSaveTransform + * * @internal for use by WikitextContentHandler + * * @param string[] $flags */ public function setPreSaveTransformFlags( array $flags ) { @@ -278,6 +285,7 @@ class WikitextContent extends TextContent { /** * Records flags set by preSaveTransform + * * @internal for use by WikitextContentHandler * @return string[] */ @@ -288,6 +296,10 @@ class WikitextContent extends TextContent { public function getContentHandler(): WikitextContentHandler { $handler = parent::getContentHandler(); '@phan-var WikitextContentHandler $handler'; + return $handler; } } + +/** @deprecated class alias since 1.43 */ +class_alias( WikitextContent::class, 'WikitextContent' ); diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php index f517c0ebb198..f332489c90c7 100644 --- a/includes/content/WikitextContentHandler.php +++ b/includes/content/WikitextContentHandler.php @@ -23,8 +23,11 @@ * @ingroup Content */ +namespace MediaWiki\Content; + +use Content; +use FileContentHandler; use MediaWiki\Content\Renderer\ContentParseParams; -use MediaWiki\Content\TextContentHandler; use MediaWiki\Content\Transform\PreloadTransformParams; use MediaWiki\Content\Transform\PreSaveTransformParams; use MediaWiki\Languages\LanguageNameUtils; @@ -37,7 +40,12 @@ use MediaWiki\Parser\Parsoid\ParsoidParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; +use MessageContent; +use ParserFactory; +use SearchEngine; +use SearchIndexField; use Wikimedia\UUID\GlobalIdGenerator; +use WikiPage; /** * Content handler for wiki text pages. @@ -116,6 +124,7 @@ class WikitextContentHandler extends TextContentHandler { } $class = $this->getContentClass(); + return new $class( $redirectText ); } @@ -191,6 +200,7 @@ class WikitextContentHandler extends TextContentHandler { $fields['opening_text']->setFlag( SearchIndexField::FLAG_SCORING | SearchIndexField::FLAG_NO_HIGHLIGHT ); + // Until we have the full first-class content handler for files, we invoke it explicitly here return array_merge( $fields, $this->getFileHandler()->getFieldsForSearchIndex( $engine ) ); } @@ -219,6 +229,7 @@ class WikitextContentHandler extends TextContentHandler { $this->getFileHandler()->getDataForSearchIndex( $page, $parserOutput, $engine, $revision ) ); } + return $fields; } @@ -264,6 +275,7 @@ class WikitextContentHandler extends TextContentHandler { $contentClass = $this->getContentClass(); $ret = new $contentClass( $pst ); $ret->setPreSaveTransformFlags( $parser->getOutput()->getAllFlags() ); + return $ret; } @@ -291,6 +303,7 @@ class WikitextContentHandler extends TextContentHandler { ); $contentClass = $this->getContentClass(); + return new $contentClass( $plt ); } @@ -341,6 +354,7 @@ class WikitextContentHandler extends TextContentHandler { * using the global Parser service. * * @since 1.38 + * * @param Content $content * @param ContentParseParams $cpoParams * @param ParserOutput &$parserOutput The output object to fill (reference). @@ -418,3 +432,6 @@ class WikitextContentHandler extends TextContentHandler { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( WikitextContentHandler::class, 'WikitextContentHandler' ); diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index fc074b78c7fa..4eed2450d0ee 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -41,6 +41,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\GlobalVarConfig; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; @@ -64,7 +65,6 @@ use Wikimedia\AtEase\AtEase; use Wikimedia\Message\MessageSpecifier; use Wikimedia\ObjectCache\EmptyBagOStuff; use Wikimedia\Services\ServiceDisabledException; -use WikitextContent; /** * The Installer helps admins create or upgrade their wiki. diff --git a/includes/page/MovePage.php b/includes/page/MovePage.php index fd683ca2eb2f..ecbae6065b11 100644 --- a/includes/page/MovePage.php +++ b/includes/page/MovePage.php @@ -30,6 +30,7 @@ use MediaWiki\Collation\CollationFactory; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\AtomicSectionUpdate; use MediaWiki\Deferred\DeferredUpdates; @@ -56,7 +57,6 @@ use StringUtils; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IDatabase; use WikiPage; -use WikitextContent; /** * Handles the backend logic of moving a page from one title diff --git a/includes/parser/Parsoid/LintErrorChecker.php b/includes/parser/Parsoid/LintErrorChecker.php index 4d43557efcec..d70bb959704b 100644 --- a/includes/parser/Parsoid/LintErrorChecker.php +++ b/includes/parser/Parsoid/LintErrorChecker.php @@ -5,12 +5,12 @@ namespace MediaWiki\Parser\Parsoid; use ExtensionRegistry; use MediaWiki\Config\Config; +use MediaWiki\Content\WikitextContent; use MediaWiki\Parser\Parsoid\Config\PageConfigFactory; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\TitleFactory; use Wikimedia\Parsoid\Parsoid; -use WikitextContent; /** * Check arbitrary wikitext for lint errors diff --git a/includes/parser/Parsoid/ParsoidParser.php b/includes/parser/Parsoid/ParsoidParser.php index a59ae4aa726d..2cdb98a328b2 100644 --- a/includes/parser/Parsoid/ParsoidParser.php +++ b/includes/parser/Parsoid/ParsoidParser.php @@ -3,6 +3,7 @@ namespace MediaWiki\Parser\Parsoid; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; @@ -17,7 +18,6 @@ use ParserOptions; use Wikimedia\Assert\Assert; use Wikimedia\Parsoid\Config\PageConfig; use Wikimedia\Parsoid\Parsoid; -use WikitextContent; /** * Parser implementation which uses Parsoid. diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php index de41f0864e31..1fb68a09ee71 100644 --- a/maintenance/compareParsers.php +++ b/maintenance/compareParsers.php @@ -28,6 +28,7 @@ * @ingroup Maintenance */ +use MediaWiki\Content\WikitextContent; use MediaWiki\User\User; use Wikimedia\Diff\Diff; use Wikimedia\Diff\UnifiedDiffFormatter; diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index 87a0061f903e..116205532c7c 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -26,6 +26,7 @@ * @ingroup Testing */ +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; diff --git a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php index 1978b2ec66b9..7a80b0730ac4 100644 --- a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php +++ b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php @@ -9,6 +9,7 @@ use MediaWiki\Config\HashConfig; use MediaWiki\Content\CssContent; use MediaWiki\Content\JavaScriptContent; use MediaWiki\Content\JavaScriptContentHandler; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; @@ -25,7 +26,6 @@ use RuntimeException; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\TestingAccessWrapper; use Wikimedia\Timestamp\ConvertibleTimestamp; -use WikitextContent; /** * @group ResourceLoader diff --git a/tests/phpunit/includes/Revision/RenderedRevisionTest.php b/tests/phpunit/includes/Revision/RenderedRevisionTest.php index 3ba635d21854..a6fef23a059b 100644 --- a/tests/phpunit/includes/Revision/RenderedRevisionTest.php +++ b/tests/phpunit/includes/Revision/RenderedRevisionTest.php @@ -6,6 +6,7 @@ use Content; use InvalidArgumentException; use LogicException; use MediaWiki\Content\Renderer\ContentRenderer; +use MediaWiki\Content\WikitextContent; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Page\PageReference; @@ -26,7 +27,6 @@ use MediaWikiIntegrationTestCase; use ParserOptions; use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\TestingAccessWrapper; -use WikitextContent; /** * @covers \MediaWiki\Revision\RenderedRevision diff --git a/tests/phpunit/includes/Revision/RevisionRendererTest.php b/tests/phpunit/includes/Revision/RevisionRendererTest.php index cc777b928ec3..29ec46b62b44 100644 --- a/tests/phpunit/includes/Revision/RevisionRendererTest.php +++ b/tests/phpunit/includes/Revision/RevisionRendererTest.php @@ -7,6 +7,7 @@ use LogicException; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; +use MediaWiki\Content\WikitextContent; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Page\PageReference; @@ -27,7 +28,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\SelectQueryBuilder; -use WikitextContent; /** * @covers \MediaWiki\Revision\RevisionRenderer diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php index 9d76fda057b9..01d7007b1c2c 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php @@ -9,6 +9,7 @@ use InvalidArgumentException; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Content\FallbackContent; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; @@ -48,7 +49,6 @@ use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\Rdbms\TransactionProfiler; use Wikimedia\TestingAccessWrapper; use WikiPage; -use WikitextContent; /** * @group Database diff --git a/tests/phpunit/includes/Revision/RevisionStoreTest.php b/tests/phpunit/includes/Revision/RevisionStoreTest.php index b6333605a5cd..d316c4a43221 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreTest.php @@ -3,6 +3,8 @@ namespace MediaWiki\Tests\Revision; use IDBAccessObject; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Revision\IncompleteRevisionException; use MediaWiki\Revision\RevisionAccessException; @@ -17,8 +19,6 @@ use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\LBFactory; use Wikimedia\TestingAccessWrapper; use Wikimedia\Timestamp\ConvertibleTimestamp; -use WikitextContent; -use WikitextContentHandler; /** * Tests RevisionStore diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php index 2034dfe83275..8a824f667363 100644 --- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php +++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php @@ -10,6 +10,8 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\JavaScriptContent; use MediaWiki\Content\TextContent; use MediaWiki\Content\TextContentHandler; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; use MediaWiki\Deferred\MWCallableUpdate; @@ -42,8 +44,6 @@ use Wikimedia\Rdbms\Platform\ISQLPlatform; use Wikimedia\TestingAccessWrapper; use Wikimedia\Timestamp\ConvertibleTimestamp; use WikiPage; -use WikitextContent; -use WikitextContentHandler; /** * @group Database diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php index ea4cbecd3122..8acd9812328a 100644 --- a/tests/phpunit/includes/Storage/PageUpdaterTest.php +++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php @@ -7,6 +7,7 @@ use Content; use LogicException; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Json\FormatJson; use MediaWiki\Message\Message; @@ -23,7 +24,6 @@ use MediaWikiIntegrationTestCase; use ParserOptions; use RecentChange; use WikiPage; -use WikitextContent; /** * @covers \MediaWiki\Storage\PageUpdater @@ -987,7 +987,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase { $page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title ); $updater = $page->newPageUpdater( $user ) - ->setContent( SlotRecord::MAIN, new \WikitextContent( $wikitext ) ); + ->setContent( SlotRecord::MAIN, new \MediaWiki\Content\WikitextContent( $wikitext ) ); $summary = CommentStoreComment::newUnsavedComment( 'Just a test' ); $rev = $updater->saveRevision( $summary, EDIT_UPDATE ); diff --git a/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php b/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php index e7c777aeb76c..afc095ae480c 100644 --- a/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php +++ b/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php @@ -3,13 +3,13 @@ namespace MediaWiki\Tests\Storage; use Content; +use MediaWiki\Content\WikitextContent; use MediaWiki\Revision\MutableRevisionSlots; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionSlots; use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\RevisionSlotsUpdate; use MediaWikiIntegrationTestCase; -use WikitextContent; /** * @covers \MediaWiki\Storage\RevisionSlotsUpdate diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 23fcd539ac6e..60d5ed2a91de 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -7,6 +7,7 @@ use IDBAccessObject; use MediaWiki\Block\DatabaseBlock; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Content\JavaScriptContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; @@ -18,7 +19,6 @@ use MediaWiki\User\User; use MediaWiki\Utils\MWTimestamp; use RevisionDeleter; use WikiPage; -use WikitextContent; /** * Tests for MediaWiki api.php?action=edit. diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php index 06fca075112a..e1aa3f72a815 100644 --- a/tests/phpunit/includes/api/ApiStashEditTest.php +++ b/tests/phpunit/includes/api/ApiStashEditTest.php @@ -3,6 +3,7 @@ namespace MediaWiki\Tests\Api; use MediaWiki\Content\CssContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Storage\PageEditStash; use MediaWiki\Tests\User\TempUser\TempUserTestTrait; use MediaWiki\Title\Title; @@ -15,7 +16,6 @@ use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Stats\StatsFactory; use Wikimedia\TestingAccessWrapper; use Wikimedia\Timestamp\ConvertibleTimestamp; -use WikitextContent; /** * @covers \ApiStashEdit diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php index ce2f4be23717..33ca56d36028 100644 --- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php @@ -3,12 +3,12 @@ namespace MediaWiki\Tests\Api\Query; use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\WikitextContent; use MediaWiki\Permissions\UltimateAuthority; use MediaWiki\Revision\SlotRecord; use MediaWiki\Tests\Api\ApiTestCase; use MediaWiki\Tests\User\TempUser\TempUserTestTrait; use MediaWiki\User\UserIdentityValue; -use WikitextContent; /** * @group API diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php index 5172b271f8ab..7c0fa1584531 100644 --- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php @@ -2,12 +2,12 @@ namespace MediaWiki\Tests\Api\Query; +use MediaWiki\Content\WikitextContent; use MediaWiki\Tests\Api\ApiTestCase; use MediaWiki\Tests\User\TempUser\TempUserTestTrait; use MediaWiki\Title\TitleValue; use MediaWiki\User\User; use MediaWiki\User\UserRigorOptions; -use WikitextContent; /** * @group API diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php index e3811626680d..95a46e133e97 100644 --- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php +++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php index 4f9f9ac78e77..8ff924986304 100644 --- a/tests/phpunit/includes/content/ContentHandlerTest.php +++ b/tests/phpunit/includes/content/ContentHandlerTest.php @@ -6,6 +6,8 @@ use MediaWiki\Content\JsonContent; use MediaWiki\Content\JsonContentHandler; use MediaWiki\Content\TextContentHandler; use MediaWiki\Content\ValidationParams; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Context\RequestContext; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; diff --git a/tests/phpunit/includes/content/CssContentTest.php b/tests/phpunit/includes/content/CssContentTest.php index 4e6e4f2328e4..822b114f74e8 100644 --- a/tests/phpunit/includes/content/CssContentTest.php +++ b/tests/phpunit/includes/content/CssContentTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Content\CssContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; /** diff --git a/tests/phpunit/includes/content/FallbackContentTest.php b/tests/phpunit/includes/content/FallbackContentTest.php index 15d07c871301..1cb4f23689ea 100644 --- a/tests/phpunit/includes/content/FallbackContentTest.php +++ b/tests/phpunit/includes/content/FallbackContentTest.php @@ -3,6 +3,7 @@ use MediaWiki\Content\FallbackContent; use MediaWiki\Content\FallbackContentHandler; use MediaWiki\Content\JavaScriptContent; +use MediaWiki\Content\WikitextContent; /** * @group ContentHandler diff --git a/tests/phpunit/includes/content/MessageContentTest.php b/tests/phpunit/includes/content/MessageContentTest.php index 9910230dc76c..97eed4754a81 100644 --- a/tests/phpunit/includes/content/MessageContentTest.php +++ b/tests/phpunit/includes/content/MessageContentTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; diff --git a/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php b/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php index d33081715983..2a67676de9f1 100644 --- a/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php +++ b/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php @@ -4,6 +4,7 @@ use MediaWiki\Content\CssContentHandler; use MediaWiki\Content\JavaScriptContentHandler; use MediaWiki\Content\JsonContentHandler; use MediaWiki\Content\TextContentHandler; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\MainConfigNames; /** diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php index e42b9f1506c7..c6f8d1ad7d05 100644 --- a/tests/phpunit/includes/content/TextContentTest.php +++ b/tests/phpunit/includes/content/TextContentTest.php @@ -2,6 +2,7 @@ use MediaWiki\Content\JavaScriptContent; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/content/Transform/ContentTransformerTest.php b/tests/phpunit/includes/content/Transform/ContentTransformerTest.php index 1a3ec3479866..a1a44b847699 100644 --- a/tests/phpunit/includes/content/Transform/ContentTransformerTest.php +++ b/tests/phpunit/includes/content/Transform/ContentTransformerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php b/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php index 32b5d7741d50..59e4305dcdec 100644 --- a/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php +++ b/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php @@ -12,7 +12,7 @@ use Wikimedia\Parsoid\Parsoid; * @group ContentHandler * @group Database * ^--- needed, because we do need the database to test link updates - * @covers \WikitextContentHandler + * @covers \MediaWiki\Content\WikitextContentHandler */ class WikitextContentHandlerIntegrationTest extends TextContentHandlerIntegrationTest { protected function setUp(): void { diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php index f79d51a16e70..cff7f08cf2a3 100644 --- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageReferenceValue; use MediaWiki\Parser\ParserOutput; @@ -13,7 +15,7 @@ use Wikimedia\TestingAccessWrapper; * See also unit tests at \MediaWiki\Tests\Unit\WikitextContentHandlerTest * * @group ContentHandler - * @covers \WikitextContentHandler + * @covers \MediaWiki\Content\WikitextContentHandler * @covers \TextContentHandler * @covers \ContentHandler */ diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php index 312382ad48fb..f15d2ac842cd 100644 --- a/tests/phpunit/includes/content/WikitextContentTest.php +++ b/tests/phpunit/includes/content/WikitextContentTest.php @@ -2,6 +2,7 @@ use MediaWiki\Content\JavaScriptContent; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate; use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; @@ -11,7 +12,7 @@ use MediaWiki\Title\Title; * * @group Database * ^--- needed, because we do need the database to test link updates - * @covers \WikitextContent + * @covers \MediaWiki\Content\WikitextContent */ class WikitextContentTest extends TextContentTest { public static $sections = "Intro diff --git a/tests/phpunit/includes/content/WikitextStructureTest.php b/tests/phpunit/includes/content/WikitextStructureTest.php index 5eec758392e2..952a1d55b6a4 100644 --- a/tests/phpunit/includes/content/WikitextStructureTest.php +++ b/tests/phpunit/includes/content/WikitextStructureTest.php @@ -1,10 +1,12 @@ <?php +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikiTextStructure; use MediaWiki\Title\Title; /** * @group Database - * @covers \WikiTextStructure + * @covers \MediaWiki\Content\WikiTextStructure */ class WikitextStructureTest extends MediaWikiLangTestCase { diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php index d6d008d57d4b..bfb0071aa546 100644 --- a/tests/phpunit/includes/deferred/LinksUpdateTest.php +++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\LinksUpdate\LinksTable; use MediaWiki\Deferred\LinksUpdate\LinksTableGroup; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; diff --git a/tests/phpunit/includes/diff/SlotDiffRendererTest.php b/tests/phpunit/includes/diff/SlotDiffRendererTest.php index 9c3f7b97bcd0..0bbcbec0af0e 100644 --- a/tests/phpunit/includes/diff/SlotDiffRendererTest.php +++ b/tests/phpunit/includes/diff/SlotDiffRendererTest.php @@ -3,6 +3,7 @@ use MediaWiki\Content\CssContent; use MediaWiki\Content\JsonContent; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use Wikimedia\Assert\ParameterTypeException; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php index 5f376385d4e3..7f81bb5cf981 100644 --- a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\WikitextContent; use MediaWiki\Page\PageAssertionException; use MediaWiki\Title\Title; use Wikimedia\Rdbms\Platform\ISQLPlatform; diff --git a/tests/phpunit/includes/page/ArticleTablesTest.php b/tests/phpunit/includes/page/ArticleTablesTest.php index 41d7f7b98e8e..6c2636461963 100644 --- a/tests/phpunit/includes/page/ArticleTablesTest.php +++ b/tests/phpunit/includes/page/ArticleTablesTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Title\Title; /** diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php index ca60586e8e16..02861e2f6eb4 100644 --- a/tests/phpunit/includes/page/ArticleViewTest.php +++ b/tests/phpunit/includes/page/ArticleViewTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/page/MovePageTest.php b/tests/phpunit/includes/page/MovePageTest.php index 34753bfaf628..5d85008f2d62 100644 --- a/tests/phpunit/includes/page/MovePageTest.php +++ b/tests/phpunit/includes/page/MovePageTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Config\ServiceOptions; +use MediaWiki\Content\WikitextContent; use MediaWiki\Interwiki\InterwikiLookup; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/tests/phpunit/includes/page/ParserOutputAccessTest.php b/tests/phpunit/includes/page/ParserOutputAccessTest.php index b362156f0680..5d930f89288c 100644 --- a/tests/phpunit/includes/page/ParserOutputAccessTest.php +++ b/tests/phpunit/includes/page/ParserOutputAccessTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Json\JsonCodec; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Logger\Spi as LoggerSpi; diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php index 869f882a5122..0fdc019fa904 100644 --- a/tests/phpunit/includes/page/WikiPageDbTest.php +++ b/tests/phpunit/includes/page/WikiPageDbTest.php @@ -4,6 +4,7 @@ use MediaWiki\Category\Category; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\Edit\PreparedEdit; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/parser/BeforeParserFetchTemplateRevisionRecordTest.php b/tests/phpunit/includes/parser/BeforeParserFetchTemplateRevisionRecordTest.php index 048209103f40..4f35c278bf6e 100644 --- a/tests/phpunit/includes/parser/BeforeParserFetchTemplateRevisionRecordTest.php +++ b/tests/phpunit/includes/parser/BeforeParserFetchTemplateRevisionRecordTest.php @@ -2,6 +2,7 @@ namespace MediaWiki\Tests\Parser; +use MediaWiki\Content\WikitextContent; use MediaWiki\Linker\LinkTarget; use MediaWiki\Parser\Parser; use MediaWiki\Revision\MutableRevisionRecord; @@ -10,7 +11,6 @@ use MediaWiki\Revision\SlotRecord; use MediaWikiLangTestCase; use MockTitleTrait; use ParserOptions; -use WikitextContent; /** * @group Database diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php b/tests/phpunit/includes/parser/ParserMethodsTest.php index 662ac49c8465..a2da46cee5d0 100644 --- a/tests/phpunit/includes/parser/ParserMethodsTest.php +++ b/tests/phpunit/includes/parser/ParserMethodsTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Parser; use HtmlArmor; use LogicException; +use MediaWiki\Content\WikitextContent; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; @@ -17,7 +18,6 @@ use MediaWiki\User\UserIdentityValue; use MediaWikiLangTestCase; use MockTitleTrait; use ParserOptions; -use WikitextContent; /** * @group Database diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php index af78e4c2f0ed..0b3129cfeee5 100644 --- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php +++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\WikitextContent; use MediaWiki\Logger\Spi as LoggerSpi; use MediaWiki\PoolCounter\PoolWorkArticleView; use MediaWiki\Revision\MutableRevisionRecord; diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php index c6fea3df398a..7afb72b11e32 100644 --- a/tests/phpunit/includes/search/SearchEngineTest.php +++ b/tests/phpunit/includes/search/SearchEngineTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; /** diff --git a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php index 4708026c022c..f89a408b7fe9 100644 --- a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php +++ b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Specials\SpecialMyLanguage; diff --git a/tests/phpunit/includes/title/TemplateCategoriesTest.php b/tests/phpunit/includes/title/TemplateCategoriesTest.php index 345b8375a9fe..05c20bc5a4ef 100644 --- a/tests/phpunit/includes/title/TemplateCategoriesTest.php +++ b/tests/phpunit/includes/title/TemplateCategoriesTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/title/TitleTest.php b/tests/phpunit/includes/title/TitleTest.php index 03812f815b0b..eca3efa9f13b 100644 --- a/tests/phpunit/includes/title/TitleTest.php +++ b/tests/phpunit/includes/title/TitleTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Cache\BacklinkCache; +use MediaWiki\Content\WikitextContent; use MediaWiki\Language\RawMessage; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/user/UserEditTrackerTest.php b/tests/phpunit/includes/user/UserEditTrackerTest.php index 1e81be288b3e..15c08a77eec0 100644 --- a/tests/phpunit/includes/user/UserEditTrackerTest.php +++ b/tests/phpunit/includes/user/UserEditTrackerTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\UserEditCountUpdate; use MediaWiki\Revision\MutableRevisionRecord; diff --git a/tests/phpunit/integration/includes/Rest/Handler/CreationHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/CreationHandlerTest.php index c2945fee88a1..a0ebb21e21e6 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/CreationHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/CreationHandlerTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Rest\Handler; use ApiUsageException; use MediaWiki\Config\HashConfig; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Message\Message; use MediaWiki\Rest\Handler\CreationHandler; @@ -21,7 +22,6 @@ use Wikimedia\Message\DataMessageValue; use Wikimedia\Message\MessageValue; use Wikimedia\Message\ParamType; use Wikimedia\Message\ScalarParam; -use WikitextContent; /** * @covers \MediaWiki\Rest\Handler\CreationHandler diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php index 96a6ad4b9e21..f34ff57b240b 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php @@ -7,6 +7,7 @@ use Exception; use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use LogicException; use MediaWiki\Content\TextContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Edit\ParsoidRenderID; use MediaWiki\Edit\SelserContext; use MediaWiki\MainConfigNames; @@ -38,7 +39,6 @@ use Wikimedia\Parsoid\Core\PageBundle; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\Parsoid; use Wikimedia\Parsoid\Utils\ContentUtils; -use WikitextContent; /** * @covers \MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php index 841e84ac75a8..59ca90a91e31 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php @@ -5,6 +5,7 @@ namespace MediaWiki\Tests\Rest\Handler\Helper; use Exception; use MediaWiki\Content\CssContent; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Content\WikitextContent; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Edit\ParsoidRenderID; use MediaWiki\Edit\SimpleParsoidOutputStash; @@ -54,7 +55,6 @@ use Wikimedia\Parsoid\Core\PageBundle; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\Parsoid; use Wikimedia\TestingAccessWrapper; -use WikitextContent; /** * @covers \MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php index 6af850220fe6..b6f6acce641e 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php @@ -9,6 +9,7 @@ use Generator; use Language; use LanguageCode; use MediaWiki\Content\JavaScriptContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Parser\ParserCacheFactory; @@ -46,7 +47,6 @@ use Wikimedia\Parsoid\Core\ClientError; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\DOM\Document; use Wikimedia\Parsoid\Parsoid; -use WikitextContent; /** * @group Database diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php index afe74b256f0b..de21925d70eb 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Content\JavaScriptContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\Edit\ParsoidRenderID; use MediaWiki\Page\ParserOutputAccess; use MediaWiki\Parser\ParserOutput; diff --git a/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php index 79aa9e0632f3..1681f96c5f59 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php @@ -4,6 +4,8 @@ namespace MediaWiki\Tests\Rest\Handler; use ApiUsageException; use MediaWiki\Config\HashConfig; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Json\FormatJson; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; @@ -30,8 +32,6 @@ use Wikimedia\Message\MessageValue; use Wikimedia\Message\ParamType; use Wikimedia\Message\ScalarParam; use Wikimedia\UUID\GlobalIdGenerator; -use WikitextContent; -use WikitextContentHandler; /** * @group Database diff --git a/tests/phpunit/integration/includes/Storage/EditResultBuilderDbTest.php b/tests/phpunit/integration/includes/Storage/EditResultBuilderDbTest.php index 7c82ab0f4089..458f2fda6fd8 100644 --- a/tests/phpunit/integration/includes/Storage/EditResultBuilderDbTest.php +++ b/tests/phpunit/integration/includes/Storage/EditResultBuilderDbTest.php @@ -5,6 +5,7 @@ namespace MediaWiki\Tests\Storage; use ChangeTags; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; @@ -16,7 +17,6 @@ use MediaWikiIntegrationTestCase; use MockTitleTrait; use Wikimedia\Rdbms\IDatabase; use WikiPage; -use WikitextContent; /** * @covers \MediaWiki\Storage\EditResultBuilder diff --git a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php index 67c49e45cf57..04c086ca0caa 100644 --- a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php +++ b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Storage; use Article; use McrUndoAction; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; @@ -17,7 +18,6 @@ use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWikiIntegrationTestCase; use WikiPage; -use WikitextContent; /** * Integration tests for undos. diff --git a/tests/phpunit/integration/includes/page/RollbackPageTest.php b/tests/phpunit/integration/includes/page/RollbackPageTest.php index 7d38d7992ced..e77bed279a74 100644 --- a/tests/phpunit/integration/includes/page/RollbackPageTest.php +++ b/tests/phpunit/integration/includes/page/RollbackPageTest.php @@ -5,6 +5,7 @@ namespace MediaWiki\Tests\Page; use ChangeTags; use DatabaseLogEntry; use MediaWiki\Content\JsonContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; @@ -22,7 +23,6 @@ use MediaWikiIntegrationTestCase; use RecentChange; use Wikimedia\Rdbms\ReadOnlyMode; use WikiPage; -use WikitextContent; /** * @group Database diff --git a/tests/phpunit/integration/includes/parser/Parsoid/HtmlToContentTransformTest.php b/tests/phpunit/integration/includes/parser/Parsoid/HtmlToContentTransformTest.php index 13df623f5d49..e38033d61b4b 100644 --- a/tests/phpunit/integration/includes/parser/Parsoid/HtmlToContentTransformTest.php +++ b/tests/phpunit/integration/includes/parser/Parsoid/HtmlToContentTransformTest.php @@ -6,6 +6,7 @@ use Composer\Semver\Semver; use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use LogicException; use MediaWiki\Content\JsonContent; +use MediaWiki\Content\WikitextContent; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Page\PageIdentityValue; @@ -19,7 +20,6 @@ use Wikimedia\Parsoid\Core\SelserData; use Wikimedia\Parsoid\Parsoid; use Wikimedia\Parsoid\Utils\ContentUtils; use Wikimedia\TestingAccessWrapper; -use WikitextContent; /** * @covers \MediaWiki\Parser\Parsoid\HtmlToContentTransform diff --git a/tests/phpunit/maintenance/PageDumpTestDataTrait.php b/tests/phpunit/maintenance/PageDumpTestDataTrait.php index dc0d97d7896a..896013260a12 100644 --- a/tests/phpunit/maintenance/PageDumpTestDataTrait.php +++ b/tests/phpunit/maintenance/PageDumpTestDataTrait.php @@ -3,6 +3,7 @@ namespace MediaWiki\Tests\Maintenance; use Exception; +use MediaWiki\Content\WikitextContent; use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; @@ -13,7 +14,6 @@ use MediaWiki\User\User; use RevisionDeleter; use RuntimeException; use Wikimedia\Rdbms\IDatabase; -use WikitextContent; /** * Trait for creating a know set of test pages in the database, diff --git a/tests/phpunit/unit/includes/Revision/MutableRevisionSlotsTest.php b/tests/phpunit/unit/includes/Revision/MutableRevisionSlotsTest.php index db70f86913bd..cf6c0aabd120 100644 --- a/tests/phpunit/unit/includes/Revision/MutableRevisionSlotsTest.php +++ b/tests/phpunit/unit/includes/Revision/MutableRevisionSlotsTest.php @@ -4,11 +4,11 @@ namespace MediaWiki\Tests\Unit\Revision; use Content; use InvalidArgumentException; +use MediaWiki\Content\WikitextContent; use MediaWiki\Revision\MutableRevisionSlots; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionSlots; use MediaWiki\Revision\SlotRecord; -use WikitextContent; /** * @covers \MediaWiki\Revision\MutableRevisionSlots diff --git a/tests/phpunit/unit/includes/Revision/RevisionSlotsTest.php b/tests/phpunit/unit/includes/Revision/RevisionSlotsTest.php index df46aa755bbc..67ea06284e24 100644 --- a/tests/phpunit/unit/includes/Revision/RevisionSlotsTest.php +++ b/tests/phpunit/unit/includes/Revision/RevisionSlotsTest.php @@ -5,11 +5,11 @@ namespace MediaWiki\Tests\Unit\Revision; use InvalidArgumentException; use MediaWiki\Content\TextContent; use MediaWiki\Content\TextContentHandler; +use MediaWiki\Content\WikitextContent; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionSlots; use MediaWiki\Revision\SlotRecord; use MediaWikiUnitTestCase; -use WikitextContent; class RevisionSlotsTest extends MediaWikiUnitTestCase { diff --git a/tests/phpunit/unit/includes/content/Renderer/ContentRendererTest.php b/tests/phpunit/unit/includes/content/Renderer/ContentRendererTest.php index cbb8f73cd407..d8afa70483d2 100644 --- a/tests/phpunit/unit/includes/content/Renderer/ContentRendererTest.php +++ b/tests/phpunit/unit/includes/content/Renderer/ContentRendererTest.php @@ -23,6 +23,8 @@ namespace MediaWiki\Tests\Unit\Content\Renderer; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\DAO\WikiAwareEntity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Parser\ParserOutput; @@ -30,8 +32,6 @@ use MediaWiki\Revision\MutableRevisionRecord; use MediaWikiUnitTestCase; use ParserOptions; use Wikimedia\UUID\GlobalIdGenerator; -use WikitextContent; -use WikitextContentHandler; /** * @group Renderer diff --git a/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php index 0b3a70d14f5d..fe671eadd95d 100644 --- a/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php @@ -4,6 +4,8 @@ namespace MediaWiki\Tests\Unit; use Language; use MediaWiki\Content\Renderer\ContentParseParams; +use MediaWiki\Content\WikitextContent; +use MediaWiki\Content\WikitextContentHandler; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Parser\MagicWord; @@ -23,14 +25,12 @@ use ParserFactory; use ParserOptions; use ReflectionClass; use Wikimedia\UUID\GlobalIdGenerator; -use WikitextContent; -use WikitextContentHandler; /** * Split from \WikitextContentHandlerTest integration tests * * @group ContentHandler - * @covers \WikitextContentHandler + * @covers \MediaWiki\Content\WikitextContentHandler */ class WikitextContentHandlerTest extends MediaWikiUnitTestCase { use MockTitleTrait; diff --git a/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php b/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php index 788418703286..4af403db2c93 100644 --- a/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php +++ b/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php @@ -3,13 +3,13 @@ namespace MediaWiki\Tests\Unit\Edit; use MediaWiki\Content\TextContentHandler; +use MediaWiki\Content\WikitextContent; use MediaWiki\Edit\ParsoidRenderID; use MediaWiki\Edit\SelserContext; use MediaWiki\Edit\SimpleParsoidOutputStash; use MediaWiki\Tests\Unit\DummyServicesTrait; use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Parsoid\Core\PageBundle; -use WikitextContent; /** * @covers \MediaWiki\Edit\SimpleParsoidOutputStash |