' . $h3char; $ret .= "

\n"; diff --git a/includes/CommentStore.php b/includes/CommentStore.php index e9b08e89dc..6b94d58e6c 100644 --- a/includes/CommentStore.php +++ b/includes/CommentStore.php @@ -261,7 +261,7 @@ class CommentStore { private function getCommentInternal( IDatabase $db = null, $key, $row, $fallback = false ) { $row = (array)$row; if ( array_key_exists( "{$key}_text", $row ) && array_key_exists( "{$key}_data", $row ) ) { - $cid = isset( $row["{$key}_cid"] ) ? $row["{$key}_cid"] : null; + $cid = $row["{$key}_cid"] ?? null; $text = $row["{$key}_text"]; $data = $row["{$key}_data"]; } elseif ( $this->stage === MIGRATION_OLD ) { diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 853315f142..3771df14fe 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1500,10 +1500,6 @@ $wgDirectoryMode = 0777; * * This means a 320x240 use of an image on the wiki will also generate 480x360 and 640x480 * thumbnails, output via the srcset attribute. - * - * On older browsers, a JavaScript polyfill switches the appropriate images in after loading - * the original low-resolution versions depending on the reported window.devicePixelRatio. - * The polyfill can be found in the jquery.hidpi module. */ $wgResponsiveImages = true; @@ -1894,6 +1890,13 @@ $wgSQLMode = ''; */ $wgDBmwschema = null; +/** + * Default group to use when getting database connections. + * Will be used as default query group in ILoadBalancer::getConnection. + * @since 1.32 + */ +$wgDBDefaultGroup = null; + /** * To override default SQLite data directory ($docroot/../data) */ @@ -2059,6 +2062,8 @@ $wgDBerrorLogTZ = false; * Even correct usage may cause failures with Unicode supplementary * characters (those not in the Basic Multilingual Plane) unless MySQL * has enhanced their Unicode support. + * + * @deprecated since 1.31 */ $wgDBmysql5 = false; @@ -3778,23 +3783,6 @@ $wgResourceLoaderLESSVars = [ 'deviceWidthTablet' => '720px', ]; -/** - * Default import paths for LESS modules. LESS files referenced in @import - * statements will be looked up here first, and relative to the importing file - * second. To avoid collisions, it's important for the LESS files in these - * directories to have a common, predictable file name prefix. - * - * Extensions need not (and should not) register paths in - * $wgResourceLoaderLESSImportPaths. The import path includes the path of the - * currently compiling LESS file, which allows each extension to freely import - * files from its own tree. - * - * @since 1.22 - */ -$wgResourceLoaderLESSImportPaths = [ - "$IP/resources/src/mediawiki.less/", -]; - /** * Whether ResourceLoader should attempt to persist modules in localStorage on * browsers that support the Web Storage API. @@ -4746,10 +4734,10 @@ $wgPasswordDefault = 'pbkdf2'; * $wgPasswordConfig['bcrypt-peppered'] = [ * 'class' => EncryptedPassword::class, * 'underlying' => 'bcrypt', - * 'secrets' => [], - * 'cipher' => MCRYPT_RIJNDAEL_256, - * 'mode' => MCRYPT_MODE_CBC, - * 'cost' => 5, + * 'secrets' => [ + * hash( 'sha256', 'secret', true ), + * ], + * 'cipher' => 'aes-256-cbc', * ]; * @endcode * @@ -4894,6 +4882,7 @@ $wgDefaultUserOptions = [ 'watchlistunwatchlinks' => 0, 'watchmoves' => 0, 'watchrollback' => 0, + 'wlenhancedfilters-disable' => 0, 'wllimit' => 250, 'useeditwarning' => 1, 'prefershttps' => 1, @@ -6032,6 +6021,15 @@ $wgSessionName = false; */ $wgCookieSetOnAutoblock = false; +/** + * Whether to set a cookie when a logged-out user is blocked. Doing so means that a blocked user, + * even after moving to a new IP address, will still be blocked. This cookie will contain an + * authentication code if $wgSecretKey is set, or otherwise will just be the block ID (in which + * case there is a possibility of an attacker discovering the names of revdeleted users, so it + * is best to use this in conjunction with $wgSecretKey being set). + */ +$wgCookieSetOnIpBlock = false; + /** @} */ # end of cookie settings } /************************************************************************//** @@ -6879,6 +6877,15 @@ $wgUseRCPatrol = true; */ $wgStructuredChangeFiltersShowPreference = false; +/** + * Whether a preference is displayed for structured change filters on watchlist. + * Works just like $wgStructuredChangeFiltersShowPreference. + * + * Temporary variable during development and will be removed + * @since 1.32 + */ +$wgStructuredChangeFiltersShowWatchlistPreference = false; + /** * Whether to enable RCFilters app on Special:Watchlist * @@ -7877,10 +7884,16 @@ $wgActionFilteredLogs = [ ]; /** - * Maintain a log of newusers at Log/newusers? + * Maintain a log of newusers at Special:Log/newusers? */ $wgNewUserLog = true; +/** + * Maintain a log of page creations at Special:Log/create? + * @since 1.32 + */ +$wgPageCreationLog = false; + /** @} */ # end logging } /*************************************************************************//** @@ -8883,6 +8896,17 @@ $wgInterwikiPrefixDisplayTypes = []; */ $wgCommentTableSchemaMigrationStage = MIGRATION_OLD; +/** + * RevisionStore table schema migration stage (content, slots, content_models & slot_roles tables) + * + * @see Task: https://phabricator.wikimedia.org/T174028 + * @see Commit: https://gerrit.wikimedia.org/r/#/c/378724/ + * + * @since 1.32 + * @var int One of the MIGRATION_* constants + */ +$wgMultiContentRevisionSchemaMigrationStage = MIGRATION_OLD; + /** * Actor table schema migration stage. * @since 1.31 @@ -8899,6 +8923,20 @@ $wgActorTableSchemaMigrationStage = MIGRATION_OLD; */ $wgExpiryWidgetNoDatePicker = false; +/** + * change_tag table schema migration stage. + * + * - MIGRATION_OLD: Do not use change_tag_def table or ct_tag_id. + * - MIGRATION_WRITE_BOTH: Write to the change_tag_def table and ct_tag_id, but read from + * the old schema. This is different from the formal definition of the constants + * - MIGRATION_WRITE_NEW: Behaves the same as MIGRATION_WRITE_BOTH + * - MIGRATION_NEW: Use the change_tag_def table and ct_tag_id, do not read/write ct_tag + * + * @since 1.32 + * @var int One of the MIGRATION_* constants + */ +$wgChangeTagsSchemaMigrationStage = MIGRATION_OLD; + /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker diff --git a/includes/Defines.php b/includes/Defines.php index 087af39db4..e5261e7931 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -22,7 +22,6 @@ require_once __DIR__ . '/libs/mime/defines.php'; require_once __DIR__ . '/libs/rdbms/defines.php'; -require_once __DIR__ . '/compat/normal/UtfNormalDefines.php'; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/DummyLinker.php b/includes/DummyLinker.php index 9aa6aeb056..2f5455ef5a 100644 --- a/includes/DummyLinker.php +++ b/includes/DummyLinker.php @@ -5,14 +5,6 @@ */ class DummyLinker { - /** - * @deprecated since 1.28, use LinkRenderer::getLinkClasses() instead - */ - public function getLinkColour( $t, $threshold ) { - wfDeprecated( __METHOD__, '1.28' ); - return Linker::getLinkColour( $t, $threshold ); - } - public function link( $target, $html = null, @@ -107,7 +99,7 @@ class DummyLinker { Title $title, $file, $label = '', - $alt, + $alt = '', $align = 'right', $params = [], $framed = false, diff --git a/includes/EditPage.php b/includes/EditPage.php index 87fb711138..9a8a4a6a09 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -235,7 +235,10 @@ class EditPage { /** @var string */ public $action = 'submit'; - /** @var bool */ + /** @var bool Whether an edit conflict needs to be resolved. Detected based on whether + * $editRevId is different from the current revision. When a conflict has successfully + * been resolved by a 3-way-merge, this field is set to false. + */ public $isConflict = false; /** @var bool New page or new section */ @@ -301,7 +304,7 @@ class EditPage { /** @var bool Has a summary been preset using GET parameter &summary= ? */ public $hasPresetSummary = false; - /** @var Revision|bool|null */ + /** @var Revision|bool|null A revision object corresponding to $this->editRevId. */ public $mBaseRevision = false; /** @var bool */ @@ -342,7 +345,16 @@ class EditPage { /** @var string */ public $edittime = ''; - /** @var int */ + /** @var int ID of the current revision at the time editing was initiated on the client. + * This is used to detect and resolve edit conflicts. + * + * @note 0 if the page did not exist at that time. + * @note When starting an edit from an old revision, this still records the current + * revision at the time , not the one the edit is based on. + * + * @see $oldid + * @see getBaseRevision() + */ private $editRevId = null; /** @var string */ @@ -354,10 +366,16 @@ class EditPage { /** @var string */ public $starttime = ''; - /** @var int */ + /** @var int Revision ID the edit is based on, or 0 if it's the current revision. + * @see $editRevId + */ public $oldid = 0; - /** @var int */ + /** @var int Revision ID the edit is based on, adjusted when an edit conflict is resolved. + * @see $editRevId + * @see $oldid + * @see getparentRevId() + */ public $parentRevId = 0; /** @var string */ @@ -486,17 +504,15 @@ class EditPage { /** * Get the context title object. - * If not set, $wgTitle will be returned. This behavior might change in - * the future to return $this->mTitle instead. + * + * If not set, $wgTitle will be returned, but this is deprecated. This will + * throw an exception. * * @return Title */ public function getContextTitle() { if ( is_null( $this->mContextTitle ) ) { - wfDebugLog( - 'GlobalTitleFail', - __METHOD__ . ' called by ' . wfGetAllCallers( 5 ) . ' with no title set.' - ); + wfDeprecated( __METHOD__ . ' called with no title set', '1.32' ); global $wgTitle; return $wgTitle; } else { @@ -587,6 +603,10 @@ class EditPage { $permErrors = $this->getEditPermissionErrors( $this->save ? 'secure' : 'full' ); if ( $permErrors ) { wfDebug( __METHOD__ . ": User can't edit\n" ); + + // track block with a cookie if it doesn't exists already + $this->context->getUser()->trackBlockWithCookie(); + // Auto-block user's IP if the account was "hard" blocked if ( !wfReadOnly() ) { DeferredUpdates::addCallableUpdate( function () { @@ -1182,6 +1202,7 @@ class EditPage { if ( $undo > 0 && $undoafter > 0 ) { $undorev = Revision::newFromId( $undo ); $oldrev = Revision::newFromId( $undoafter ); + $undoMsg = null; # Sanity check, make sure it's the right page, # the revisions exist and they were not deleted. @@ -1190,12 +1211,19 @@ class EditPage { !$undorev->isDeleted( Revision::DELETED_TEXT ) && !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { - $content = $this->page->getUndoContent( $undorev, $oldrev ); - - if ( $content === false ) { - # Warn the user that something went wrong - $undoMsg = 'failure'; + if ( WikiPage::hasDifferencesOutsideMainSlot( $undorev, $oldrev ) ) { + // Cannot yet undo edits that involve anything other the main slot. + $undoMsg = 'main-slot-only'; } else { + $content = $this->page->getUndoContent( $undorev, $oldrev ); + + if ( $content === false ) { + # Warn the user that something went wrong + $undoMsg = 'failure'; + } + } + + if ( $undoMsg === null ) { $oldContent = $this->page->getContent( Revision::RAW ); $popts = ParserOptions::newFromUserAndLang( $user, $wgContLang ); $newContent = $content->preSaveTransform( $this->mTitle, $user, $popts ); @@ -1252,7 +1280,8 @@ class EditPage { } $out = $this->context->getOutput(); - // Messages: undo-success, undo-failure, undo-norev, undo-nochange + // Messages: undo-success, undo-failure, undo-main-slot-only, undo-norev, + // undo-nochange. $class = ( $undoMsg == 'success' ? '' : 'error ' ) . "mw-undo-{$undoMsg}"; $this->editFormPageTop .= $out->parse( "

