From 14b4269d83c55a6e2c4f9d3bb11f43ce3125c784 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 16 May 2024 14:22:03 +0330 Subject: [PATCH] Add namespace and deprecation alias to Xml and XmlSelect This patch introduces a new namespace declaration, MediaWiki\Xml and adds Xml and XmlSelect to it and establishes class aliases marked as deprecated since version 1.43. Bug: T353458 Change-Id: I45cccd540b6e15f267d3ab588a064fbeb719d921 --- autoload.php | 2 ++ includes/actions/WatchAction.php | 1 + includes/api/ApiFormatXml.php | 1 + includes/changetags/ChangeTags.php | 1 + includes/export/XmlDumpWriter.php | 1 + includes/htmlform/HTMLForm.php | 2 +- .../fields/HTMLAutoCompleteSelectField.php | 2 +- includes/htmlform/fields/HTMLCheckField.php | 2 +- includes/htmlform/fields/HTMLCheckMatrix.php | 2 +- .../htmlform/fields/HTMLComboboxField.php | 2 +- .../htmlform/fields/HTMLFormFieldCloner.php | 2 +- .../htmlform/fields/HTMLMultiSelectField.php | 2 +- includes/htmlform/fields/HTMLRadioField.php | 2 +- includes/htmlform/fields/HTMLSelectField.php | 2 +- .../fields/HTMLSelectOrOtherField.php | 2 +- .../htmlform/fields/HTMLSizeFilterField.php | 2 +- includes/installer/WebInstaller.php | 2 +- includes/installer/WebInstallerDBConnect.php | 2 +- includes/installer/WebInstallerLanguage.php | 2 +- includes/installer/WebInstallerPage.php | 2 +- includes/language/Language.php | 1 + includes/linker/Linker.php | 2 +- includes/logging/LogEventsList.php | 1 + includes/media/MediaTransformOutput.php | 1 + includes/media/ThumbnailImage.php | 1 + includes/page/Article.php | 1 + includes/page/ImagePage.php | 1 + includes/page/ProtectionForm.php | 4 +-- includes/pager/TablePager.php | 2 +- includes/parser/Parser.php | 2 +- .../preferences/DefaultPreferencesFactory.php | 2 +- includes/revisiondelete/RevDelLogItem.php | 1 + .../revisiondelete/RevDelRevisionItem.php | 1 + .../search/searchwidgets/SearchFormWidget.php | 2 +- includes/site/SiteExporter.php | 2 +- includes/specialpage/QueryPage.php | 2 +- .../specials/SpecialChangeContentModel.php | 2 +- includes/specials/SpecialEditTags.php | 4 +-- includes/specials/SpecialExpandTemplates.php | 2 +- includes/specials/SpecialMovePage.php | 2 +- includes/specials/SpecialPageLanguage.php | 2 +- includes/specials/SpecialPasswordPolicies.php | 2 +- includes/specials/SpecialRecentChanges.php | 2 +- .../specials/SpecialRecentChangesLinked.php | 2 +- includes/specials/SpecialRevisionDelete.php | 2 +- includes/specials/SpecialSearch.php | 2 +- includes/specials/SpecialStatistics.php | 2 +- includes/specials/SpecialTags.php | 2 +- includes/specials/SpecialUndelete.php | 2 +- includes/specials/SpecialUserRights.php | 4 +-- includes/specials/SpecialWatchlist.php | 4 +-- includes/specials/SpecialWhatLinksHere.php | 2 +- .../specials/forms/PreferencesFormOOUI.php | 1 + includes/specials/helpers/ImportReporter.php | 1 + .../specials/pagers/AllMessagesTablePager.php | 2 +- includes/specials/pagers/ImageListPager.php | 2 +- .../specials/pagers/MergeHistoryPager.php | 2 +- includes/xml/Xml.php | 8 ++++- includes/xml/XmlSelect.php | 4 +++ maintenance/includes/TextPassDumper.php | 1 + opensearch_desc.php | 1 + tests/phan/TaintCheckAnnotationsTest.php | 36 +++++++++---------- tests/phpunit/includes/xml/XmlTest.php | 11 +++--- .../unit/includes/xml/XmlSelectTest.php | 4 ++- tests/phpunit/unit/includes/xml/XmlTest.php | 4 +-- 65 files changed, 104 insertions(+), 73 deletions(-) diff --git a/autoload.php b/autoload.php index 2af49a13a18..21c69d2d47b 100644 --- a/autoload.php +++ b/autoload.php @@ -2498,6 +2498,8 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Widget\\UsersMultiselectWidget' => __DIR__ . '/includes/widget/UsersMultiselectWidget.php', 'MediaWiki\\WikiMap\\WikiMap' => __DIR__ . '/includes/WikiMap/WikiMap.php', 'MediaWiki\\WikiMap\\WikiReference' => __DIR__ . '/includes/WikiMap/WikiReference.php', + 'MediaWiki\\Xml\\Xml' => __DIR__ . '/includes/xml/Xml.php', + 'MediaWiki\\Xml\\XmlSelect' => __DIR__ . '/includes/xml/XmlSelect.php', 'MediumSpecificBagOStuff' => __DIR__ . '/includes/libs/objectcache/MediumSpecificBagOStuff.php', 'MemcLockManager' => __DIR__ . '/includes/libs/lockmanager/MemcLockManager.php', 'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php', diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php index 2395add8987..2bced12aeb7 100644 --- a/includes/actions/WatchAction.php +++ b/includes/actions/WatchAction.php @@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Status\Status; use MediaWiki\User\User; use MediaWiki\Watchlist\WatchlistManager; +use MediaWiki\Xml\XmlSelect; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; /** diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php index cea0609ddca..11a7687e303 100644 --- a/includes/api/ApiFormatXml.php +++ b/includes/api/ApiFormatXml.php @@ -21,6 +21,7 @@ */ use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index cea070b4c3e..94c1d636212 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -35,6 +35,7 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Status\Status; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; +use MediaWiki\Xml\XmlSelect; use Wikimedia\Rdbms\IReadableDatabase; class ChangeTags { diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php index 8f2756b6e3c..61814089590 100644 --- a/includes/export/XmlDumpWriter.php +++ b/includes/export/XmlDumpWriter.php @@ -36,6 +36,7 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\Revision\SuppressedDataException; use MediaWiki\Storage\SqlBlobStore; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use Wikimedia\Assert\Assert; use Wikimedia\IPUtils; diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index 7728f5f42cf..9147150430d 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -75,10 +75,10 @@ use MediaWiki\Parser\Sanitizer; use MediaWiki\Status\Status; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; +use MediaWiki\Xml\Xml; use MessageSpecifier; use StatusValue; use Stringable; -use Xml; /** * Object handling generic submission, CSRF protection, layout and diff --git a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php index ca0f671a8d2..88a7960a24c 100644 --- a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php +++ b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php @@ -5,7 +5,7 @@ namespace MediaWiki\HTMLForm\Field; use FormatJson; use InvalidArgumentException; use MediaWiki\HTMLForm\HTMLFormField; -use XmlSelect; +use MediaWiki\Xml\XmlSelect; /** * Text field for selecting a value from a large list of possible values, with diff --git a/includes/htmlform/fields/HTMLCheckField.php b/includes/htmlform/fields/HTMLCheckField.php index 655149fac66..a9071d46124 100644 --- a/includes/htmlform/fields/HTMLCheckField.php +++ b/includes/htmlform/fields/HTMLCheckField.php @@ -8,7 +8,7 @@ use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\HTMLForm\OOUIHTMLForm; use MediaWiki\HTMLForm\VFormHTMLForm; use MediaWiki\Request\WebRequest; -use Xml; +use MediaWiki\Xml\Xml; /** * A checkbox field diff --git a/includes/htmlform/fields/HTMLCheckMatrix.php b/includes/htmlform/fields/HTMLCheckMatrix.php index 0324a8d5cd1..2743b6b3802 100644 --- a/includes/htmlform/fields/HTMLCheckMatrix.php +++ b/includes/htmlform/fields/HTMLCheckMatrix.php @@ -8,7 +8,7 @@ use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\HTMLForm\HTMLFormFieldRequiredOptionsException; use MediaWiki\HTMLForm\HTMLNestedFilterable; use MediaWiki\Request\WebRequest; -use Xml; +use MediaWiki\Xml\Xml; /** * A checkbox matrix diff --git a/includes/htmlform/fields/HTMLComboboxField.php b/includes/htmlform/fields/HTMLComboboxField.php index fbc0c3c03c2..27f1ccb63c3 100644 --- a/includes/htmlform/fields/HTMLComboboxField.php +++ b/includes/htmlform/fields/HTMLComboboxField.php @@ -2,7 +2,7 @@ namespace MediaWiki\HTMLForm\Field; -use XmlSelect; +use MediaWiki\Xml\XmlSelect; /** * A combo box field. diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php index 52118d5920a..161f8f24ebd 100644 --- a/includes/htmlform/fields/HTMLFormFieldCloner.php +++ b/includes/htmlform/fields/HTMLFormFieldCloner.php @@ -8,7 +8,7 @@ use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\Parser\Sanitizer; use MediaWiki\Request\DerivativeRequest; -use Xml; +use MediaWiki\Xml\Xml; /** * A container for HTMLFormFields that allows for multiple copies of the set of diff --git a/includes/htmlform/fields/HTMLMultiSelectField.php b/includes/htmlform/fields/HTMLMultiSelectField.php index f2c1d890f28..8c1e9d437b4 100644 --- a/includes/htmlform/fields/HTMLMultiSelectField.php +++ b/includes/htmlform/fields/HTMLMultiSelectField.php @@ -7,8 +7,8 @@ use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\HTMLForm\HTMLNestedFilterable; use MediaWiki\HTMLForm\OOUIHTMLForm; use MediaWiki\Request\WebRequest; +use MediaWiki\Xml\Xml; use RuntimeException; -use Xml; /** * Multi-select field diff --git a/includes/htmlform/fields/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php index 4c5e4bca60f..90a3bdb0d33 100644 --- a/includes/htmlform/fields/HTMLRadioField.php +++ b/includes/htmlform/fields/HTMLRadioField.php @@ -5,7 +5,7 @@ namespace MediaWiki\HTMLForm\Field; use MediaWiki\Html\Html; use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\Parser\Sanitizer; -use Xml; +use MediaWiki\Xml\Xml; /** * Radio checkbox fields. diff --git a/includes/htmlform/fields/HTMLSelectField.php b/includes/htmlform/fields/HTMLSelectField.php index ef11f3916a1..2bcf719bae7 100644 --- a/includes/htmlform/fields/HTMLSelectField.php +++ b/includes/htmlform/fields/HTMLSelectField.php @@ -3,7 +3,7 @@ namespace MediaWiki\HTMLForm\Field; use MediaWiki\HTMLForm\HTMLFormField; -use XmlSelect; +use MediaWiki\Xml\XmlSelect; /** * A select dropdown field. Basically a wrapper for Xmlselect class diff --git a/includes/htmlform/fields/HTMLSelectOrOtherField.php b/includes/htmlform/fields/HTMLSelectOrOtherField.php index 00e356f9f9c..a95e8acba1d 100644 --- a/includes/htmlform/fields/HTMLSelectOrOtherField.php +++ b/includes/htmlform/fields/HTMLSelectOrOtherField.php @@ -5,7 +5,7 @@ namespace MediaWiki\HTMLForm\Field; use MediaWiki\Html\Html; use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\Request\WebRequest; -use XmlSelect; +use MediaWiki\Xml\XmlSelect; /** * Select dropdown field, with an additional "other" textbox. diff --git a/includes/htmlform/fields/HTMLSizeFilterField.php b/includes/htmlform/fields/HTMLSizeFilterField.php index 7e32d4a32d2..06198810625 100644 --- a/includes/htmlform/fields/HTMLSizeFilterField.php +++ b/includes/htmlform/fields/HTMLSizeFilterField.php @@ -4,7 +4,7 @@ namespace MediaWiki\HTMLForm\Field; use MediaWiki\Request\WebRequest; use MediaWiki\Widget\SizeFilterWidget; -use Xml; +use MediaWiki\Xml\Xml; /** * A size filter field for use on query-type special pages. It looks a bit like: diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index 70d27515cfe..fa29c58de94 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -32,7 +32,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; -use Xml; +use MediaWiki\Xml\Xml; /** * Class for the core installer web interface. diff --git a/includes/installer/WebInstallerDBConnect.php b/includes/installer/WebInstallerDBConnect.php index add5895c023..c3daf960ce8 100644 --- a/includes/installer/WebInstallerDBConnect.php +++ b/includes/installer/WebInstallerDBConnect.php @@ -24,7 +24,7 @@ namespace MediaWiki\Installer; use MediaWiki\Html\Html; use MediaWiki\Status\Status; -use Xml; +use MediaWiki\Xml\Xml; class WebInstallerDBConnect extends WebInstallerPage { diff --git a/includes/installer/WebInstallerLanguage.php b/includes/installer/WebInstallerLanguage.php index afb96e1e01c..386c33afe08 100644 --- a/includes/installer/WebInstallerLanguage.php +++ b/includes/installer/WebInstallerLanguage.php @@ -25,7 +25,7 @@ namespace MediaWiki\Installer; use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MediaWikiServices; -use XmlSelect; +use MediaWiki\Xml\XmlSelect; class WebInstallerLanguage extends WebInstallerPage { diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index bfd80833003..f37190466b8 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -23,7 +23,7 @@ namespace MediaWiki\Installer; use MediaWiki\Html\Html; -use Xml; +use MediaWiki\Xml\Xml; /** * Abstract class to define pages for the web installer. diff --git a/includes/language/Language.php b/includes/language/Language.php index 944556f921e..b8420d3d4f5 100644 --- a/includes/language/Language.php +++ b/includes/language/Language.php @@ -48,6 +48,7 @@ use MediaWiki\User\User; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserTimeCorrection; use MediaWiki\Utils\MWTimestamp; +use MediaWiki\Xml\XmlSelect; use Wikimedia\Assert\Assert; use Wikimedia\AtEase\AtEase; use Wikimedia\Bcp47Code\Bcp47Code; diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php index eb08ceef36d..b632c3f72ec 100644 --- a/includes/linker/Linker.php +++ b/includes/linker/Linker.php @@ -44,12 +44,12 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\User\ExternalUserNames; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Xml\Xml; use MessageLocalizer; use Wikimedia\Assert\Assert; use Wikimedia\IPUtils; use Wikimedia\Rdbms\SelectQueryBuilder; use Wikimedia\RemexHtml\Serializer\SerializerNode; -use Xml; /** * Some internal bits split of from Skin.php. These functions are used diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index e8d70f6efeb..71afcd927e7 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -40,6 +40,7 @@ use MediaWiki\Parser\Sanitizer; use MediaWiki\Permissions\Authority; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Status\Status; +use MediaWiki\Xml\Xml; class LogEventsList extends ContextSource { public const NO_ACTION_LINK = 1; diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php index cd1660f4874..4359be36b03 100644 --- a/includes/media/MediaTransformOutput.php +++ b/includes/media/MediaTransformOutput.php @@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Status\Status; +use MediaWiki\Xml\Xml; /** * Base class for the output of MediaHandler::doTransform() and File::transform(). diff --git a/includes/media/ThumbnailImage.php b/includes/media/ThumbnailImage.php index f19195ff673..75dfc80a804 100644 --- a/includes/media/ThumbnailImage.php +++ b/includes/media/ThumbnailImage.php @@ -27,6 +27,7 @@ use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; /** * Media transform output for images diff --git a/includes/page/Article.php b/includes/page/Article.php index ad97019e2c3..513e8133b96 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -50,6 +50,7 @@ use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\User; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; +use MediaWiki\Xml\Xml; use Wikimedia\IPUtils; use Wikimedia\LightweightObjectStore\ExpirationAwareness; use Wikimedia\NonSerializable\NonSerializableTrait; diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php index b5e26b68379..d6794a6fd4a 100644 --- a/includes/page/ImagePage.php +++ b/includes/page/ImagePage.php @@ -26,6 +26,7 @@ use MediaWiki\Request\WebRequest; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\Title\TitleArrayFromResult; +use MediaWiki\Xml\Xml; use Wikimedia\Rdbms\IResultWrapper; /** diff --git a/includes/page/ProtectionForm.php b/includes/page/ProtectionForm.php index a4111583fdd..78eeb308d4d 100644 --- a/includes/page/ProtectionForm.php +++ b/includes/page/ProtectionForm.php @@ -45,8 +45,8 @@ use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFormatter; use MediaWiki\Watchlist\WatchlistManager; -use Xml; -use XmlSelect; +use MediaWiki\Xml\Xml; +use MediaWiki\Xml\XmlSelect; /** * Handles the page protection UI and backend diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php index 7c617c4f91a..4f481804e44 100644 --- a/includes/pager/TablePager.php +++ b/includes/pager/TablePager.php @@ -24,10 +24,10 @@ use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Parser\ParserOutput; +use MediaWiki\Xml\XmlSelect; use OOUI\ButtonGroupWidget; use OOUI\ButtonWidget; use stdClass; -use XmlSelect; /** * Table-based display with a user-selectable sort order diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 40995d65d24..1ddfef23763 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -83,6 +83,7 @@ use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; +use MediaWiki\Xml\Xml; use Message; use ParserFactory; use ParserOptions; @@ -110,7 +111,6 @@ use Wikimedia\Parsoid\DOM\Node; use Wikimedia\Parsoid\Utils\DOMCompat; use Wikimedia\Parsoid\Utils\DOMUtils; use Wikimedia\ScopedCallback; -use Xml; /** * @defgroup Parser Parser diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index d4f44879662..2a3485a21ac 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -54,6 +54,7 @@ use MediaWiki\User\User; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserGroupMembership; use MediaWiki\User\UserTimeCorrection; +use MediaWiki\Xml\Xml; use MessageLocalizer; use OOUI\ButtonWidget; use OOUI\FieldLayout; @@ -66,7 +67,6 @@ use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; use SkinFactory; use UnexpectedValueException; -use Xml; /** * This is the default implementation of PreferencesFactory. diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php index 22042d083fa..9b8ae8fc9b4 100644 --- a/includes/revisiondelete/RevDelLogItem.php +++ b/includes/revisiondelete/RevDelLogItem.php @@ -22,6 +22,7 @@ use MediaWiki\CommentStore\CommentStore; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use Wikimedia\Rdbms\IConnectionProvider; /** diff --git a/includes/revisiondelete/RevDelRevisionItem.php b/includes/revisiondelete/RevDelRevisionItem.php index a4db69a683c..8713d8b0c8f 100644 --- a/includes/revisiondelete/RevDelRevisionItem.php +++ b/includes/revisiondelete/RevDelRevisionItem.php @@ -22,6 +22,7 @@ use MediaWiki\Linker\Linker; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Xml\Xml; /** * Item class for a live revision table row diff --git a/includes/search/searchwidgets/SearchFormWidget.php b/includes/search/searchwidgets/SearchFormWidget.php index 655502a7985..03afc905c12 100644 --- a/includes/search/searchwidgets/SearchFormWidget.php +++ b/includes/search/searchwidgets/SearchFormWidget.php @@ -11,12 +11,12 @@ use MediaWiki\MainConfigNames; use MediaWiki\Specials\SpecialSearch; use MediaWiki\Title\NamespaceInfo; use MediaWiki\Widget\SearchInputWidget; +use MediaWiki\Xml\Xml; use OOUI\ActionFieldLayout; use OOUI\ButtonInputWidget; use OOUI\CheckboxInputWidget; use OOUI\FieldLayout; use SearchEngineConfig; -use Xml; class SearchFormWidget { /** @internal For use by SpecialSearch only */ diff --git a/includes/site/SiteExporter.php b/includes/site/SiteExporter.php index fd03b4f4bfb..16e9d1b1753 100644 --- a/includes/site/SiteExporter.php +++ b/includes/site/SiteExporter.php @@ -21,7 +21,7 @@ namespace MediaWiki\Site; use InvalidArgumentException; -use Xml; +use MediaWiki\Xml\Xml; /** * Utility for exporting site entries to XML. diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php index 39cb5dfba05..bc207f1778d 100644 --- a/includes/specialpage/QueryPage.php +++ b/includes/specialpage/QueryPage.php @@ -66,6 +66,7 @@ use MediaWiki\Specials\SpecialWantedFiles; use MediaWiki\Specials\SpecialWantedPages; use MediaWiki\Specials\SpecialWantedTemplates; use MediaWiki\Specials\SpecialWithoutInterwiki; +use MediaWiki\Xml\Xml; use Skin; use stdClass; use Wikimedia\Rdbms\DBError; @@ -75,7 +76,6 @@ use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\IResultWrapper; use Wikimedia\Rdbms\SelectQueryBuilder; -use Xml; /** * This is a class for doing query pages; since they're almost all the same, diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php index 1966a66fbd6..824fd87cf6d 100644 --- a/includes/specials/SpecialChangeContentModel.php +++ b/includes/specials/SpecialChangeContentModel.php @@ -20,8 +20,8 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\SpecialPage\FormSpecialPage; use MediaWiki\Status\Status; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use SearchEngineFactory; -use Xml; class SpecialChangeContentModel extends FormSpecialPage { diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php index 988b4c21b8e..d65ac3a069d 100644 --- a/includes/specials/SpecialEditTags.php +++ b/includes/specials/SpecialEditTags.php @@ -33,10 +33,10 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\SpecialPage\UnlistedSpecialPage; use MediaWiki\Status\Status; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; +use MediaWiki\Xml\XmlSelect; use RevisionDeleter; use UserBlockedError; -use Xml; -use XmlSelect; /** * Special page for adding and removing change tags to individual revisions. diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php index 758c94d9371..cc780613ff4 100644 --- a/includes/specials/SpecialExpandTemplates.php +++ b/includes/specials/SpecialExpandTemplates.php @@ -34,9 +34,9 @@ use MediaWiki\Status\Status; use MediaWiki\Tidy\TidyDriverBase; use MediaWiki\Title\Title; use MediaWiki\User\Options\UserOptionsLookup; +use MediaWiki\Xml\Xml; use ParserFactory; use ParserOptions; -use Xml; /** * A special page that expands submitted templates, parser functions, diff --git a/includes/specials/SpecialMovePage.php b/includes/specials/SpecialMovePage.php index 36c36321c20..977ef436249 100644 --- a/includes/specials/SpecialMovePage.php +++ b/includes/specials/SpecialMovePage.php @@ -43,6 +43,7 @@ use MediaWiki\Title\TitleFactory; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\Watchlist\WatchlistManager; use MediaWiki\Widget\ComplexTitleInputWidget; +use MediaWiki\Xml\Xml; use OOUI\ButtonInputWidget; use OOUI\CheckboxInputWidget; use OOUI\DropdownInputWidget; @@ -60,7 +61,6 @@ use ThrottledError; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IExpression; use Wikimedia\Rdbms\LikeValue; -use Xml; /** * Implement Special:Movepage for changing page titles diff --git a/includes/specials/SpecialPageLanguage.php b/includes/specials/SpecialPageLanguage.php index d3413ea68af..92e8debcdcb 100644 --- a/includes/specials/SpecialPageLanguage.php +++ b/includes/specials/SpecialPageLanguage.php @@ -41,10 +41,10 @@ use MediaWiki\SpecialPage\FormSpecialPage; use MediaWiki\Status\Status; use MediaWiki\Title\MalformedTitleException; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use SearchEngineFactory; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IDatabase; -use Xml; /** * Special page for changing the content language of a page diff --git a/includes/specials/SpecialPasswordPolicies.php b/includes/specials/SpecialPasswordPolicies.php index 75fb2ecdd5a..30b0a367a71 100644 --- a/includes/specials/SpecialPasswordPolicies.php +++ b/includes/specials/SpecialPasswordPolicies.php @@ -30,8 +30,8 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserGroupMembership; +use MediaWiki\Xml\Xml; use UserPasswordPolicy; -use Xml; /** * This special page lists the defined password policies for user groups. diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php index 14794c40b59..855efe20a92 100644 --- a/includes/specials/SpecialRecentChanges.php +++ b/includes/specials/SpecialRecentChanges.php @@ -40,6 +40,7 @@ use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\TempUser\TempUserConfig; use MediaWiki\User\UserIdentityUtils; use MediaWiki\Utils\MWTimestamp; +use MediaWiki\Xml\Xml; use MessageCache; use OOUI\ButtonWidget; use OOUI\HtmlSnippet; @@ -47,7 +48,6 @@ use RecentChange; use WatchedItemStoreInterface; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\IResultWrapper; -use Xml; /** * A special page that lists last changes made to the wiki diff --git a/includes/specials/SpecialRecentChangesLinked.php b/includes/specials/SpecialRecentChangesLinked.php index 12c5575bc8f..312260d20d7 100644 --- a/includes/specials/SpecialRecentChangesLinked.php +++ b/includes/specials/SpecialRecentChangesLinked.php @@ -31,13 +31,13 @@ use MediaWiki\Title\Title; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\TempUser\TempUserConfig; use MediaWiki\User\UserIdentityUtils; +use MediaWiki\Xml\Xml; use MessageCache; use RecentChange; use SearchEngineFactory; use WatchedItemStoreInterface; use Wikimedia\Rdbms\SelectQueryBuilder; use Wikimedia\Rdbms\Subquery; -use Xml; /** * This is to display changes made to all articles linked in an article. diff --git a/includes/specials/SpecialRevisionDelete.php b/includes/specials/SpecialRevisionDelete.php index a065a28ddaa..509e7b07476 100644 --- a/includes/specials/SpecialRevisionDelete.php +++ b/includes/specials/SpecialRevisionDelete.php @@ -36,12 +36,12 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\SpecialPage\UnlistedSpecialPage; use MediaWiki\Status\Status; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use PermissionsError; use RepoGroup; use RevDelList; use RevisionDeleter; use UserBlockedError; -use Xml; /** * Special page allowing users with the appropriate permissions to view diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 7fc0eb2cfb7..54b4693db81 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -49,12 +49,12 @@ use MediaWiki\Status\Status; use MediaWiki\Title\NamespaceInfo; use MediaWiki\Title\Title; use MediaWiki\User\Options\UserOptionsManager; +use MediaWiki\Xml\Xml; use RepoGroup; use SearchEngine; use SearchEngineConfig; use SearchEngineFactory; use Wikimedia\Rdbms\ReadOnlyMode; -use Xml; /** * implements Special:Search - Run text & title search and display the output diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php index 0bef9c6b88a..e6a592a6896 100644 --- a/includes/specials/SpecialStatistics.php +++ b/includes/specials/SpecialStatistics.php @@ -31,7 +31,7 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserGroupMembership; -use Xml; +use MediaWiki\Xml\Xml; /** * Special page lists various statistics, including the contents of diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php index 94d71b6f86f..5ade81764f1 100644 --- a/includes/specials/SpecialTags.php +++ b/includes/specials/SpecialTags.php @@ -29,8 +29,8 @@ use MediaWiki\CommentStore\CommentStore; use MediaWiki\HTMLForm\HTMLForm; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPage; +use MediaWiki\Xml\Xml; use PermissionsError; -use Xml; /** * A special page that lists tags for edits diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 9321ed3029f..a388eab004e 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -60,6 +60,7 @@ use MediaWiki\Title\Title; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\User; use MediaWiki\Watchlist\WatchlistManager; +use MediaWiki\Xml\Xml; use OOUI\ActionFieldLayout; use OOUI\ButtonInputWidget; use OOUI\CheckboxInputWidget; @@ -81,7 +82,6 @@ use TextContent; use UserBlockedError; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IResultWrapper; -use Xml; /** * Special page allowing users with the appropriate permissions to view diff --git a/includes/specials/SpecialUserRights.php b/includes/specials/SpecialUserRights.php index 40fb615bff1..be24c7d96e9 100644 --- a/includes/specials/SpecialUserRights.php +++ b/includes/specials/SpecialUserRights.php @@ -46,10 +46,10 @@ use MediaWiki\User\UserNamePrefixSearch; use MediaWiki\User\UserNameUtils; use MediaWiki\Watchlist\WatchlistManager; use MediaWiki\WikiMap\WikiMap; +use MediaWiki\Xml\Xml; +use MediaWiki\Xml\XmlSelect; use PermissionsError; use UserBlockedError; -use Xml; -use XmlSelect; /** * Special page to allow managing user group membership diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 9163c537dbc..dce9ccf0342 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -43,14 +43,14 @@ use MediaWiki\User\TempUser\TempUserConfig; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityUtils; use MediaWiki\Watchlist\WatchlistManager; +use MediaWiki\Xml\Xml; +use MediaWiki\Xml\XmlSelect; use RecentChange; use UserNotLoggedIn; use WatchedItem; use WatchedItemStoreInterface; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\IResultWrapper; -use Xml; -use XmlSelect; /** * A special page that lists last changes made to the wiki, diff --git a/includes/specials/SpecialWhatLinksHere.php b/includes/specials/SpecialWhatLinksHere.php index ab70d636920..a97bd7032ab 100644 --- a/includes/specials/SpecialWhatLinksHere.php +++ b/includes/specials/SpecialWhatLinksHere.php @@ -35,11 +35,11 @@ use MediaWiki\SpecialPage\FormSpecialPage; use MediaWiki\Title\NamespaceInfo; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; +use MediaWiki\Xml\Xml; use SearchEngineFactory; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\SelectQueryBuilder; -use Xml; /** * Implements Special:Whatlinkshere diff --git a/includes/specials/forms/PreferencesFormOOUI.php b/includes/specials/forms/PreferencesFormOOUI.php index 0c65e7e86ff..6ddf2793d28 100644 --- a/includes/specials/forms/PreferencesFormOOUI.php +++ b/includes/specials/forms/PreferencesFormOOUI.php @@ -23,6 +23,7 @@ use MediaWiki\HTMLForm\Field\HTMLToggleSwitchField; use MediaWiki\HTMLForm\HTMLNestedFilterable; use MediaWiki\HTMLForm\OOUIHTMLForm; use MediaWiki\User\User; +use MediaWiki\Xml\Xml; /** * Form to edit user preferences. diff --git a/includes/specials/helpers/ImportReporter.php b/includes/specials/helpers/ImportReporter.php index e4268b4cce8..c2d64ab091e 100644 --- a/includes/specials/helpers/ImportReporter.php +++ b/includes/specials/helpers/ImportReporter.php @@ -27,6 +27,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Status\Status; use MediaWiki\Title\ForeignTitle; +use MediaWiki\Xml\Xml; /** * Reporting callback diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index 4f202aad4b9..b913f3cd816 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -33,12 +33,12 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Sanitizer; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; +use MediaWiki\Xml\Xml; use stdClass; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\IResultWrapper; -use Xml; /** * Use TablePager for prettified output. We have to pretend that we're diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index 7c602c62ed5..95b0314044c 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -34,12 +34,12 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWiki\User\UserNameUtils; +use MediaWiki\Xml\Xml; use RepoGroup; use UnexpectedValueException; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IResultWrapper; -use Xml; /** * @ingroup Pager diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php index 9029411e81b..29e21ac79be 100644 --- a/includes/specials/pagers/MergeHistoryPager.php +++ b/includes/specials/pagers/MergeHistoryPager.php @@ -32,8 +32,8 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; +use MediaWiki\Xml\Xml; use Wikimedia\Rdbms\IConnectionProvider; -use Xml; /** * @ingroup Pager diff --git a/includes/xml/Xml.php b/includes/xml/Xml.php index dc7e53761d1..2130fb2de7e 100644 --- a/includes/xml/Xml.php +++ b/includes/xml/Xml.php @@ -20,12 +20,16 @@ * @file */ +namespace MediaWiki\Xml; + use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Sanitizer; use MediaWiki\Utils\MWTimestamp; +use Message; +use UtfNormal\Validator; /** * Module of static functions for generating XML @@ -96,7 +100,7 @@ class Xml { */ public static function elementClean( $element, $attribs = [], $contents = '' ) { if ( $attribs ) { - $attribs = array_map( [ UtfNormal\Validator::class, 'cleanUp' ], $attribs ); + $attribs = array_map( [ Validator::class, 'cleanUp' ], $attribs ); } if ( $contents ) { $contents = @@ -906,3 +910,5 @@ class Xml { return $s; } } +/** @deprecated class alias since 1.43 */ +class_alias( Xml::class, 'Xml' ); diff --git a/includes/xml/XmlSelect.php b/includes/xml/XmlSelect.php index f198c8d87c0..19138f85644 100644 --- a/includes/xml/XmlSelect.php +++ b/includes/xml/XmlSelect.php @@ -20,6 +20,8 @@ * @file */ +namespace MediaWiki\Xml; + use MediaWiki\Html\Html; /** @@ -159,3 +161,5 @@ class XmlSelect { return $options; } } +/** @deprecated class alias since 1.43 */ +class_alias( XmlSelect::class, 'XmlSelect' ); diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php index 53e6c2badd3..f0941f8a0c1 100644 --- a/maintenance/includes/TextPassDumper.php +++ b/maintenance/includes/TextPassDumper.php @@ -35,6 +35,7 @@ use MediaWiki\Storage\BlobAccessException; use MediaWiki\Storage\BlobStore; use MediaWiki\Storage\SqlBlobStore; use MediaWiki\WikiMap\WikiMap; +use MediaWiki\Xml\Xml; use Wikimedia\AtEase\AtEase; use Wikimedia\Rdbms\IMaintainableDatabase; diff --git a/opensearch_desc.php b/opensearch_desc.php index 8eef1aeb198..00c9907cca2 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -29,6 +29,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MediaWikiServices; use MediaWiki\SpecialPage\SpecialPage; +use MediaWiki\Xml\Xml; // This endpoint is supposed to be independent of request cookies and other // details of the session. Enforce this constraint with respect to session use. diff --git a/tests/phan/TaintCheckAnnotationsTest.php b/tests/phan/TaintCheckAnnotationsTest.php index 8fbe4a01f6f..5cb38b5dbc5 100644 --- a/tests/phan/TaintCheckAnnotationsTest.php +++ b/tests/phan/TaintCheckAnnotationsTest.php @@ -610,27 +610,27 @@ class TaintCheckAnnotationsTest { } function textXml() { - echo \Xml::tags( $_GET['a'], [], '' );// @phan-suppress-current-line SecurityCheck-XSS - \Xml::tags( '', [ htmlspecialchars( '' ) ], '' );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::tags( '', $_GET['a'], '' );// Safe - echo \Xml::tags( '', [], $_GET['a'] );// @phan-suppress-current-line SecurityCheck-XSS - echo \Xml::tags( '', [], '' );// Safe - htmlspecialchars( \Xml::tags( '', [], '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::tags( $_GET['a'], [], '' );// @phan-suppress-current-line SecurityCheck-XSS + \MediaWiki\Xml\Xml::tags( '', [ htmlspecialchars( '' ) ], '' );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::tags( '', $_GET['a'], '' );// Safe + echo \MediaWiki\Xml\Xml::tags( '', [], $_GET['a'] );// @phan-suppress-current-line SecurityCheck-XSS + echo \MediaWiki\Xml\Xml::tags( '', [], '' );// Safe + htmlspecialchars( \MediaWiki\Xml\Xml::tags( '', [], '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::element( $_GET['a'] );// @phan-suppress-current-line SecurityCheck-XSS - \Xml::element( '', [ htmlspecialchars( '' ) ] );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::element( '', $_GET['a'] );// Safe - echo \Xml::element( '', [], htmlspecialchars( '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::element( '', [], $_GET['a'] );// Safe - echo \Xml::element( '', [], '' );// Safe - htmlspecialchars( \Xml::element( '', [], '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::element( $_GET['a'] );// @phan-suppress-current-line SecurityCheck-XSS + \MediaWiki\Xml\Xml::element( '', [ htmlspecialchars( '' ) ] );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::element( '', $_GET['a'] );// Safe + echo \MediaWiki\Xml\Xml::element( '', [], htmlspecialchars( '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::element( '', [], $_GET['a'] );// Safe + echo \MediaWiki\Xml\Xml::element( '', [], '' );// Safe + htmlspecialchars( \MediaWiki\Xml\Xml::element( '', [], '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::encodeJsVar( $_GET['a'] );// Safe - echo \Xml::encodeJsVar( htmlspecialchars( '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::encodeJsVar( $_GET['a'] );// Safe + echo \MediaWiki\Xml\Xml::encodeJsVar( htmlspecialchars( '' ) );// @phan-suppress-current-line SecurityCheck-DoubleEscaped - echo \Xml::encodeJsCall( $_GET['a'], [] );// @phan-suppress-current-line SecurityCheck-XSS - echo \Xml::encodeJsCall( '', $_GET['a'] );// Safe - echo \Xml::encodeJsCall( '', [ htmlspecialchars( '' ) ] );// @phan-suppress-current-line SecurityCheck-DoubleEscaped + echo \MediaWiki\Xml\Xml::encodeJsCall( $_GET['a'], [] );// @phan-suppress-current-line SecurityCheck-XSS + echo \MediaWiki\Xml\Xml::encodeJsCall( '', $_GET['a'] );// Safe + echo \MediaWiki\Xml\Xml::encodeJsCall( '', [ htmlspecialchars( '' ) ] );// @phan-suppress-current-line SecurityCheck-DoubleEscaped } function testHtmlArmor() { diff --git a/tests/phpunit/includes/xml/XmlTest.php b/tests/phpunit/includes/xml/XmlTest.php index fd52e74a222..85ce5a50844 100644 --- a/tests/phpunit/includes/xml/XmlTest.php +++ b/tests/phpunit/includes/xml/XmlTest.php @@ -1,12 +1,13 @@ hideDeprecated( 'Xml::monthSelector' ); + $this->hideDeprecated( 'MediaWiki\Xml\Xml::monthSelector' ); $this->assertEquals( $expected, Xml::monthSelector( $selected, $allmonths, $id ) @@ -157,8 +158,8 @@ class XmlTest extends MediaWikiIntegrationTestCase { $nextMonth = 1; } - $this->hideDeprecated( 'Xml::dateMenu' ); - $this->hideDeprecated( 'Xml::monthSelector' ); + $this->hideDeprecated( 'MediaWiki\Xml\Xml::dateMenu' ); + $this->hideDeprecated( 'MediaWiki\Xml\Xml::monthSelector' ); $this->assertEquals( ' ' . @@ -292,7 +293,7 @@ class XmlTest extends MediaWikiIntegrationTestCase { } public function testLanguageSelector() { - $this->hideDeprecated( 'Xml::languageSelector' ); + $this->hideDeprecated( 'MediaWiki\Xml\Xml::languageSelector' ); $select = Xml::languageSelector( 'en', true, null, [ 'id' => 'testlang' ], wfMessage( 'yourlanguage' ) ); diff --git a/tests/phpunit/unit/includes/xml/XmlSelectTest.php b/tests/phpunit/unit/includes/xml/XmlSelectTest.php index 1891cc8f093..2bcc9ba6703 100644 --- a/tests/phpunit/unit/includes/xml/XmlSelectTest.php +++ b/tests/phpunit/unit/includes/xml/XmlSelectTest.php @@ -1,8 +1,10 @@