Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add namespace and deprecation alias to Xml and XmlSelect

Browse source 
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
This commit is contained in:
Ebrahim Byagowi 2024-05-16 14:22:03 +03:30
parent f4d953a714
commit 14b4269d83
65 changed files with 104 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autoload.php
View file

@ -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',

1
includes/actions/WatchAction.php
View file

@ -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;
/**

1
includes/api/ApiFormatXml.php
View file

@ -21,6 +21,7 @@
*/
use MediaWiki\Title\Title;
use MediaWiki\Xml\Xml;
use Wikimedia\ParamValidator\ParamValidator;
/**

1
includes/changetags/ChangeTags.php
View file

@ -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 {

1
includes/export/XmlDumpWriter.php
View file

@ -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;

2
includes/htmlform/HTMLForm.php
View file

@ -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

2
includes/htmlform/fields/HTMLAutoCompleteSelectField.php
View file

@ -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

2
includes/htmlform/fields/HTMLCheckField.php
View file

@ -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

2
includes/htmlform/fields/HTMLCheckMatrix.php
View file

@ -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

2
includes/htmlform/fields/HTMLComboboxField.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\HTMLForm\Field;
use XmlSelect;
use MediaWiki\Xml\XmlSelect;
/**
* A combo box field.

2
includes/htmlform/fields/HTMLFormFieldCloner.php
View file

@ -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

2
includes/htmlform/fields/HTMLMultiSelectField.php
View file

@ -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

2
includes/htmlform/fields/HTMLRadioField.php
View file

@ -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.

2
includes/htmlform/fields/HTMLSelectField.php
View file

@ -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

2
includes/htmlform/fields/HTMLSelectOrOtherField.php
View file

@ -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.

2
includes/htmlform/fields/HTMLSizeFilterField.php
View file

@ -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:

2
includes/installer/WebInstaller.php
View file

@ -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.

2
includes/installer/WebInstallerDBConnect.php
View file

@ -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 {

2
includes/installer/WebInstallerLanguage.php
View file

@ -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 {

2
includes/installer/WebInstallerPage.php
View file

@ -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.

1
includes/language/Language.php
View file

@ -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;

2
includes/linker/Linker.php
View file

@ -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

1
includes/logging/LogEventsList.php
View file

@ -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;

1
includes/media/MediaTransformOutput.php
View file

@ -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().

1
includes/media/ThumbnailImage.php
View file

@ -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

1
includes/page/Article.php
View file

@ -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;

1
includes/page/ImagePage.php
View file

@ -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;
/**

4
includes/page/ProtectionForm.php
View file

@ -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

2
includes/pager/TablePager.php
View file

@ -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

2
includes/parser/Parser.php
View file

@ -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

2
includes/preferences/DefaultPreferencesFactory.php
View file

@ -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.

1
includes/revisiondelete/RevDelLogItem.php
View file

@ -22,6 +22,7 @@
use MediaWiki\CommentStore\CommentStore;
use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\Title\Title;
use MediaWiki\Xml\Xml;
use Wikimedia\Rdbms\IConnectionProvider;
/**

1
includes/revisiondelete/RevDelRevisionItem.php
View file

@ -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

2
includes/search/searchwidgets/SearchFormWidget.php
View file

@ -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 */

2
includes/site/SiteExporter.php
View file

@ -21,7 +21,7 @@
namespace MediaWiki\Site;
use InvalidArgumentException;
use Xml;
use MediaWiki\Xml\Xml;
/**
* Utility for exporting site entries to XML.

2
includes/specialpage/QueryPage.php
View file

@ -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,

2
includes/specials/SpecialChangeContentModel.php
View file

@ -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 {

4
includes/specials/SpecialEditTags.php
View file

@ -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.

2
includes/specials/SpecialExpandTemplates.php
View file

@ -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,

2
includes/specials/SpecialMovePage.php
View file

@ -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

2
includes/specials/SpecialPageLanguage.php
View file

@ -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

2
includes/specials/SpecialPasswordPolicies.php
View file

@ -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.

2
includes/specials/SpecialRecentChanges.php
View file

@ -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

2
includes/specials/SpecialRecentChangesLinked.php
View file

@ -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.

2
includes/specials/SpecialRevisionDelete.php
View file

@ -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

2
includes/specials/SpecialSearch.php
View file

@ -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

2
includes/specials/SpecialStatistics.php
View file

@ -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

2
includes/specials/SpecialTags.php
View file

@ -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

2
includes/specials/SpecialUndelete.php
View file

@ -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

4
includes/specials/SpecialUserRights.php
View file

@ -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

4
includes/specials/SpecialWatchlist.php
View file

@ -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,

2
includes/specials/SpecialWhatLinksHere.php
View file

@ -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

1
includes/specials/forms/PreferencesFormOOUI.php
View file

@ -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.

1
includes/specials/helpers/ImportReporter.php
View file

@ -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

2
includes/specials/pagers/AllMessagesTablePager.php
View file

@ -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

2
includes/specials/pagers/ImageListPager.php
View file

@ -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

2
includes/specials/pagers/MergeHistoryPager.php
View file

@ -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

8
includes/xml/Xml.php
View file

@ -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' );

4
includes/xml/XmlSelect.php
View file

@ -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' );

1
maintenance/includes/TextPassDumper.php
View file

@ -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;

1
opensearch_desc.php
View file

@ -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.

36
tests/phan/TaintCheckAnnotationsTest.php
View file

@ -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() {

11
tests/phpunit/includes/xml/XmlTest.php
View file

@ -1,12 +1,13 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Xml\Xml;
/**
* See also \MediaWiki\Tests\Unit\XmlTest for the pure unit tests
*
* @group Xml
* @covers \Xml
* @covers \MediaWiki\Xml\Xml
*/
class XmlTest extends MediaWikiIntegrationTestCase {
@ -132,7 +133,7 @@ class XmlTest extends MediaWikiIntegrationTestCase {
* @dataProvider provideMonthSelector
*/
public function testMonthSelector( $expected, $selected, $allmonths, $id ) {
$this->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(
'<label for="year">From year (and earlier):</label> ' .
@ -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' ) );

4
tests/phpunit/unit/includes/xml/XmlSelectTest.php
View file

@ -1,8 +1,10 @@
<?php
use MediaWiki\Xml\XmlSelect;
/**
* @group Xml
* @covers \XmlSelect
* @covers \MediaWiki\Xml\XmlSelect
*/
class XmlSelectTest extends MediaWikiUnitTestCase {

4
tests/phpunit/unit/includes/xml/XmlTest.php
View file

@ -21,14 +21,14 @@
namespace MediaWiki\Tests\Unit;
use MediaWiki\Xml\Xml;
use MediaWikiUnitTestCase;
use Xml;
/**
* Split from \XmlTest integration tests
*
* @group Xml
* @covers \Xml
* @covers \MediaWiki\Xml\Xml
*/
class XmlTest extends MediaWikiUnitTestCase {