" . $this->context->msg( 'undo-' . $undoMsg )->plain() . '

', true, /* interface */true ); @@ -1491,7 +1520,11 @@ class EditPage { * @return Status The resulting status object. */ public function attemptSave( &$resultDetails = false ) { - # Allow bots to exempt some edits from bot flagging + // TODO: MCR: treat $this->minoredit like $this->bot and check isAllowed( 'minoredit' )! + // Also, add $this->autopatrol like $this->bot and check isAllowed( 'autopatrol' )! + // This is needed since PageUpdater no longer checks these rights! + + // Allow bots to exempt some edits from bot flagging $bot = $this->context->getUser()->isAllowed( 'bot' ) && $this->bot; $status = $this->internalAttemptSave( $resultDetails, $bot ); @@ -1574,7 +1607,7 @@ class EditPage { $query = $query . '&' . $extraQueryRedirect; } } - $anchor = isset( $resultDetails['sectionanchor'] ) ? $resultDetails['sectionanchor'] : ''; + $anchor = $resultDetails['sectionanchor'] ?? ''; $out->redirect( $this->mTitle->getFullURL( $query ) . $anchor ); return false; @@ -2015,7 +2048,10 @@ ERROR; wfDebug( "timestamp: {$timestamp}, edittime: {$this->edittime}\n" ); - // Check editRevId if set, which handles same-second timestamp collisions + // An edit conflict is detected if the current revision is different from the + // revision that was current when editing was initiated on the client. + // This is checked based on the timestamp and revision ID. + // TODO: the timestamp based check can probably go away now. if ( $timestamp != $this->edittime || ( $this->editRevId !== null && $this->editRevId != $latest ) ) { @@ -2295,7 +2331,8 @@ ERROR; private function mergeChangesIntoContent( &$editContent ) { $db = wfGetDB( DB_MASTER ); - // This is the revision the editor started from + // This is the revision that was current at the time editing was initiated on the client, + // even if the edit was based on an old revision. $baseRevision = $this->getBaseRevision(); $baseContent = $baseRevision ? $baseRevision->getContent() : null; @@ -2326,9 +2363,16 @@ ERROR; } /** - * @note: this method is very poorly named. If the user opened the form with ?oldid=X, - * one might think of X as the "base revision", which is NOT what this returns. - * @return Revision|null Current version when the edit was started + * Returns the revision that was current at the time editing was initiated on the client, + * even if the edit was based on an old revision. + * + * @warning: this method is very poorly named. If the user opened the form with ?oldid=X, + * one might think of X as the "base revision", which is NOT what this returns, + * see oldid for that. One might further assume that this corresponds to the $baseRevId + * parameter of WikiPage::doEditContent, which is not the case either. + * getExpectedParentRevision() would perhaps be a better name. + * + * @return Revision|null Current version when editing was initiated on the client */ public function getBaseRevision() { if ( !$this->mBaseRevision ) { @@ -2808,7 +2852,7 @@ ERROR; $this->autoSumm = md5( '' ); } - $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); + $autosumm = $this->autoSumm ?: md5( $this->summary ); $out->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) ); $out->addHTML( Html::hidden( 'oldid', $this->oldid ) ); @@ -3537,7 +3581,7 @@ ERROR; // Allow for site and per-namespace customization of contribution/copyright notice. Hooks::run( 'EditPageCopyrightWarning', [ $title, &$copywarnMsg ] ); - $msg = call_user_func_array( 'wfMessage', $copywarnMsg )->title( $title ); + $msg = wfMessage( ...$copywarnMsg )->title( $title ); if ( $langcode ) { $msg->inLanguage( $langcode ); } @@ -4191,7 +4235,7 @@ ERROR; $checkboxesDef = $this->getCheckboxesDefinition( $checked ); foreach ( $checkboxesDef as $name => $options ) { - $legacyName = isset( $options['legacy-name'] ) ? $options['legacy-name'] : $name; + $legacyName = $options['legacy-name'] ?? $name; $title = null; $accesskey = null; @@ -4217,33 +4261,11 @@ ERROR; 'align' => 'inline', 'label' => new OOUI\HtmlSnippet( $this->context->msg( $options['label-message'] )->parse() ), 'title' => $title, - 'id' => isset( $options['label-id'] ) ? $options['label-id'] : null, + 'id' => $options['label-id'] ?? null, ] ); } - // Backwards-compatibility hack to run the EditPageBeforeEditChecks hook. It's important, - // people have used it for the weirdest things completely unrelated to checkboxes... - // And if we're gonna run it, might as well allow its legacy checkboxes to be shown. - $legacyCheckboxes = []; - if ( !$this->isNew ) { - $legacyCheckboxes['minor'] = ''; - } - $legacyCheckboxes['watch'] = ''; - // Copy new-style checkboxes into an old-style structure - foreach ( $checkboxes as $name => $oouiLayout ) { - $legacyCheckboxes[$name] = (string)$oouiLayout; - } - // Avoid PHP 7.1 warning of passing $this by reference - $ep = $this; - Hooks::run( 'EditPageBeforeEditChecks', [ &$ep, &$legacyCheckboxes, &$tabindex ], '1.29' ); - // Copy back any additional old-style checkboxes into the new-style structure - foreach ( $legacyCheckboxes as $name => $html ) { - if ( $html && !isset( $checkboxes[$name] ) ) { - $checkboxes[$name] = new OOUI\Widget( [ 'content' => new OOUI\HtmlSnippet( $html ) ] ); - } - } - return $checkboxes; } diff --git a/includes/FauxRequest.php b/includes/FauxRequest.php index 2f7f75b4d7..ecbc6e3373 100644 --- a/includes/FauxRequest.php +++ b/includes/FauxRequest.php @@ -121,7 +121,7 @@ class FauxRequest extends WebRequest { $prefix = $wgCookiePrefix; } $name = $prefix . $key; - return isset( $this->cookies[$name] ) ? $this->cookies[$name] : $default; + return $this->cookies[$name] ?? $default; } /** diff --git a/includes/GitInfo.php b/includes/GitInfo.php index 6270b27fdd..363d7b8050 100644 --- a/includes/GitInfo.php +++ b/includes/GitInfo.php @@ -227,6 +227,7 @@ class GitInfo { $date = false; if ( is_file( $wgGitBin ) && is_executable( $wgGitBin ) && + !Shell::isDisabled() && $this->getHead() !== false ) { $cmd = [ diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 6f49a141e1..d9996f426f 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -121,7 +121,7 @@ function wfArrayDiff2_cmp( $a, $b ) { if ( is_string( $a ) && is_string( $b ) ) { return strcmp( $a, $b ); } elseif ( count( $a ) !== count( $b ) ) { - return count( $a ) < count( $b ) ? -1 : 1; + return count( $a ) <=> count( $b ); } else { reset( $a ); reset( $b ); @@ -1336,21 +1336,19 @@ function wfGetLangObj( $langcode = false ) { * This function replaces all old wfMsg* functions. * * @param string|string[]|MessageSpecifier $key Message key, or array of keys, or a MessageSpecifier - * @param mixed $params,... Normal message parameters + * @param string|string[] ...$params Normal message parameters * @return Message * * @since 1.17 * * @see Message::__construct */ -function wfMessage( $key /*...*/ ) { +function wfMessage( $key, ...$params ) { $message = new Message( $key ); // We call Message::params() to reduce code duplication - $params = func_get_args(); - array_shift( $params ); if ( $params ) { - call_user_func_array( [ $message, 'params' ], $params ); + $message->params( ...$params ); } return $message; @@ -1361,16 +1359,15 @@ function wfMessage( $key /*...*/ ) { * for the first message which is non-empty. If all messages are empty then an * instance of the first message key is returned. * - * @param string|string[] $keys,... Message keys + * @param string ...$keys Message keys * @return Message * * @since 1.18 * * @see Message::newFallbackSequence */ -function wfMessageFallback( /*...*/ ) { - $args = func_get_args(); - return call_user_func_array( 'Message::newFallbackSequence', $args ); +function wfMessageFallback( ...$keys ) { + return Message::newFallbackSequence( ...$keys ); } /** @@ -1516,7 +1513,7 @@ function wfBacktrace( $raw = null ) { $frames = array_map( function ( $frame ) use ( $frameFormat ) { $file = !empty( $frame['file'] ) ? basename( $frame['file'] ) : '-'; - $line = isset( $frame['line'] ) ? $frame['line'] : '-'; + $line = $frame['line'] ?? '-'; $call = $frame['function']; if ( !empty( $frame['class'] ) ) { $call = $frame['class'] . $frame['type'] . $call; @@ -2199,9 +2196,7 @@ function wfStringToBool( $val ) { * @deprecated since 1.30 use MediaWiki\Shell::escape() */ function wfEscapeShellArg( /*...*/ ) { - $args = func_get_args(); - - return call_user_func_array( Shell::class . '::escape', $args ); + return Shell::escape( ...func_get_args() ); } /** @@ -2241,7 +2236,7 @@ function wfShellExec( $cmd, &$retval = null, $environ = [], } $includeStderr = isset( $options['duplicateStderr'] ) && $options['duplicateStderr']; - $profileMethod = isset( $options['profileMethod'] ) ? $options['profileMethod'] : wfGetCaller(); + $profileMethod = $options['profileMethod'] ?? wfGetCaller(); try { $result = Shell::command( [] ) @@ -2304,7 +2299,7 @@ function wfShellWikiCmd( $script, array $parameters = [], array $options = [] ) // Give site config file a chance to run the script in a wrapper. // The caller may likely want to call wfBasename() on $script. Hooks::run( 'wfShellWikiCmd', [ &$script, &$parameters, &$options ] ); - $cmd = isset( $options['php'] ) ? [ $options['php'] ] : [ $wgPhpCli ]; + $cmd = [ $options['php'] ?? $wgPhpCli ]; if ( isset( $options['wrapper'] ) ) { $cmd[] = $options['wrapper']; } @@ -2700,10 +2695,7 @@ function wfMakeStaticArrayFile( array $data, $header = 'Automatically generated' * @return string */ function wfMemcKey( /*...*/ ) { - return call_user_func_array( - [ ObjectCache::getLocalClusterInstance(), 'makeKey' ], - func_get_args() - ); + return ObjectCache::getLocalClusterInstance()->makeKey( ...func_get_args() ); } /** @@ -2719,10 +2711,7 @@ function wfMemcKey( /*...*/ ) { function wfForeignMemcKey( $db, $prefix /*...*/ ) { $args = array_slice( func_get_args(), 2 ); $keyspace = $prefix ? "$db-$prefix" : $db; - return call_user_func_array( - [ ObjectCache::getLocalClusterInstance(), 'makeKeyInternal' ], - [ $keyspace, $args ] - ); + return ObjectCache::getLocalClusterInstance()->makeKeyInternal( $keyspace, $args ); } /** @@ -2738,10 +2727,7 @@ function wfForeignMemcKey( $db, $prefix /*...*/ ) { * @return string */ function wfGlobalCacheKey( /*...*/ ) { - return call_user_func_array( - [ ObjectCache::getLocalClusterInstance(), 'makeGlobalKey' ], - func_get_args() - ); + return ObjectCache::getLocalClusterInstance()->makeGlobalKey( ...func_get_args() ); } /** @@ -3150,17 +3136,6 @@ function wfGetMessageCacheStorage() { return ObjectCache::getInstance( $wgMessageCacheType ); } -/** - * Get the cache object used by the parser cache - * - * @deprecated since 1.30, use MediaWikiServices::getParserCache()->getCacheStorage() - * @return BagOStuff - */ -function wfGetParserCacheStorage() { - global $wgParserCacheType; - return ObjectCache::getInstance( $wgParserCacheType ); -} - /** * Call hook functions defined in $wgHooks * diff --git a/includes/Hooks.php b/includes/Hooks.php index c22dc97f46..d434120012 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -47,10 +47,6 @@ class Hooks { * @since 1.18 */ public static function register( $name, $callback ) { - if ( !isset( self::$handlers[$name] ) ) { - self::$handlers[$name] = []; - } - self::$handlers[$name][] = $callback; } @@ -62,6 +58,7 @@ class Hooks { * * @since 1.21 * @throws MWException If not in testing mode. + * @codeCoverageIgnore */ public static function clear( $name ) { if ( !defined( 'MW_PHPUNIT_TEST' ) && !defined( 'MW_PARSER_TEST' ) ) { diff --git a/includes/Html.php b/includes/Html.php index 019e0785f9..0016426f54 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -391,8 +391,8 @@ class Html { unset( $attribs['type'] ); } if ( $element === 'input' ) { - $type = isset( $attribs['type'] ) ? $attribs['type'] : null; - $value = isset( $attribs['value'] ) ? $attribs['value'] : null; + $type = $attribs['type'] ?? null; + $value = $attribs['value'] ?? null; if ( $type === 'checkbox' || $type === 'radio' ) { // The default value for checkboxes and radio buttons is 'on' // not ''. By stripping value="" we break radio boxes that @@ -925,9 +925,9 @@ class Html { if ( isset( $params['label'] ) ) { $ret .= self::element( 'label', [ - 'for' => isset( $selectAttribs['id'] ) ? $selectAttribs['id'] : null, + 'for' => $selectAttribs['id'] ?? null, ], $params['label'] - ) . ' '; + ) . "\u{00A0}"; } // Wrap options in a and on the and there are additional fake clicks fired for\n\t\t\t// non-click actions that change the checkboxes.\n\t\t\te.preventDefault();\n\t\t\tsetTimeout( function () {\n\t\t\t\tif ( !items[ nowClickedIndex ].isDisabled() ) {\n\t\t\t\t\titems[ nowClickedIndex ].setSelected( !wasSelected );\n\t\t\t\t}\n\t\t\t} );\n\t\t}\n\t}\n\n\tif ( $nowClicked.length ) {\n\t\tthis.$lastClicked = $nowClicked;\n\t}\n};\n\n/**\n * Focus the widget\n *\n * @chainable\n */\nOO.ui.CheckboxMultiselectWidget.prototype.focus = function () {\n\tvar item;\n\tif ( !this.isDisabled() ) {\n\t\titem = this.getRelativeFocusableItem( null, 1 );\n\t\tif ( item ) {\n\t\t\titem.focus();\n\t\t}\n\t}\n\treturn this;\n};\n\n/**\n * @inheritdoc\n */\nOO.ui.CheckboxMultiselectWidget.prototype.simulateLabelClick = function () {\n\tthis.focus();\n};\n","/**\n * Progress bars visually display the status of an operation, such as a download,\n * and can be either determinate or indeterminate:\n *\n * - **determinate** process bars show the percent of an operation that is complete.\n *\n * - **indeterminate** process bars use a visual display of motion to indicate that an operation\n * is taking place. Because the extent of an indeterminate operation is unknown, the bar does\n * not use percentages.\n *\n * The value of the `progress` configuration determines whether the bar is determinate or indeterminate.\n *\n * @example\n * // Examples of determinate and indeterminate progress bars.\n * var progressBar1 = new OO.ui.ProgressBarWidget( {\n * progress: 33\n * } );\n * var progressBar2 = new OO.ui.ProgressBarWidget();\n *\n * // Create a FieldsetLayout to layout progress bars\n * var fieldset = new OO.ui.FieldsetLayout;\n * fieldset.addItems( [\n * new OO.ui.FieldLayout( progressBar1, {label: 'Determinate', align: 'top'}),\n * new OO.ui.FieldLayout( progressBar2, {label: 'Indeterminate', align: 'top'})\n * ] );\n * $( 'body' ).append( fieldset.$element );\n *\n * @class\n * @extends OO.ui.Widget\n *\n * @constructor\n * @param {Object} [config] Configuration options\n * @cfg {number|boolean} [progress=false] The type of progress bar (determinate or indeterminate).\n * To create a determinate progress bar, specify a number that reflects the initial percent complete.\n * By default, the progress bar is indeterminate.\n */\nOO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) {\n\t// Configuration initialization\n\tconfig = config || {};\n\n\t// Parent constructor\n\tOO.ui.ProgressBarWidget.parent.call( this, config );\n\n\t// Properties\n\tthis.$bar = $( '

