Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339904 )
Change subject: Miscellaneous indentation tweaks
......................................................................
Miscellaneous indentation tweaks
I was bored. What? Don't look at me that way.
I mostly targetted mixed tabs and spaces, but others were not spared.
Note that some of the whitespace changes are inside HTML output,
extended regexps or SQL snippets.
Change-Id: Ie206cc946459f6befcfc2d520e35ad3ea3c0f1e0
---
M docs/uidesign/child-selector-emu.html
M includes/Block.php
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/GlobalFunctions.php
M includes/MagicWord.php
M includes/PHPVersionCheck.php
M includes/Sanitizer.php
M includes/Title.php
M includes/api/ApiLogin.php
M includes/api/ApiQueryRecentChanges.php
M includes/content/ContentHandler.php
M includes/content/FileContentHandler.php
M includes/content/TextContentHandler.php
M includes/content/WikiTextStructure.php
M includes/content/WikitextContentHandler.php
M includes/debug/MWDebug.php
M includes/debug/logger/monolog/KafkaHandler.php
M includes/diff/WordAccumulator.php
M includes/exception/UserNotLoggedIn.php
M includes/export/WikiExporter.php
M includes/htmlform/HTMLForm.php
M includes/http/Http.php
M includes/installer/PostgresUpdater.php
M includes/installer/SqliteInstaller.php
M includes/installer/WebInstallerOutput.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/jobs/RefreshLinksJob.php
M includes/jobqueue/utils/BacklinkJobUtils.php
M includes/libs/CSSMin.php
M includes/libs/CryptHKDF.php
M includes/libs/StatusValue.php
M includes/libs/mime/mime.info
M includes/libs/objectcache/RESTBagOStuff.php
M includes/libs/objectcache/WinCacheBagOStuff.php
M includes/libs/xmp/XMP.php
M includes/mail/UserMailer.php
M includes/media/DjVuImage.php
M includes/media/Jpeg.php
M includes/parser/DateFormatter.php
M includes/parser/Parser.php
M includes/registration/Processor.php
M includes/registration/VersionChecker.php
M includes/search/SearchIndexFieldDefinition.php
M includes/session/SessionManagerInterface.php
M includes/session/SessionProvider.php
M includes/skins/BaseTemplate.php
M includes/specialpage/LoginSignupSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialStatistics.php
M includes/tidy/Balancer.php
M includes/user/User.php
M includes/utils/BatchRowIterator.php
M includes/utils/MWCryptHKDF.php
M languages/Language.php
M languages/LanguageConverter.php
M languages/classes/LanguageKsh.php
M languages/classes/LanguageLa.php
M languages/classes/LanguageOs.php
M languages/messages/MessagesEn.php
M maintenance/hhvm/makeRepo.php
M maintenance/importImages.php
M maintenance/oracle/archives/patch-ar_sha1_field.sql
M maintenance/oracle/archives/patch-rev_sha1_field.sql
M maintenance/oracle/archives/patch-us_chunk_inx_field.sql
M maintenance/postgres/archives/patch-uploadstash.sql
M maintenance/userDupes.inc
M resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.skinning/content.parsoid.less
M resources/src/mediawiki/mediawiki.storage.js
M resources/src/mediawiki/page/gallery-slideshow.js
M tests/phpunit/autoload.ide.php
M tests/phpunit/includes/MWNamespaceTest.php
M tests/phpunit/includes/MessageTest.php
M tests/phpunit/includes/content/ContentHandlerTest.php
M tests/phpunit/includes/db/LBFactoryTest.php
M tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
M tests/phpunit/includes/search/SearchIndexFieldTest.php
M tests/phpunit/includes/utils/UIDGeneratorTest.php
M tests/phpunit/suite.xml
81 files changed, 341 insertions(+), 312 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/04/339904/1
diff --git a/docs/uidesign/child-selector-emu.html
b/docs/uidesign/child-selector-emu.html
index dedb3a6..9db4c54 100644
--- a/docs/uidesign/child-selector-emu.html
+++ b/docs/uidesign/child-selector-emu.html
@@ -26,7 +26,7 @@
/** second table. Try to emulate child selector */
table.childemu th,
- table.childemu td {
+ table.childemu td {
border: 1px red solid;
background-color:white;
padding:1em;
diff --git a/includes/Block.php b/includes/Block.php
index 66b9ff0..2b6d8ee 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1142,7 +1142,7 @@
* Get all blocks that match any IP from an array of IP addresses
*
* @param array $ipChain List of IPs (strings), usually retrieved from
the
- * X-Forwarded-For header of the request
+ * X-Forwarded-For header of the request
* @param bool $isAnon Exclude anonymous-only blocks if false
* @param bool $fromMaster Whether to query the master or replica DB
* @return array Array of Blocks
@@ -1223,9 +1223,9 @@
*
* @param array $blocks Array of Block objects
* @param array $ipChain List of IPs (strings). This is used to
determine how "close"
- * a block is to the server, and if a block matches exactly, or
is in a range.
- * The order is furthest from the server to nearest e.g.,
(Browser, proxy1, proxy2,
- * local-squid, ...)
+ * a block is to the server, and if a block matches exactly, or is
in a range.
+ * The order is furthest from the server to nearest e.g., (Browser,
proxy1, proxy2,
+ * local-squid, ...)
* @throws MWException
* @return Block|null The "best" block from the list
*/
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c64f550..0669dea 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1442,14 +1442,19 @@
* Default parameters for the "<gallery>" tag
*/
$wgGalleryOptions = [
- 'imagesPerRow' => 0, // Default number of images per-row in the
gallery. 0 -> Adapt to screensize
- 'imageWidth' => 120, // Width of the cells containing images in
galleries (in "px")
- 'imageHeight' => 120, // Height of the cells containing images in
galleries (in "px")
- 'captionLength' => true, // Deprecated @since 1.28
- // Length to truncate filename to in caption
when using "showfilename".
- // A value of 'true' will truncate the
filename to one line using CSS
- // and will be the behaviour after deprecation.
- 'showBytes' => true, // Show the filesize in bytes in categories
+// Default number of images per-row in the gallery. 0 -> Adapt to screensize
+ 'imagesPerRow' => 0,
+ // Width of the cells containing images in galleries (in "px")
+ 'imageWidth' => 120,
+ // Height of the cells containing images in galleries (in "px")
+ 'imageHeight' => 120,
+ // Length to truncate filename to in caption when using "showfilename".
+ // A value of 'true' will truncate the filename to one line using CSS
+ // and will be the behaviour after deprecation.
+ // @deprecated since 1.28
+ 'captionLength' => true,
+ // Show the filesize in bytes in categories
+ 'showBytes' => true,
'mode' => 'traditional',
];
@@ -4565,8 +4570,8 @@
],
// Linking during login is experimental, enable at your own
risk - T134952
//
MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class => [
- // 'class' =>
MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class,
- // 'sort' => 100,
+ // 'class' =>
MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class,
+ // 'sort' => 100,
// ],
MediaWiki\Auth\EmailNotificationSecondaryAuthenticationProvider::class => [
'class' =>
MediaWiki\Auth\EmailNotificationSecondaryAuthenticationProvider::class,
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 814da6a..97a5592 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2618,7 +2618,7 @@
return;
}
- $this->showHeader();
+ $this->showHeader();
$wgOut->addHTML( $this->editFormPageTop );
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index af5d5fa..3747c23 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -222,18 +222,18 @@
/**
* Merge arrays in the style of getUserPermissionsErrors, with duplicate
removal
* e.g.
- * wfMergeErrorArrays(
- * [ [ 'x' ] ],
- * [ [ 'x', '2' ] ],
- * [ [ 'x' ] ],
- * [ [ 'y' ] ]
- * );
+ * wfMergeErrorArrays(
+ * [ [ 'x' ] ],
+ * [ [ 'x', '2' ] ],
+ * [ [ 'x' ] ],
+ * [ [ 'y' ] ]
+ * );
* returns:
- * [
- * [ 'x', '2' ],
- * [ 'x' ],
- * [ 'y' ]
- * ]
+ * [
+ * [ 'x', '2' ],
+ * [ 'x' ],
+ * [ 'y' ]
+ * ]
*
* @param array $array1,...
* @return array
@@ -2573,8 +2573,8 @@
* @param string $script MediaWiki cli script path
* @param array $parameters Arguments and options to the script
* @param array $options Associative array of options:
- * 'php': The path to the php executable
- * 'wrapper': Path to a PHP wrapper to handle the maintenance
script
+ * 'php': The path to the php executable
+ * 'wrapper': Path to a PHP wrapper to handle the maintenance script
* @return string
*/
function wfShellWikiCmd( $script, array $parameters = [], array $options = []
) {
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 09317d7..e234a4c 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -46,8 +46,8 @@
* $magicWords = [];
*
* $magicWords['en'] = [
- * 'magicwordkey' => [ 0, 'case_insensitive_magic_word' ],
- * 'magicwordkey2' => [ 1, 'CASE_sensitive_magic_word2' ],
+ * 'magicwordkey' => [ 0, 'case_insensitive_magic_word' ],
+ * 'magicwordkey2' => [ 1, 'CASE_sensitive_magic_word2' ],
* ];
* @endcode
*
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index e6e96c7..c56931e 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -75,16 +75,17 @@
* @return $this
*/
function checkRequiredPHPVersion() {
- if ( !function_exists( 'version_compare' )
- || version_compare( $this->getPHPImplVersion(),
$this->minimumVersionPHP ) < 0
+ if (
+ !function_exists( 'version_compare' )
+ || version_compare( $this->getPHPImplVersion(),
$this->minimumVersionPHP ) < 0
) {
$shortText = "MediaWiki $this->mwVersion requires at
least PHP version"
- . " $this->minimumVersionPHP, you are
using PHP {$this->getPHPImplVersion()}.";
+ . " $this->minimumVersionPHP, you are using PHP
{$this->getPHPImplVersion()}.";
$longText = "Error: You might be using on older PHP
version. \n"
- . "MediaWiki $this->mwVersion needs PHP
$this->minimumVersionPHP or higher.\n\n"
- . "Check if you have a newer php executable
with a different name, "
- . "such as php5.\n\n";
+ . "MediaWiki $this->mwVersion needs PHP
$this->minimumVersionPHP or higher.\n\n"
+ . "Check if you have a newer php executable
with a different name, "
+ . "such as php5.\n\n";
$longHtml = <<<HTML
Please consider <a
href="http://www.php.net/downloads.php";>upgrading your copy of PHP</a>.
@@ -112,10 +113,10 @@
$shortText = "Installing some external dependencies
(e.g. via composer) is required.";
$longText = "Error: You are missing some external
dependencies. \n"
- . "MediaWiki now also has some external
dependencies that need to be installed\n"
- . "via composer or from a separate git
repo. Please see\n"
- .
"https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n";
- . "for help on installing the required
components.";
+ . "MediaWiki now also has some external
dependencies that need to be installed\n"
+ . "via composer or from a separate git repo.
Please see\n"
+ .
"https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n";
+ . "for help on installing the required
components.";
$longHtml = <<<HTML
MediaWiki now also has some external dependencies that need to
be installed via
@@ -150,12 +151,12 @@
foreach ( $missingExtensions as $ext ) {
$missingExtText .= " * $ext <$baseUrl/$ext>\n";
$missingExtHtml .= "<li><b>$ext</b> "
- . "(<a
href=\"$baseUrl/$ext\">more information</a>)</li>";
+ . "(<a href=\"$baseUrl/$ext\">more
information</a>)</li>";
}
$cliText = "Error: Missing one or more required
components of PHP.\n"
- . "You are missing a required extension to
PHP that MediaWiki needs.\n"
- . "Please install:\n" . $missingExtText;
+ . "You are missing a required extension to PHP
that MediaWiki needs.\n"
+ . "Please install:\n" . $missingExtText;
$longHtml = <<<HTML
You are missing a required extension to PHP that MediaWiki
@@ -198,7 +199,7 @@
}
$encLogo =
htmlspecialchars( str_replace( '//', '/', $dirname .
'/' ) .
- 'resources/assets/mediawiki.png' );
+ 'resources/assets/mediawiki.png' );
$shortHtml = htmlspecialchars( $shortText );
header( 'Content-type: text/html; charset=UTF-8' );
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 42b166d..2845d17 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -344,12 +344,12 @@
$space = '[\x09\x0a\x0c\x0d\x20]';
self::$attribsRegex =
"/(?:^|$space)({$attribFirst}{$attrib}*)
- ($space*=$space*
+ ($space*=$space*
(?:
- # The attribute value: quoted or alone
- \"([^\"]*)(?:\"|\$)
- | '([^']*)(?:'|\$)
- | (((?!$space|>).)*)
+ # The attribute value: quoted
or alone
+ \"([^\"]*)(?:\"|\$)
+ | '([^']*)(?:'|\$)
+ | (((?!$space|>).)*)
)
)?(?=$space|\$)/sx";
}
diff --git a/includes/Title.php b/includes/Title.php
index 3ce775b..8f45d5f 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3865,7 +3865,7 @@
* categories' names.
*
* @return array Array of parents in the form:
- * $parent => $currentarticle
+ * $parent => $currentarticle
*/
public function getParentCategories() {
global $wgContLang;
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index e017eda..d64aeb7 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -202,7 +202,7 @@
case 'Aborted':
$result['reason'] = 'Authentication requires
user interaction, ' .
- 'which is not supported by action=login.';
+ 'which is not supported by
action=login.';
if ( $this->getConfig()->get(
'EnableBotPasswords' ) ) {
$result['reason'] .= ' To be able to
login with action=login, see [[Special:BotPasswords]].';
$result['reason'] .= ' To continue
using main-account login, see action=clientlogin.';
diff --git a/includes/api/ApiQueryRecentChanges.php
b/includes/api/ApiQueryRecentChanges.php
index 2c76e97..23780c3 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -147,7 +147,7 @@
/* Build our basic query. Namely, something along the lines of:
* SELECT * FROM recentchanges WHERE rc_timestamp > $start
- * AND rc_timestamp < $end AND rc_namespace =
$namespace
+ * AND rc_timestamp < $end AND rc_namespace = $namespace
*/
$this->addTables( 'recentchanges' );
$this->addTimestampWhereRange( 'rc_timestamp', $params['dir'],
$params['start'], $params['end'] );
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 58665bb..a59c14e 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1157,8 +1157,11 @@
* @return array Map of name=>value for fields
* @since 1.28
*/
- public function getDataForSearchIndex( WikiPage $page, ParserOutput
$output,
- SearchEngine $engine ) {
+ public function getDataForSearchIndex(
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fieldData = [];
$content = $page->getContent();
diff --git a/includes/content/FileContentHandler.php
b/includes/content/FileContentHandler.php
index 26f1190..4789690 100644
--- a/includes/content/FileContentHandler.php
+++ b/includes/content/FileContentHandler.php
@@ -30,8 +30,11 @@
return $fields;
}
- public function getDataForSearchIndex( WikiPage $page, ParserOutput
$parserOutput,
- SearchEngine $engine ) {
+ public function getDataForSearchIndex(
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fields = [];
$title = $page->getTitle();
diff --git a/includes/content/TextContentHandler.php
b/includes/content/TextContentHandler.php
index 09cdcee..1f0aacf 100644
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -150,8 +150,11 @@
return $fields;
}
- public function getDataForSearchIndex( WikiPage $page, ParserOutput
$output,
- SearchEngine $engine ) {
+ public function getDataForSearchIndex(
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fields = parent::getDataForSearchIndex( $page, $output,
$engine );
$fields['language'] =
$this->getPageLanguage( $page->getTitle(),
$page->getContent() )->getCode();
diff --git a/includes/content/WikiTextStructure.php
b/includes/content/WikiTextStructure.php
index f4a6dc6..9f79aa8 100644
--- a/includes/content/WikiTextStructure.php
+++ b/includes/content/WikiTextStructure.php
@@ -27,26 +27,32 @@
* @var string[] selectors to elements that are excluded entirely from
search
*/
private $excludedElementSelectors = [
- 'audio', 'video', // "it looks like you don't have
javascript enabled..."
- // do not need to index
- 'sup.reference', // The [1] for references
- '.mw-cite-backlink', // The ↑ next to references in the
references section
- 'h1', 'h2', 'h3', // Headings are already indexed in
their own field.
- 'h5', 'h6', 'h4',
- '.autocollapse', // Collapsed fields are hidden by
default so we don't want them
- // showing up.
+ // "it looks like you don't have javascript enabled..." – do
not need to index
+ 'audio', 'video',
+ // The [1] for references
+ 'sup.reference',
+ // The ↑ next to references in the references section
+ '.mw-cite-backlink',
+ // Headings are already indexed in their own field.
+ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+ // Collapsed fields are hidden by default so we don't want them
showing up.
+ '.autocollapse',
];
/**
* @var string[] selectors to elements that are considered auxiliary to
article text for search
*/
private $auxiliaryElementSelectors = [
- '.thumbcaption', // Thumbnail captions aren't really
part of the text proper
- 'table', // Neither are tables
- '.rellink', // Common style for "See also:".
- '.dablink', // Common style for calling out helpful
links at the top
- // of the
article.
- '.searchaux', // New class users can use to mark
stuff as auxiliary to searches.
+ // Thumbnail captions aren't really part of the text proper
+ '.thumbcaption',
+ // Neither are tables
+ 'table',
+ // Common style for "See also:".
+ '.rellink',
+ // Common style for calling out helpful links at the top of the
article.
+ '.dablink',
+ // New class users can use to mark stuff as auxiliary to
searches.
+ '.searchaux',
];
/**
diff --git a/includes/content/WikitextContentHandler.php
b/includes/content/WikitextContentHandler.php
index 74b2f1a..e94a63e 100644
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -128,16 +128,20 @@
$fields['opening_text'] =
$engine->makeSearchFieldMapping( 'opening_text',
SearchIndexField::INDEX_TYPE_TEXT );
- $fields['opening_text']->setFlag(
SearchIndexField::FLAG_SCORING |
-
SearchIndexField::FLAG_NO_HIGHLIGHT );
+ $fields['opening_text']->setFlag(
+ SearchIndexField::FLAG_SCORING |
SearchIndexField::FLAG_NO_HIGHLIGHT
+ );
// Until we have full first-class content handler for files, we
invoke it explicitly here
$fields = array_merge( $fields,
$this->getFileHandler()->getFieldsForSearchIndex( $engine ) );
return $fields;
}
- public function getDataForSearchIndex( WikiPage $page, ParserOutput
$parserOutput,
- SearchEngine $engine ) {
+ public function getDataForSearchIndex(
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fields = parent::getDataForSearchIndex( $page, $parserOutput,
$engine );
$structure = new WikiTextStructure( $parserOutput );
diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php
index 87656f2..e67a0b3 100644
--- a/includes/debug/MWDebug.php
+++ b/includes/debug/MWDebug.php
@@ -370,7 +370,7 @@
| [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8
Sequence Start
| (?<=[\x0-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid
UTF-8 Sequence Middle
|
(?<![\xC2-\xDF]|[\xE0-\xEF]|[\xE0-\xEF][\x80-\xBF]|[\xF0-\xF4]
-
|[\xF0-\xF4][\x80-\xBF]|[\xF0-\xF4][\x80-\xBF]{2})[\x80-\xBF] # Overlong
Sequence
+ |
[\xF0-\xF4][\x80-\xBF]|[\xF0-\xF4][\x80-\xBF]{2})[\x80-\xBF] # Overlong Sequence
| (?<=[\xE0-\xEF])[\x80-\xBF](?![\x80-\xBF]) #
Short 3 byte sequence
| (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2})
# Short 4 byte sequence
|
(?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence
(2)
diff --git a/includes/debug/logger/monolog/KafkaHandler.php
b/includes/debug/logger/monolog/KafkaHandler.php
index 432a9e1..6670fe9 100644
--- a/includes/debug/logger/monolog/KafkaHandler.php
+++ b/includes/debug/logger/monolog/KafkaHandler.php
@@ -33,12 +33,12 @@
*
* Constructor options array arguments:
* * alias: map from monolog channel to kafka topic name. When no
- * alias exists the topic "monolog_$channel" will be used.
+ * alias exists the topic "monolog_$channel" will be used.
* * swallowExceptions: Swallow exceptions that occur while talking to
- * kafka. Defaults to false.
+ * kafka. Defaults to false.
* * logExceptions: Log exceptions talking to kafka here. Either null,
- * the name of a channel to log to, or an object implementing
- * FormatterInterface. Defaults to null.
+ * the name of a channel to log to, or an object implementing
+ * FormatterInterface. Defaults to null.
*
* Requires the nmred/kafka-php library, version >= 1.3.0
*
diff --git a/includes/diff/WordAccumulator.php
b/includes/diff/WordAccumulator.php
index a26775f..ad80275 100644
--- a/includes/diff/WordAccumulator.php
+++ b/includes/diff/WordAccumulator.php
@@ -46,11 +46,9 @@
private function flushGroup( $new_tag ) {
if ( $this->group !== '' ) {
if ( $this->tag == 'ins' ) {
- $this->line .= "<ins{$this->insClass}>" .
- htmlspecialchars(
$this->group ) . '</ins>';
+ $this->line .= "<ins{$this->insClass}>" .
htmlspecialchars( $this->group ) . '</ins>';
} elseif ( $this->tag == 'del' ) {
- $this->line .= "<del{$this->delClass}>" .
- htmlspecialchars(
$this->group ) . '</del>';
+ $this->line .= "<del{$this->delClass}>" .
htmlspecialchars( $this->group ) . '</del>';
} else {
$this->line .= htmlspecialchars( $this->group );
}
diff --git a/includes/exception/UserNotLoggedIn.php
b/includes/exception/UserNotLoggedIn.php
index 43c5b09..998a930 100644
--- a/includes/exception/UserNotLoggedIn.php
+++ b/includes/exception/UserNotLoggedIn.php
@@ -32,7 +32,7 @@
* @par Example:
* @code
* if( $user->isAnon() ) {
- * throw new UserNotLoggedIn();
+ * throw new UserNotLoggedIn();
* }
* @endcode
*
@@ -42,7 +42,7 @@
* @par Example:
* @code
* if( $user->isAnon() ) {
- * throw new UserNotLoggedIn( 'action-require-loggedin' );
+ * throw new UserNotLoggedIn( 'action-require-loggedin' );
* }
* @endcode
*
diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php
index c1f2d59..3949764 100644
--- a/includes/export/WikiExporter.php
+++ b/includes/export/WikiExporter.php
@@ -343,7 +343,7 @@
# query optimization for history stub dumps
if ( $this->text == WikiExporter::STUB &&
$orderRevs ) {
$tables = [ 'revision', 'page' ];
- $opts[] = 'STRAIGHT_JOIN';
+ $opts[] = 'STRAIGHT_JOIN';
$opts['ORDER BY'] = [ 'rev_page ASC',
'rev_id ASC' ];
$opts['USE INDEX']['revision'] =
'rev_page_id';
$join['page'] = [ 'INNER JOIN',
'rev_page=page_id' ];
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 179f6af..399147b 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -1259,7 +1259,7 @@
*
* @param string|array|Status $elements The set of errors/warnings to
process.
* @param string $elementsType Should warnings or errors be returned.
This is meant
- * for Status objects, all other valid types are always considered
as errors.
+ * for Status objects, all other valid types are always considered
as errors.
* @return string
*/
public function getErrorsOrWarnings( $elements, $elementsType ) {
diff --git a/includes/http/Http.php b/includes/http/Http.php
index 779d606..fa2d5a3 100644
--- a/includes/http/Http.php
+++ b/includes/http/Http.php
@@ -46,8 +46,8 @@
* - caInfo Provide CA information
* - maxRedirects Maximum number of redirects to follow
(defaults to 5)
* - followRedirects Whether to follow redirects (defaults to
false).
- * Note: this should only be used when
the target URL is trusted,
- * to avoid attacks on intranet
services accessible by HTTP.
+ * Note: this should only be used when the
target URL is trusted,
+ * to avoid attacks on intranet services
accessible by HTTP.
* - userAgent A user agent, if you want to override the
default
* MediaWiki/$wgVersion
* - logger A \Psr\Logger\LoggerInterface instance for
debug logging
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index e041fdd..fc5611b 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -496,8 +496,8 @@
$q = <<<END
SELECT attname, attnum FROM pg_namespace, pg_class, pg_attribute
WHERE pg_class.relnamespace = pg_namespace.oid
- AND attrelid=pg_class.oid AND attnum > 0
- AND relname=%s AND nspname=%s
+ AND attrelid=pg_class.oid AND attnum > 0
+ AND relname=%s AND nspname=%s
END;
$res = $this->db->query( sprintf( $q,
$this->db->addQuotes( $table ),
@@ -523,9 +523,9 @@
$q = <<<END
SELECT indkey, indrelid FROM pg_namespace, pg_class, pg_index
WHERE nspname=%s
- AND pg_class.relnamespace = pg_namespace.oid
- AND relname=%s
- AND indexrelid=pg_class.oid
+ AND pg_class.relnamespace = pg_namespace.oid
+ AND relname=%s
+ AND indexrelid=pg_class.oid
END;
$res = $this->db->query(
sprintf(
@@ -551,8 +551,8 @@
$query = <<<END
SELECT attname FROM pg_class, pg_attribute
WHERE attrelid=$relid
- AND attnum=%d
- AND attrelid=pg_class.oid
+ AND attnum=%d
+ AND attrelid=pg_class.oid
END;
$r2 = $this->db->query( sprintf( $query, $rid ) );
if ( !$r2 ) {
@@ -572,8 +572,8 @@
$q = <<<END
SELECT confdeltype FROM pg_constraint, pg_namespace
WHERE connamespace=pg_namespace.oid
- AND nspname=%s
- AND conname=%s;
+ AND nspname=%s
+ AND conname=%s;
END;
$r = $this->db->query(
sprintf(
@@ -594,8 +594,8 @@
$q = <<<END
SELECT definition FROM pg_rules
WHERE schemaname = %s
- AND tablename = %s
- AND rulename = %s
+ AND tablename = %s
+ AND rulename = %s
END;
$r = $this->db->query(
sprintf(
diff --git a/includes/installer/SqliteInstaller.php
b/includes/installer/SqliteInstaller.php
index c5c4a7c..0fe7068 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -244,9 +244,9 @@
$sql =
<<<EOT
CREATE TABLE IF NOT EXISTS objectcache (
- keyname BLOB NOT NULL default '' PRIMARY KEY,
- value BLOB,
- exptime TEXT
+ keyname BLOB NOT NULL default '' PRIMARY KEY,
+ value BLOB,
+ exptime TEXT
)
EOT;
$conn->query( $sql );
diff --git a/includes/installer/WebInstallerOutput.php
b/includes/installer/WebInstallerOutput.php
index 62fe785..e4eb255 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -299,9 +299,9 @@
<div id="mw-panel">
<div class="portal" id="p-logo">
- <a style="background-image: url(images/installer-logo.png);"
- href="https://www.mediawiki.org/";
- title="Main Page"></a>
+ <a style="background-image: url(images/installer-logo.png);"
+ href="https://www.mediawiki.org/";
+ title="Main Page"></a>
</div>
<?php
$message = wfMessage( 'config-sidebar' )->plain();
diff --git a/includes/jobqueue/JobQueueRedis.php
b/includes/jobqueue/JobQueueRedis.php
index 25a271c..c2c9d66 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -793,9 +793,9 @@
private function getGlobalKey( $name ) {
$parts = [ 'global', 'jobqueue', $name ];
foreach ( $parts as $part ) {
- if ( !preg_match( '/[a-zA-Z0-9_-]+/', $part ) ) {
- throw new InvalidArgumentException( "Key part
characters are out of range." );
- }
+ if ( !preg_match( '/[a-zA-Z0-9_-]+/', $part ) ) {
+ throw new InvalidArgumentException( "Key part
characters are out of range." );
+ }
}
return implode( ':', $parts );
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php
b/includes/jobqueue/jobs/RefreshLinksJob.php
index 651a332..f9284a5 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -29,7 +29,7 @@
* - a) Recursive jobs to update links for backlink pages for a given title.
* These jobs have (recursive:true,table:<table>) set.
* - b) Jobs to update links for a set of pages (the job title is ignored).
- * These jobs have (pages:(<page ID>:(<namespace>,<title>),...) set.
+ * These jobs have (pages:(<page ID>:(<namespace>,<title>),...) set.
* - c) Jobs to update links for a single page (the job title)
* These jobs need no extra fields set.
*
diff --git a/includes/jobqueue/utils/BacklinkJobUtils.php
b/includes/jobqueue/utils/BacklinkJobUtils.php
index 7f50055..1c12a1c 100644
--- a/includes/jobqueue/utils/BacklinkJobUtils.php
+++ b/includes/jobqueue/utils/BacklinkJobUtils.php
@@ -33,7 +33,7 @@
* For example, if templates A and B are edited (at the same time) the queue
will have:
* (A base, B base)
* When these jobs run, the queue will have per-title and remnant partition
jobs:
- * (titleX,titleY,titleZ,...,A remnant,titleM,titleN,titleO,...,B
remnant)
+ * (titleX,titleY,titleZ,...,A remnant,titleM,titleN,titleO,...,B remnant)
*
* This works best when the queue is FIFO, for several reasons:
* - a) Since the remnant jobs are enqueued after the leaf jobs, the slower
leaf jobs have to
@@ -133,7 +133,7 @@
'table' => $params['table'],
'range' => [
'start' => $ranges[1][0],
- 'end' => $ranges[count(
$ranges ) - 1][1],
+ 'end' => $ranges[count(
$ranges ) - 1][1],
'batchSize' => $realBSize,
'subranges' => array_slice(
$ranges, 1 )
],
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index bc99672..9d84610 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -8,7 +8,7 @@
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
diff --git a/includes/libs/CryptHKDF.php b/includes/libs/CryptHKDF.php
index 4c86757..6b3e4a7 100644
--- a/includes/libs/CryptHKDF.php
+++ b/includes/libs/CryptHKDF.php
@@ -197,11 +197,11 @@
* From http://eprint.iacr.org/2010/264.pdf:
*
* The scheme HKDF is specifed as:
- * HKDF(XTS, SKM, CTXinfo, L) = K(1) || K(2) || ... || K(t)
+ * HKDF(XTS, SKM, CTXinfo, L) = K(1) || K(2) || ... || K(t)
* where the values K(i) are defined as follows:
- * PRK = HMAC(XTS, SKM)
- * K(1) = HMAC(PRK, CTXinfo || 0);
- * K(i+1) = HMAC(PRK, K(i) || CTXinfo || i), 1 <= i < t;
+ * PRK = HMAC(XTS, SKM)
+ * K(1) = HMAC(PRK, CTXinfo || 0);
+ * K(i+1) = HMAC(PRK, K(i) || CTXinfo || i), 1 <= i < t;
* where t = [L/k] and the value K(t) is truncated to its first d = L
mod k bits;
* the counter i is non-wrapping and of a given fixed size, e.g., a
single byte.
* Note that the length of the HMAC output is the same as its key
length and therefore
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index db085da..ba55baf 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -85,7 +85,7 @@
* defined as:
* [
* 0 => object(StatusValue) # the StatusValue with error messages,
only
- * 1 => object(StatusValue) # The StatusValue with warning
messages, only
+ * 1 => object(StatusValue) # The StatusValue with warning
messages, only
* ]
*
* @return StatusValue[]
diff --git a/includes/libs/mime/mime.info b/includes/libs/mime/mime.info
index 5edd889..2468f38 100644
--- a/includes/libs/mime/mime.info
+++ b/includes/libs/mime/mime.info
@@ -95,9 +95,9 @@
application/x-director [OFFICE]
text/rtf [OFFICE]
-application/vnd.openxmlformats-officedocument.wordprocessingml.document
[OFFICE]
+application/vnd.openxmlformats-officedocument.wordprocessingml.document
[OFFICE]
application/vnd.openxmlformats-officedocument.wordprocessingml.template
[OFFICE]
-application/vnd.ms-word.document.macroEnabled.12
[OFFICE]
+application/vnd.ms-word.document.macroEnabled.12
[OFFICE]
application/vnd.ms-word.template.macroEnabled.12
[OFFICE]
application/vnd.openxmlformats-officedocument.presentationml.template
[OFFICE]
application/vnd.openxmlformats-officedocument.presentationml.slideshow
[OFFICE]
diff --git a/includes/libs/objectcache/RESTBagOStuff.php
b/includes/libs/objectcache/RESTBagOStuff.php
index ae91be5..730eed1 100644
--- a/includes/libs/objectcache/RESTBagOStuff.php
+++ b/includes/libs/objectcache/RESTBagOStuff.php
@@ -63,9 +63,9 @@
protected function doGet( $key, $flags = 0 ) {
$req = [
'method' => 'GET',
- 'url' => $this->url . rawurlencode( $key ),
-
+ 'url' => $this->url . rawurlencode( $key ),
];
+
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) =
$this->client->run( $req );
if ( $rcode === 200 ) {
if ( is_string( $rbody ) ) {
diff --git a/includes/libs/objectcache/WinCacheBagOStuff.php
b/includes/libs/objectcache/WinCacheBagOStuff.php
index d84c959..98f44d1 100644
--- a/includes/libs/objectcache/WinCacheBagOStuff.php
+++ b/includes/libs/objectcache/WinCacheBagOStuff.php
@@ -41,7 +41,7 @@
$result = wincache_ucache_set( $key, serialize( $value ),
$expire );
/* wincache_ucache_set returns an empty array on success if
$value
- was an array, bool otherwise */
+ * was an array, bool otherwise */
return ( is_array( $result ) && $result === [] ) || $result;
}
diff --git a/includes/libs/xmp/XMP.php b/includes/libs/xmp/XMP.php
index 0d171f5..17d1a29 100644
--- a/includes/libs/xmp/XMP.php
+++ b/includes/libs/xmp/XMP.php
@@ -647,7 +647,7 @@
private function endElementNested( $elm ) {
/* cur item must be the same as $elm, unless if in MODE_STRUCT
- in which case it could also be rdf:Description */
+ * in which case it could also be rdf:Description */
if ( $this->curItem[0] !== $elm
&& !( $elm === self::NS_RDF . ' Description'
&& $this->mode[0] === self::MODE_STRUCT )
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 21effa0..3858f275 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -103,9 +103,9 @@
* @param string $subject Email's subject.
* @param string $body Email's text or Array of two strings to be the
text and html bodies
* @param array $options:
- * 'replyTo' MailAddress
- * 'contentType' string default 'text/plain; charset=UTF-8'
- * 'headers' array Extra headers to set
+ * 'replyTo' MailAddress
+ * 'contentType' string default 'text/plain; charset=UTF-8'
+ * 'headers' array Extra headers to set
*
* @throws MWException
* @throws Exception
@@ -197,9 +197,9 @@
* @param string $subject Email's subject.
* @param string $body Email's text or Array of two strings to be the
text and html bodies
* @param array $options:
- * 'replyTo' MailAddress
- * 'contentType' string default 'text/plain; charset=UTF-8'
- * 'headers' array Extra headers to set
+ * 'replyTo' MailAddress
+ * 'contentType' string default 'text/plain; charset=UTF-8'
+ * 'headers' array Extra headers to set
*
* @throws MWException
* @throws Exception
diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index 5e8f8c8..57b5b36 100644
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -277,9 +277,9 @@
$reg = <<<EOR
/\(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*"
((?> # Text to match is composed of
atoms of either:
- \\\\. # - any escaped character
- | # - any character different
from " and \
- [^"\\\\]+
+ \\\\. # - any escaped character
+ | # - any character
different from " and \
+ [^"\\\\]+
)*?)
"\s*\)
| # Or page can be empty ; in this
case, djvutxt dumps ()
diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 6c857a8..c9f0dfa 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -112,8 +112,8 @@
wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
/* This used to use 0
(ExifBitmapHandler::OLD_BROKEN_FILE) for the cases
- * * No metadata in the file
- * * Something is broken in the file.
+ * * No metadata in the file
+ * * Something is broken in the file.
* However, if the metadata support gets expanded then
you can't tell if the 0 is from
* a broken file, or just no props found. A broken file
is likely to stay broken, but
* a file which had no props could have props once the
metadata support is improved.
diff --git a/includes/parser/DateFormatter.php
b/includes/parser/DateFormatter.php
index 76ee525..605a873 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -107,7 +107,7 @@
$this->targets[self::ISO2] = '[[y-m-d]]';
# Rules
- # pref source target
+ # pref source target
$this->rules[self::DMY][self::MD] = self::DM;
$this->rules[self::ALL][self::MD] = self::MD;
$this->rules[self::MDY][self::DM] = self::MD;
@@ -127,7 +127,7 @@
* Get a DateFormatter object
*
* @param Language|string|null $lang In which language to format the
date
- * Defaults to the site content language
+ * Defaults to the site content language
* @return DateFormatter
*/
public static function getInstance( $lang = null ) {
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 86aa06a..9a9b9d8 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1450,15 +1450,16 @@
$spdash = "(?:-|$space)"; # a dash or a non-newline space
$spaces = "$space++"; # possessive match of 1 or more spaces
$text = preg_replace_callback(
- '!(?: # Start cases
- (<a[ \t\r\n>].*?</a>) | # m[1]: Skip link
text
- (<.*?>) | # m[2]: Skip stuff
inside
- # HTML
elements' . "
- (\b(?i:$prots)($addr$urlChar*)) | # m[3]: Free
external links
- # m[4]:
Post-protocol path
- \b(?:RFC|PMID) $spaces # m[5]: RFC or
PMID, capture number
+ '!(?: # Start cases
+ (<a[ \t\r\n>].*?</a>) | # m[1]: Skip link
text
+ (<.*?>) | # m[2]: Skip stuff
inside HTML elements' . "
+ (\b # m[3]: Free
external links
+ (?i:$prots)
+ ($addr$urlChar*) # m[4]:
Post-protocol path
+ ) |
+ \b(?:RFC|PMID) $spaces # m[5]: RFC or PMID,
capture number
([0-9]+)\b |
- \bISBN $spaces ( # m[6]: ISBN,
capture number
+ \bISBN $spaces ( # m[6]: ISBN,
capture number
(?: 97[89] $spdash? )? # optional
13-digit ISBN prefix
(?: [0-9] $spdash? ){9} # 9 digits
with opt. delimiters
[0-9Xx] # check digit
diff --git a/includes/registration/Processor.php
b/includes/registration/Processor.php
index a4100bb..210deb1 100644
--- a/includes/registration/Processor.php
+++ b/includes/registration/Processor.php
@@ -23,11 +23,11 @@
/**
* @return array With following keys:
- * 'globals' - variables to be set to $GLOBALS
- * 'defines' - constants to define
- * 'callbacks' - functions to be executed by the registry
- * 'credits' - metadata to be stored by registry
- * 'attributes' - registration info which isn't a global
variable
+ * 'globals' - variables to be set to $GLOBALS
+ * 'defines' - constants to define
+ * 'callbacks' - functions to be executed by the registry
+ * 'credits' - metadata to be stored by registry
+ * 'attributes' - registration info which isn't a global variable
*/
public function getExtractedInfo();
diff --git a/includes/registration/VersionChecker.php
b/includes/registration/VersionChecker.php
index 5aaaa1b..a31551c 100644
--- a/includes/registration/VersionChecker.php
+++ b/includes/registration/VersionChecker.php
@@ -87,17 +87,17 @@
* installed extensions in the $credits array.
*
* Example $extDependencies:
- * {
- * 'FooBar' => {
- * 'MediaWiki' => '>= 1.25.0',
- * 'extensions' => {
- * 'FooBaz' => '>= 1.25.0'
- * },
- * 'skins' => {
- * 'BazBar' => '>= 1.0.0'
- * }
- * }
- * }
+ * {
+ * 'FooBar' => {
+ * 'MediaWiki' => '>= 1.25.0',
+ * 'extensions' => {
+ * 'FooBaz' => '>= 1.25.0'
+ * },
+ * 'skins' => {
+ * 'BazBar' => '>= 1.0.0'
+ * }
+ * }
+ * }
*
* @param array $extDependencies All extensions that depend on other
ones
* @return array
diff --git a/includes/search/SearchIndexFieldDefinition.php
b/includes/search/SearchIndexFieldDefinition.php
index 8a06b65..910fd77 100644
--- a/includes/search/SearchIndexFieldDefinition.php
+++ b/includes/search/SearchIndexFieldDefinition.php
@@ -93,7 +93,7 @@
public function merge( SearchIndexField $that ) {
// TODO: which definitions may be compatible?
if ( ( $that instanceof self ) && $this->type === $that->type &&
- $this->flags === $that->flags && $this->type !==
self::INDEX_TYPE_NESTED
+ $this->flags === $that->flags && $this->type !==
self::INDEX_TYPE_NESTED
) {
return $that;
}
diff --git a/includes/session/SessionManagerInterface.php
b/includes/session/SessionManagerInterface.php
index 3ab0f43..c6990fe 100644
--- a/includes/session/SessionManagerInterface.php
+++ b/includes/session/SessionManagerInterface.php
@@ -91,9 +91,9 @@
*
* The return value is such that someone could theoretically do this:
* @code
- * foreach ( $provider->getVaryHeaders() as $header => $options ) {
- * $outputPage->addVaryHeader( $header, $options );
- * }
+ * foreach ( $provider->getVaryHeaders() as $header => $options ) {
+ * $outputPage->addVaryHeader( $header, $options );
+ * }
* @endcode
*
* @return array
diff --git a/includes/session/SessionProvider.php
b/includes/session/SessionProvider.php
index 61c7500..e8d81cb 100644
--- a/includes/session/SessionProvider.php
+++ b/includes/session/SessionProvider.php
@@ -397,9 +397,9 @@
*
* The return value is such that someone could theoretically do this:
* @code
- * foreach ( $provider->getVaryHeaders() as $header => $options ) {
- * $outputPage->addVaryHeader( $header, $options );
- * }
+ * foreach ( $provider->getVaryHeaders() as $header => $options ) {
+ * $outputPage->addVaryHeader( $header, $options );
+ * }
* @endcode
*
* @protected For use by \MediaWiki\Session\SessionManager only
diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index eef421c..61d34c6 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -324,12 +324,12 @@
*
* If a "data" key is present, it must be an array, where the keys
represent
* the data-xxx properties with their provided values. For example,
- * $item['data'] = [
- * 'foo' => 1,
- * 'bar' => 'baz',
- * ];
+ * $item['data'] = [
+ * 'foo' => 1,
+ * 'bar' => 'baz',
+ * ];
* will render as element properties:
- * data-foo='1' data-bar='baz'
+ * data-foo='1' data-bar='baz'
*
* @param array $options Can be used to affect the output of a link.
* Possible options are:
diff --git a/includes/specialpage/LoginSignupSpecialPage.php
b/includes/specialpage/LoginSignupSpecialPage.php
index c3ee321..fb8aa04 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -702,7 +702,7 @@
*/
protected function getFakeTemplate( $msg, $msgType ) {
global $wgAuth, $wgEnableEmail, $wgHiddenPrefs,
$wgEmailConfirmToEdit, $wgEnableUserEmail,
- $wgSecureLogin, $wgPasswordResetRoutes;
+ $wgSecureLogin, $wgPasswordResetRoutes;
// make a best effort to get the value of fields which used to
be fixed in the old login
// template but now might or might not exist depending on what
providers are used
@@ -772,7 +772,7 @@
$resetLink = $this->isSignup()
? null
: is_array( $wgPasswordResetRoutes )
- && in_array( true, array_values(
$wgPasswordResetRoutes ), true );
+ && in_array( true, array_values(
$wgPasswordResetRoutes ), true );
$template->set( 'header', '' );
$template->set( 'formheader', '' );
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 975e210..72b9567 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -817,9 +817,9 @@
function filterOnUserExperienceLevel( &$tables, &$conds, &$join_conds,
$opts ) {
global $wgLearnerEdits,
- $wgExperiencedUserEdits,
- $wgLearnerMemberSince,
- $wgExperiencedUserMemberSince;
+ $wgExperiencedUserEdits,
+ $wgLearnerMemberSince,
+ $wgExperiencedUserMemberSince;
$selectedExpLevels = explode( ',', strtolower(
$opts['userExpLevel'] ) );
// remove values that are not recognized
diff --git a/includes/specials/SpecialStatistics.php
b/includes/specials/SpecialStatistics.php
index a7a1c58..19850e6 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -95,9 +95,11 @@
if ( !$msg->isDisabled() ) {
$descriptionHtml = $this->msg( 'parentheses'
)->rawParams( $msg->parse() )
->escaped();
- $text .= "<br />" .
- Html::rawElement( 'small', [ 'class'
=> 'mw-statistic-desc' ],
-
" $descriptionHtml" );
+ $text .= "<br />" . Html::rawElement(
+ 'small',
+ [ 'class' => 'mw-statistic-desc' ],
+ " $descriptionHtml"
+ );
}
}
diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 8da1553..3467b49 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -1824,7 +1824,7 @@
* Regex borrowed from Tim Starling's "remex-html" project.
*/
const VALID_COMMENT_REGEX = "~ !--
- ( # 1. Comment match detector
+ ( # 1. Comment match detector
> | -> | # Invalid short close
( # 2. Comment contents
(?:
@@ -1839,15 +1839,15 @@
( # 3. Comment close
--> | # Normal close
--!> | # Comment end bang
- ( # 4. Indicate matches
requiring EOF
- --! | # EOF in comment end bang state
- -- | # EOF in comment end state
- - | # EOF in comment end dash state
- # EOF in comment state
+ ( # 4. Indicate matches
requiring EOF
+ --! | # EOF in
comment end bang state
+ -- | # EOF in
comment end state
+ - | # EOF in
comment end dash state
+ (?#nothing) # EOF in
comment state
)
)
)
- ([^<]*) \z # 5. Non-tag text after the
comment
+ ([^<]*) \z # 5. Non-tag text after the comment
~xs";
/**
diff --git a/includes/user/User.php b/includes/user/User.php
index d9c2a58..e510736 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -3777,9 +3777,9 @@
*/
public function getExperienceLevel() {
global $wgLearnerEdits,
- $wgExperiencedUserEdits,
- $wgLearnerMemberSince,
- $wgExperiencedUserMemberSince;
+ $wgExperiencedUserEdits,
+ $wgLearnerMemberSince,
+ $wgExperiencedUserMemberSince;
if ( $this->isAnon() ) {
return false;
diff --git a/includes/utils/BatchRowIterator.php
b/includes/utils/BatchRowIterator.php
index ef2c14a..43bccba 100644
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -230,7 +230,7 @@
* `=` conditions while the final key uses a `>` condition
*
* Example output:
- * [ '( foo = 42 AND bar > 7 ) OR ( foo > 42 )' ]
+ * [ '( foo = 42 AND bar > 7 ) OR ( foo > 42 )' ]
*
* @return array The SQL conditions necessary to select the next set
* of rows in the batched query
diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php
index 3bddd77..1c8d486 100644
--- a/includes/utils/MWCryptHKDF.php
+++ b/includes/utils/MWCryptHKDF.php
@@ -47,11 +47,11 @@
* From http://eprint.iacr.org/2010/264.pdf:
*
* The scheme HKDF is specifed as:
- * HKDF(XTS, SKM, CTXinfo, L) = K(1) || K(2) || ... || K(t)
+ * HKDF(XTS, SKM, CTXinfo, L) = K(1) || K(2) || ... || K(t)
* where the values K(i) are defined as follows:
- * PRK = HMAC(XTS, SKM)
- * K(1) = HMAC(PRK, CTXinfo || 0);
- * K(i+1) = HMAC(PRK, K(i) || CTXinfo || i), 1 <= i < t;
+ * PRK = HMAC(XTS, SKM)
+ * K(1) = HMAC(PRK, CTXinfo || 0);
+ * K(i+1) = HMAC(PRK, K(i) || CTXinfo || i), 1 <= i < t;
* where t = [L/k] and the value K(t) is truncated to its first d = L
mod k bits;
* the counter i is non-wrapping and of a given fixed size, e.g., a
single byte.
* Note that the length of the HMAC output is the same as its key
length and therefore
diff --git a/languages/Language.php b/languages/Language.php
index a1cc4bc..c1cb62c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2158,12 +2158,10 @@
* the date preference they're supposed to use, it should be used in
* all children.
*
- *<code>
- * function timeanddate([...], $format = true) {
- * $datePreference = $this->dateFormat($format);
- * [...]
- * }
- *</code>
+ * function timeanddate([...], $format = true) {
+ * $datePreference = $this->dateFormat($format);
+ * [...]
+ * }
*
* @param int|string|bool $usePrefs If true, the user's preference is
used
* if false, the site/language default is used
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 06fec44..cef9552 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -99,13 +99,13 @@
// '+' add rules for alltext
// 'E' the gave flags is error
// these flags above are reserved for program
- 'A' => 'A', // add rule for convert code (all
text convert)
- 'T' => 'T', // title convert
- 'R' => 'R', // raw content
- 'D' => 'D', // convert description (subclass
implement)
- '-' => '-', // remove convert (not implement)
- 'H' => 'H', // add rule for convert code (but no
display in placed code)
- 'N' => 'N' // current variant name
+ 'A' => 'A', // add rule for convert code (all text
convert)
+ 'T' => 'T', // title convert
+ 'R' => 'R', // raw content
+ 'D' => 'D', // convert description (subclass
implement)
+ '-' => '-', // remove convert (not implement)
+ 'H' => 'H', // add rule for convert code (but no
display in placed code)
+ 'N' => 'N', // current variant name
];
$this->mFlags = array_merge( $defaultflags, $flags );
foreach ( $this->mVariants as $v ) {
@@ -357,10 +357,10 @@
}
/* we convert everything except:
- 1. HTML markups (anything between < and >)
- 2. HTML entities
- 3. placeholders created by the parser
- */
+ * 1. HTML markups (anything between < and >)
+ * 2. HTML entities
+ * 3. placeholders created by the parser
+ */
$marker = '|' . Parser::MARKER_PREFIX . '[\-a-zA-Z0-9]+';
// this one is needed when the text is inside an HTML markup
@@ -1085,12 +1085,12 @@
// text should be splited by ";" only if a valid variant
// name exist after the markup, for example:
// -{zh-hans:<span
style="font-size:120%;">xxx</span>;zh-hant:\
- // <span style="font-size:120%;">yyy</span>;}-
+ // <span style="font-size:120%;">yyy</span>;}-
// we should split it as:
// [
- // [0] => 'zh-hans:<span
style="font-size:120%;">xxx</span>'
- // [1] => 'zh-hant:<span
style="font-size:120%;">yyy</span>'
- // [2] => ''
+ // [0] => 'zh-hans:<span
style="font-size:120%;">xxx</span>'
+ // [1] => 'zh-hant:<span
style="font-size:120%;">yyy</span>'
+ // [2] => ''
// ]
$pat = '/;\s*(?=';
foreach ( $this->mVariants as $variant ) {
diff --git a/languages/classes/LanguageKsh.php
b/languages/classes/LanguageKsh.php
index 76568c2..9ef53e5 100644
--- a/languages/classes/LanguageKsh.php
+++ b/languages/classes/LanguageKsh.php
@@ -63,13 +63,11 @@
*
* Possible values for the type of genitive are:
* Sing, Iehr prepositioned genitive = possessive dative
- * Vun, Fon, -omitted- postpositioned genitive
- * = preposition "vun" with dative
+ * Vun, Fon, -omitted- postpositioned genitive = preposition
"vun" with dative
*
* Values of case overrides & prepositions, in the order of preceedence:
* Sing, Iehr possessive dative = prepositioned genitive
- * Vun, Fon preposition "vun" with dative
- * = postpositioned genitive
+ * Vun, Fon preposition "vun" with dative =
postpositioned genitive
* En, em preposition "en" with dative
*
* Values for object gender specifiers of the possessive dative, or
diff --git a/languages/classes/LanguageLa.php b/languages/classes/LanguageLa.php
index d1963e1..f4082af 100644
--- a/languages/classes/LanguageLa.php
+++ b/languages/classes/LanguageLa.php
@@ -50,12 +50,12 @@
case 'genitive':
// only a few declensions, and even for those mostly
the singular only
$in = [
- '/u[ms]$/', # 2nd
declension singular
- '/ommunia$/', # 3rd
declension neuter plural (partly)
- '/a$/', # 1st
declension singular
+ '/u[ms]$/', # 2nd
declension singular
+ '/ommunia$/', # 3rd
declension neuter plural (partly)
+ '/a$/', # 1st
declension singular
'/libri$/', '/nuntii$/', '/datae$/', # 2nd
declension plural (partly)
- '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
- '/es$/' # 5th
declension singular
+ '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
+ '/es$/' # 5th
declension singular
];
$out = [
'i',
@@ -69,12 +69,12 @@
case 'accusative':
// only a few declensions, and even for those mostly
the singular only
$in = [
- '/u[ms]$/', # 2nd
declension singular
- '/a$/', # 1st
declension singular
- '/ommuniam$/', # 3rd declension
neuter plural (partly)
+ '/u[ms]$/', # 2nd
declension singular
+ '/a$/', # 1st
declension singular
+ '/ommuniam$/', # 3rd
declension neuter plural (partly)
'/libri$/', '/nuntii$/', '/datam$/', # 2nd
declension plural (partly)
- '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
- '/es$/' # 5th
declension singular
+ '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
+ '/es$/' # 5th
declension singular
];
$out = [
'um',
@@ -88,12 +88,12 @@
case 'ablative':
// only a few declensions, and even for those mostly
the singular only
$in = [
- '/u[ms]$/', # 2nd
declension singular
- '/ommunia$/', # 3rd
declension neuter plural (partly)
- '/a$/', # 1st
declension singular
- '/libri$/', '/nuntii$/', '/data$/', # 2nd
declension plural (partly)
- '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
- '/es$/' # 5th
declension singular
+ '/u[ms]$/', # 2nd
declension singular
+ '/ommunia$/', # 3rd
declension neuter plural (partly)
+ '/a$/', # 1st
declension singular
+ '/libri$/', '/nuntii$/', '/data$/', # 2nd
declension plural (partly)
+ '/tio$/', '/ns$/', '/as$/', # 3rd
declension singular (partly)
+ '/es$/' # 5th
declension singular
];
$out = [
'o',
diff --git a/languages/classes/LanguageOs.php b/languages/classes/LanguageOs.php
index d374c85..1b83f54 100644
--- a/languages/classes/LanguageOs.php
+++ b/languages/classes/LanguageOs.php
@@ -35,19 +35,19 @@
*
* Depending on word there are four different ways of converting to
other cases.
* 1) Word consist of not cyrillic letters or is an abbreviation.
- * Then result word is: word + hyphen + case ending.
+ * Then result word is: word + hyphen + case ending.
*
* 2) Word consist of cyrillic letters.
* 2.1) Word is in plural.
- * Then result word is: word - last letter + case ending.
Ending of allative case here is 'æм'.
+ * Then result word is: word - last letter + case ending. Ending
of allative case here is 'æм'.
*
* 2.2) Word is in singular.
* 2.2.1) Word ends on consonant.
- * Then result word is: word + case ending.
+ * Then result word is: word + case ending.
*
* 2.2.2) Word ends on vowel.
- * Then result word is: word + 'й' + case ending for cases
!= allative or comitative
- * and word + case ending for allative or comitative.
Ending of allative case here is 'æ'.
+ * Then result word is: word + 'й' + case ending for cases !=
allative or comitative
+ * and word + case ending for allative or comitative. Ending of
allative case here is 'æ'.
*
* @param string $word
* @param string $case
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 689586b9..b9280ea 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -105,7 +105,7 @@
* Example:
* @code
* $namespaceGenderAliases = [
- * NS_USER => [ 'male' => 'Male_user', 'female' => 'Female_user' ],
+ * NS_USER => [ 'male' => 'Male_user', 'female' => 'Female_user' ],
* ];
* @endcode
*/
diff --git a/maintenance/hhvm/makeRepo.php b/maintenance/hhvm/makeRepo.php
index a0fe381..2a102b2 100644
--- a/maintenance/hhvm/makeRepo.php
+++ b/maintenance/hhvm/makeRepo.php
@@ -106,7 +106,7 @@
$cmd = wfEscapeShellArg(
$hhvm,
'--hphp',
- '--target', 'hhbc',
+ '--target', 'hhbc',
'--format', 'binary',
'--force', '1',
'--keep-tempdir', '1',
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 4a3d2d6..23bdb3f 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -497,7 +497,7 @@
# (preferably batching files too).
private function getFileCommentFromSourceWiki( $wiki_host, $file ) {
$url = $wiki_host .
'/api.php?action=query&format=xml&titles=File:'
- . rawurlencode( $file ) .
'&prop=imageinfo&&iiprop=comment';
+ . rawurlencode( $file ) .
'&prop=imageinfo&&iiprop=comment';
$body = Http::get( $url, [], __METHOD__ );
if ( preg_match( '#<ii comment="([^"]*)" />#', $body, $matches
) == 0 ) {
return false;
@@ -508,7 +508,7 @@
private function getFileUserFromSourceWiki( $wiki_host, $file ) {
$url = $wiki_host .
'/api.php?action=query&format=xml&titles=File:'
- . rawurlencode( $file ) .
'&prop=imageinfo&&iiprop=user';
+ . rawurlencode( $file ) .
'&prop=imageinfo&&iiprop=user';
$body = Http::get( $url, [], __METHOD__ );
if ( preg_match( '#<ii user="([^"]*)" />#', $body, $matches )
== 0 ) {
return false;
diff --git a/maintenance/oracle/archives/patch-ar_sha1_field.sql
b/maintenance/oracle/archives/patch-ar_sha1_field.sql
index de723ce..0b1a799 100644
--- a/maintenance/oracle/archives/patch-ar_sha1_field.sql
+++ b/maintenance/oracle/archives/patch-ar_sha1_field.sql
@@ -1,3 +1,3 @@
define mw_prefix='{$wgDBprefix}';
-ALTER TABLE &mw_prefix.archive ADD ar_sha1 VARCHAR2(32);
+ALTER TABLE &mw_prefix.archive ADD ar_sha1 VARCHAR2(32);
diff --git a/maintenance/oracle/archives/patch-rev_sha1_field.sql
b/maintenance/oracle/archives/patch-rev_sha1_field.sql
index 80544e8..7973c7e 100644
--- a/maintenance/oracle/archives/patch-rev_sha1_field.sql
+++ b/maintenance/oracle/archives/patch-rev_sha1_field.sql
@@ -1,4 +1,4 @@
define mw_prefix='{$wgDBprefix}';
-ALTER TABLE &mw_prefix.revision ADD rev_sha1 VARCHAR2(32);
+ALTER TABLE &mw_prefix.revision ADD rev_sha1 VARCHAR2(32);
diff --git a/maintenance/oracle/archives/patch-us_chunk_inx_field.sql
b/maintenance/oracle/archives/patch-us_chunk_inx_field.sql
index 43ee16e..931eeee 100644
--- a/maintenance/oracle/archives/patch-us_chunk_inx_field.sql
+++ b/maintenance/oracle/archives/patch-us_chunk_inx_field.sql
@@ -1,4 +1,4 @@
define mw_prefix='{$wgDBprefix}';
-ALTER TABLE &mw_prefix.uploadstash ADD us_chunk_inx NUMBER;
+ALTER TABLE &mw_prefix.uploadstash ADD us_chunk_inx NUMBER;
diff --git a/maintenance/postgres/archives/patch-uploadstash.sql
b/maintenance/postgres/archives/patch-uploadstash.sql
index 8fd9fb9..bdee0ea 100644
--- a/maintenance/postgres/archives/patch-uploadstash.sql
+++ b/maintenance/postgres/archives/patch-uploadstash.sql
@@ -2,21 +2,21 @@
CREATE TYPE media_type AS ENUM
('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
CREATE TABLE uploadstash (
- us_id INTEGER PRIMARY KEY NOT NULL DEFAULT
nextval('uploadstash_us_id_seq'),
- us_user INTEGER,
- us_key TEXT,
- us_orig_path TEXT,
- us_path TEXT,
- us_source_type TEXT,
- us_timestamp TIMESTAMPTZ,
- us_status TEXT,
- us_size INTEGER,
- us_sha1 TEXT,
- us_mime TEXT,
- us_media_type media_type DEFAULT NULL,
- us_image_width INTEGER,
- us_image_height INTEGER,
- us_image_bits INTEGER
+ us_id INTEGER PRIMARY KEY NOT NULL DEFAULT
nextval('uploadstash_us_id_seq'),
+ us_user INTEGER,
+ us_key TEXT,
+ us_orig_path TEXT,
+ us_path TEXT,
+ us_source_type TEXT,
+ us_timestamp TIMESTAMPTZ,
+ us_status TEXT,
+ us_size INTEGER,
+ us_sha1 TEXT,
+ us_mime TEXT,
+ us_media_type media_type DEFAULT NULL,
+ us_image_width INTEGER,
+ us_image_height INTEGER,
+ us_image_bits INTEGER
);
CREATE INDEX us_user_idx ON uploadstash (us_user);
diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc
index 9893342d..69c9265 100644
--- a/maintenance/userDupes.inc
+++ b/maintenance/userDupes.inc
@@ -195,7 +195,7 @@
"SELECT user_name,COUNT(*) AS n
FROM $user
GROUP BY user_name
- HAVING n > 1", __METHOD__ );
+ HAVING n > 1", __METHOD__ );
$list = [];
foreach ( $result as $row ) {
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
b/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
index b791db8..a6cd650 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
@@ -13,7 +13,7 @@
list-style: none none;
display: inline;
/* shared.css has some very weird directionality-specific rules for
'ul' we need to override,
- search for "Correct directionality when page dir is different from
site/user dir" */
+ * search for "Correct directionality when page dir is different from
site/user dir" */
margin: 0 !important;
padding: 0 !important;
}
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index d58eb2e..2afe286 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -112,16 +112,16 @@
// For example, see two groups with
conflicts:
// userExpLevel: [
// {
- // name: 'experienced',
- // conflicts: [ 'unregistered' ]
+ // name: 'experienced',
+ // conflicts: [ 'unregistered' ]
// }
// ],
// registration: [
// {
- // name: 'registered',
+ // name: 'registered',
// },
// {
- // name: 'unregistered',
+ // name: 'unregistered',
// }
// ]
// If we select 'experienced', then
'unregistered' is in conflict (and vice versa),
diff --git a/resources/src/mediawiki.skinning/content.parsoid.less
b/resources/src/mediawiki.skinning/content.parsoid.less
index b4fe934..0f8ae45 100644
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -88,8 +88,8 @@
display: table-caption;
caption-side: bottom;
/* In mw-core the font-size is duplicated, 94% in thumbiner
- and again 94% in thumbcaption. 88% for font size of the
- caption results in the same behavior. */
+ * and again 94% in thumbcaption. 88% for font size of the
+ * caption results in the same behavior. */
font-size: 88%;
line-height: 1.4em;
text-align: left;
diff --git a/resources/src/mediawiki/mediawiki.storage.js
b/resources/src/mediawiki/mediawiki.storage.js
index 2e09392..95c77f8 100644
--- a/resources/src/mediawiki/mediawiki.storage.js
+++ b/resources/src/mediawiki/mediawiki.storage.js
@@ -42,12 +42,12 @@
};
/**
- * Set a value in device storage.
- *
- * @param {string} key Key name to store under
- * @param {string} value Value to be stored
- * @return {boolean} Whether the save succeeded or not
- */
+ * Set a value in device storage.
+ *
+ * @param {string} key Key name to store under
+ * @param {string} value Value to be stored
+ * @return {boolean} Whether the save succeeded or not
+ */
SafeStorage.prototype.set = function ( key, value ) {
try {
this.store.setItem( key, value );
@@ -57,11 +57,11 @@
};
/**
- * Remove a value from device storage.
- *
- * @param {string} key Key of item to remove
- * @return {boolean} Whether the save succeeded or not
- */
+ * Remove a value from device storage.
+ *
+ * @param {string} key Key of item to remove
+ * @return {boolean} Whether the save succeeded or not
+ */
SafeStorage.prototype.remove = function ( key ) {
try {
this.store.removeItem( key );
diff --git a/resources/src/mediawiki/page/gallery-slideshow.js
b/resources/src/mediawiki/page/gallery-slideshow.js
index 3cb8e9d..6e9ff0e 100644
--- a/resources/src/mediawiki/page/gallery-slideshow.js
+++ b/resources/src/mediawiki/page/gallery-slideshow.js
@@ -89,7 +89,7 @@
/**
* @property {jQuery} $container If the gallery contained in an element
that is
- * not the main content element, then it stores that element.
+ * not the main content element, then it stores that element.
*/
/**
@@ -102,7 +102,7 @@
/**
* @property {number} imageHeight Height of the image based on viewport
size
- * the URLs in the required size.
+ * the URLs in the required size.
*/
/* Setup */
diff --git a/tests/phpunit/autoload.ide.php b/tests/phpunit/autoload.ide.php
index 074fab0..106ab683 100644
--- a/tests/phpunit/autoload.ide.php
+++ b/tests/phpunit/autoload.ide.php
@@ -86,9 +86,12 @@
}
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
- if ( $wgLocalisationCacheConf['storeClass'] === false
- && ( $wgLocalisationCacheConf['store'] == 'db'
- || ( $wgLocalisationCacheConf['store'] == 'detect' &&
!$wgCacheDirectory ) )
+ if (
+ $wgLocalisationCacheConf['storeClass'] === false
+ && (
+ $wgLocalisationCacheConf['store'] == 'db'
+ || ( $wgLocalisationCacheConf['store'] == 'detect' &&
!$wgCacheDirectory )
+ )
) {
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
diff --git a/tests/phpunit/includes/MWNamespaceTest.php
b/tests/phpunit/includes/MWNamespaceTest.php
index 092d57b..5977652 100644
--- a/tests/phpunit/includes/MWNamespaceTest.php
+++ b/tests/phpunit/includes/MWNamespaceTest.php
@@ -161,7 +161,7 @@
public function testExists() {
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
- 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
+ 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
);
}
*/
@@ -223,7 +223,7 @@
public function testGetCanonicalNamespaces() {
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
- 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
+ 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
);
}
*/
@@ -234,7 +234,7 @@
public function testGetCanonicalName() {
// Remove the following lines when you implement this
test.
$this->markTestIncomplete(
- 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
+ 'This test has not been implemented yet. Rely
on $wgCanonicalNamespaces.'
);
}
*/
@@ -245,7 +245,7 @@
public function testGetCanonicalIndex() {
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
- 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
+ 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
);
}
*/
@@ -257,7 +257,7 @@
public function testGetValidNamespaces() {
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
- 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
+ 'This test has not been implemented yet. Rely on
$wgCanonicalNamespaces.'
);
}
*/
diff --git a/tests/phpunit/includes/MessageTest.php
b/tests/phpunit/includes/MessageTest.php
index 2694b85..424218e 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -315,14 +315,14 @@
return [
[ '<span>foo</span>', 'parse', '<span>foo</span>',
'<span>foo</span>' ],
[ '<span>foo</span>', 'escaped',
'<span>foo</span>',
- '<span>foo</span>' ],
+ '<span>foo</span>' ],
[ '<span>foo</span>', 'plain', '<span>foo</span>',
'<span>foo</span>' ],
[ '<script>alert(1)</script>', 'parse',
'<script>alert(1)</script>',
'<script>alert(1)</script>' ],
[ '<script>alert(1)</script>', 'escaped',
'<script>alert(1)</script>',
'<script>alert(1)</script>' ],
[ '<script>alert(1)</script>', 'plain',
'<script>alert(1)</script>',
- '<script>alert(1)</script>' ],
+ '<script>alert(1)</script>' ],
];
}
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php
b/tests/phpunit/includes/content/ContentHandlerTest.php
index ae662532..a3d1dda 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -434,8 +434,13 @@
$page = new WikiPage( $title );
$this->setTemporaryHook( 'SearchDataForIndex',
- function ( &$fields, ContentHandler $handler, WikiPage
$page, ParserOutput $output,
- SearchEngine $engine ) {
+ function (
+ &$fields,
+ ContentHandler $handler,
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fields['testDataField'] = 'test content';
} );
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php
b/tests/phpunit/includes/db/LBFactoryTest.php
index 4b857ce..8b285cb 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -157,12 +157,12 @@
],
],
'serverTemplate' => [
- 'dbname' => $wgDBname,
- 'user' => $wgDBuser,
- 'password' => $wgDBpassword,
- 'type' => $wgDBtype,
+ 'dbname' => $wgDBname,
+ 'user' => $wgDBuser,
+ 'password' => $wgDBpassword,
+ 'type' => $wgDBtype,
'dbDirectory' => $wgSQLiteDataDir,
- 'flags' => DBO_DEFAULT
+ 'flags' => DBO_DEFAULT
],
'hostsByName' => [
'test-db1' => $wgDBserver,
diff --git a/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
b/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
index ebeb109..f722fe1 100644
--- a/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
@@ -27,7 +27,7 @@
$this->client->expects( $this->once() )->method( 'run' )->with(
[
'method' => 'GET',
'url' => 'http://test/rest/42xyz42'
- // list( $rcode, $rdesc, $rhdrs, $rbody, $rerr )
+ // list( $rcode, $rdesc, $rhdrs, $rbody, $rerr )
] )->willReturn( [ 200, 'OK', [], 's:8:"somedata";', 0 ] );
$result = $this->bag->get( '42xyz42' );
$this->assertEquals( 'somedata', $result );
@@ -69,7 +69,7 @@
$this->client->expects( $this->once() )->method( 'run' )->with(
[
'method' => 'PUT',
'url' => 'http://test/rest/42xyz42',
- 'body' => 's:8:"postdata";'
+ 'body' => 's:8:"postdata";'
// list( $rcode, $rdesc, $rhdrs, $rbody, $rerr )
] )->willReturn( [ 200, 'OK', [], 'Done', 0 ] );
$result = $this->bag->set( '42xyz42', 'postdata' );
diff --git a/tests/phpunit/includes/search/SearchIndexFieldTest.php
b/tests/phpunit/includes/search/SearchIndexFieldTest.php
index ec046a76..9c10e49 100644
--- a/tests/phpunit/includes/search/SearchIndexFieldTest.php
+++ b/tests/phpunit/includes/search/SearchIndexFieldTest.php
@@ -10,7 +10,7 @@
return [
[ 0, 'test', 0, 'test', true ],
[ SearchIndexField::INDEX_TYPE_NESTED, 'test',
- SearchIndexField::INDEX_TYPE_NESTED, 'test', false ],
+ SearchIndexField::INDEX_TYPE_NESTED, 'test',
false ],
[ 0, 'test', 0, 'test2', true ],
[ 0, 'test', 1, 'test', false ],
];
diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php
b/tests/phpunit/includes/utils/UIDGeneratorTest.php
index 60d4e99..8b54b72 100644
--- a/tests/phpunit/includes/utils/UIDGeneratorTest.php
+++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php
@@ -45,7 +45,7 @@
$last_timestamp_bin,
$timestamp_bin,
"timestamp ($timestamp_bin) of current ID
($id_bin) >= timestamp ($last_timestamp_bin) " .
- "of prior one ($lastId_bin)" );
+ "of prior one ($lastId_bin)" );
$hostbits_bin = substr( $id_bin, -$hostbits );
$last_hostbits_bin = substr( $lastId_bin, -$hostbits );
@@ -55,7 +55,7 @@
$hostbits_bin,
$last_hostbits_bin,
"Host ID ($hostbits_bin) of current ID
($id_bin) is same as host ID ($last_hostbits_bin) " .
- "of prior one ($lastId_bin)." );
+ "of prior one ($lastId_bin)." );
}
$lastId = $id;
diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 11a25c4..7babcac 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -35,8 +35,7 @@
<directory>structure</directory>
<file>suites/LessTestSuite.php</file>
</testsuite>
- <!-- As there is a class Maintenance, we cannot use the
- name "maintenance" directly -->
+ <!-- As there is a class Maintenance, we cannot use the name
"maintenance" directly -->
<testsuite name="maintenance_suite">
<directory>maintenance</directory>
</testsuite>
--
To view, visit https://gerrit.wikimedia.org/r/339904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie206cc946459f6befcfc2d520e35ad3ea3c0f1e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