' );\n\tthis.progress = null;\n\n\t// Initialization\n\tthis.setProgress( config.progress !== undefined ? config.progress : false );\n\tthis.$bar.addClass( 'oo-ui-progressBarWidget-bar' );\n\tthis.$element\n\t\t.attr( {\n\t\t\trole: 'progressbar',\n\t\t\t'aria-valuemin': 0,\n\t\t\t'aria-valuemax': 100\n\t\t} )\n\t\t.addClass( 'oo-ui-progressBarWidget' )\n\t\t.append( this.$bar );\n};\n\n/* Setup */\n\nOO.inheritClass( OO.ui.ProgressBarWidget, OO.ui.Widget );\n\n/* Static Properties */\n\n/**\n * @static\n * @inheritdoc\n */\nOO.ui.ProgressBarWidget.static.tagName = 'div';\n\n/* Methods */\n\n/**\n * Get the percent of the progress that has been completed. Indeterminate progresses will return `false`.\n *\n * @return {number|boolean} Progress percent\n */\nOO.ui.ProgressBarWidget.prototype.getProgress = function () {\n\treturn this.progress;\n};\n\n/**\n * Set the percent of the process completed or `false` for an indeterminate process.\n *\n * @param {number|boolean} progress Progress percent or `false` for indeterminate\n */\nOO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) {\n\tthis.progress = progress;\n\n\tif ( progress !== false ) {\n\t\tthis.$bar.css( 'width', this.progress + '%' );\n\t\tthis.$element.attr( 'aria-valuenow', this.progress );\n\t} else {\n\t\tthis.$bar.css( 'width', '' );\n\t\tthis.$element.removeAttr( 'aria-valuenow' );\n\t}\n\tthis.$element.toggleClass( 'oo-ui-progressBarWidget-indeterminate', progress === false );\n};\n","/**\n * InputWidget is the base class for all input widgets, which\n * include {@link OO.ui.TextInputWidget text inputs}, {@link OO.ui.CheckboxInputWidget checkbox inputs},\n * {@link OO.ui.RadioInputWidget radio inputs}, and {@link OO.ui.ButtonInputWidget button inputs}.\n * See the [OOUI documentation on MediaWiki] [1] for more information and examples.\n *\n * [1]: https://www.mediawiki.org/wiki/OOUI/Widgets/Inputs\n *\n * @abstract\n * @class\n * @extends OO.ui.Widget\n * @mixins OO.ui.mixin.FlaggedElement\n * @mixins OO.ui.mixin.TabIndexedElement\n * @mixins OO.ui.mixin.TitledElement\n * @mixins OO.ui.mixin.AccessKeyedElement\n *\n * @constructor\n * @param {Object} [config] Configuration options\n * @cfg {string} [name=''] The value of the inputâs HTML `name` attribute.\n * @cfg {string} [value=''] The value of the input.\n * @cfg {string} [dir] The directionality of the input (ltr/rtl).\n * @cfg {string} [inputId] The value of the inputâs HTML `id` attribute.\n * @cfg {Function} [inputFilter] The name of an input filter function. Input filters modify the value of an input\n * before it is accepted.\n */\nOO.ui.InputWidget = function OoUiInputWidget( config ) {\n\t// Configuration initialization\n\tconfig = config || {};\n\n\t// Parent constructor\n\tOO.ui.InputWidget.parent.call( this, config );\n\n\t// Properties\n\t// See #reusePreInfuseDOM about config.$input\n\tthis.$input = config.$input || this.getInputElement( config );\n\tthis.value = '';\n\tthis.inputFilter = config.inputFilter;\n\n\t// Mixin constructors\n\tOO.ui.mixin.FlaggedElement.call( this, config );\n\tOO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$input } ) );\n\tOO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$input } ) );\n\tOO.ui.mixin.AccessKeyedElement.call( this, $.extend( {}, config, { $accessKeyed: this.$input } ) );\n\n\t// Events\n\tthis.$input.on( 'keydown mouseup cut paste change input select', this.onEdit.bind( this ) );\n\n\t// Initialization\n\tthis.$input\n\t\t.addClass( 'oo-ui-inputWidget-input' )\n\t\t.attr( 'name', config.name )\n\t\t.prop( 'disabled', this.isDisabled() );\n\tthis.$element\n\t\t.addClass( 'oo-ui-inputWidget' )\n\t\t.append( this.$input );\n\tthis.setValue( config.value );\n\tif ( config.dir ) {\n\t\tthis.setDir( config.dir );\n\t}\n\tif ( config.inputId !== undefined ) {\n\t\tthis.setInputId( config.inputId );\n\t}\n};\n\n/* Setup */\n\nOO.inheritClass( OO.ui.InputWidget, OO.ui.Widget );\nOO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.FlaggedElement );\nOO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TabIndexedElement );\nOO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TitledElement );\nOO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.AccessKeyedElement );\n\n/* Static Methods */\n\n/**\n * @inheritdoc\n */\nOO.ui.InputWidget.static.reusePreInfuseDOM = function ( node, config ) {\n\tconfig = OO.ui.InputWidget.parent.static.reusePreInfuseDOM( node, config );\n\t// Reusing `$input` lets browsers preserve inputted values across page reloads, see T114134.\n\tconfig.$input = $( node ).find( '.oo-ui-inputWidget-input' );\n\treturn config;\n};\n\n/**\n * @inheritdoc\n */\nOO.ui.InputWidget.static.gatherPreInfuseState = function ( node, config ) {\n\tvar state = OO.ui.InputWidget.parent.static.gatherPreInfuseState( node, config );\n\tif ( config.$input && config.$input.length ) {\n\t\tstate.value = config.$input.val();\n\t\t// Might be better in TabIndexedElement, but it's awkward to do there because mixins are awkward\n\t\tstate.focus = config.$input.is( ':focus' );\n\t}\n\treturn state;\n};\n\n/* Events */\n\n/**\n * @event change\n *\n * A change event is emitted when the value of the input changes.\n *\n * @param {string} value\n */\n\n/* Methods */\n\n/**\n * Get input element.\n *\n * Subclasses of OO.ui.InputWidget use the `config` parameter to produce different elements in\n * different circumstances. The element must have a `value` property (like form elements).\n *\n * @protected\n * @param {Object} config Configuration options\n * @return {jQuery} Input element\n */\nOO.ui.InputWidget.prototype.getInputElement = function () {\n\treturn $( '' );\n};\n\n/**\n * Handle potentially value-changing events.\n *\n * @private\n * @param {jQuery.Event} e Key down, mouse up, cut, paste, change, input, or select event\n */\nOO.ui.InputWidget.prototype.onEdit = function () {\n\tvar widget = this;\n\tif ( !this.isDisabled() ) {\n\t\t// Allow the stack to clear so the value will be updated\n\t\tsetTimeout( function () {\n\t\t\twidget.setValue( widget.$input.val() );\n\t\t} );\n\t}\n};\n\n/**\n * Get the value of the input.\n *\n * @return {string} Input value\n */\nOO.ui.InputWidget.prototype.getValue = function () {\n\t// Resynchronize our internal data with DOM data. Other scripts executing on the page can modify\n\t// it, and we won't know unless they're kind enough to trigger a 'change' event.\n\tvar value = this.$input.val();\n\tif ( this.value !== value ) {\n\t\tthis.setValue( value );\n\t}\n\treturn this.value;\n};\n\n/**\n * Set the directionality of the input.\n *\n * @param {string} dir Text directionality: 'ltr', 'rtl' or 'auto'\n * @chainable\n */\nOO.ui.InputWidget.prototype.setDir = function ( dir ) {\n\tthis.$input.prop( 'dir', dir );\n\treturn this;\n};\n\n/**\n * Set the value of the input.\n *\n * @param {string} value New value\n * @fires change\n * @chainable\n */\nOO.ui.InputWidget.prototype.setValue = function ( value ) {\n\tvalue = this.cleanUpValue( value );\n\t// Update the DOM if it has changed. Note that with cleanUpValue, it\n\t// is possible for the DOM value to change without this.value changing.\n\tif ( this.$input.val() !== value ) {\n\t\tthis.$input.val( value );\n\t}\n\tif ( this.value !== value ) {\n\t\tthis.value = value;\n\t\tthis.emit( 'change', this.value );\n\t}\n\t// The first time that the value is set (probably while constructing the widget),\n\t// remember it in defaultValue. This property can be later used to check whether\n\t// the value of the input has been changed since it was created.\n\tif ( this.defaultValue === undefined ) {\n\t\tthis.defaultValue = this.value;\n\t\tthis.$input[ 0 ].defaultValue = this.defaultValue;\n\t}\n\treturn this;\n};\n\n/**\n * Clean up incoming value.\n *\n * Ensures value is a string, and converts undefined and null to empty string.\n *\n * @private\n * @param {string} value Original value\n * @return {string} Cleaned up value\n */\nOO.ui.InputWidget.prototype.cleanUpValue = function ( value ) {\n\tif ( value === undefined || value === null ) {\n\t\treturn '';\n\t} else if ( this.inputFilter ) {\n\t\treturn this.inputFilter( String( value ) );\n\t} else {\n\t\treturn String( value );\n\t}\n};\n\n/**\n * @inheritdoc\n */\nOO.ui.InputWidget.prototype.setDisabled = function ( state ) {\n\tOO.ui.InputWidget.parent.prototype.setDisabled.call( this, state );\n\tif ( this.$input ) {\n\t\tthis.$input.prop( 'disabled', this.isDisabled() );\n\t}\n\treturn this;\n};\n\n/**\n * Set the 'id' attribute of the `` element.\n *\n * @param {string} id\n * @chainable\n */\nOO.ui.InputWidget.prototype.setInputId = function ( id ) {\n\tthis.$input.attr( 'id', id );\n\treturn this;\n};\n\n/**\n * @inheritdoc\n */\nOO.ui.InputWidget.prototype.restorePreInfuseState = function ( state ) {\n\tOO.ui.InputWidget.parent.prototype.restorePreInfuseState.call( this, state );\n\tif ( state.value !== undefined && state.value !== this.getValue() ) {\n\t\tthis.setValue( state.value );\n\t}\n\tif ( state.focus ) {\n\t\tthis.focus();\n\t}\n};\n","/**\n * Data widget intended for creating 'hidden'-type inputs.\n *\n * @class\n * @extends OO.ui.Widget\n *\n * @constructor\n * @param {Object} [config] Configuration options\n * @cfg {string} [value=''] The value of the input.\n * @cfg {string} [name=''] The value of the inputâs HTML `name` attribute.\n */\nOO.ui.HiddenInputWidget = function OoUiHiddenInputWidget( config ) {\n\t// Configuration initialization\n\tconfig = $.extend( { value: '', name: '' }, config );\n\n\t// Parent constructor\n\tOO.ui.HiddenInputWidget.parent.call( this, config );\n\n\t// Initialization\n\tthis.$element.attr( {\n\t\ttype: 'hidden',\n\t\tvalue: config.value,\n\t\tname: config.name\n\t} );\n\tthis.$element.removeAttr( 'aria-disabled' );\n};\n\n/* Setup */\n\nOO.inheritClass( OO.ui.HiddenInputWidget, OO.ui.Widget );\n\n/* Static Properties */\n\n/**\n * @static\n * @inheritdoc\n */\nOO.ui.HiddenInputWidget.static.tagName = 'input';\n","/**\n * ButtonInputWidget is used to submit HTML forms and is intended to be used within\n * a OO.ui.FormLayout. If you do not need the button to work with HTML forms, you probably\n * want to use OO.ui.ButtonWidget instead. Button input widgets can be rendered as either an\n * HTML `