Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362704 )
Change subject: Remove empty lines at begin of function, if, foreach, switch
......................................................................
Remove empty lines at begin of function, if, foreach, switch
Change-Id: Ifb767729b481b4b686e6d6444cf48b1f580cc478
---
M docs/hooks.txt
M includes/Block.php
M includes/Category.php
M includes/CategoryFinder.php
M includes/CategoryViewer.php
M includes/DeprecatedGlobal.php
M includes/FeedUtils.php
M includes/Linker.php
M includes/MediaWiki.php
M includes/MovePage.php
M includes/OutputHandler.php
M includes/Sanitizer.php
M includes/Title.php
M includes/actions/CreditsAction.php
M includes/api/ApiBase.php
M includes/api/ApiEditPage.php
M includes/api/ApiModuleManager.php
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryUsers.php
M includes/cache/BacklinkCache.php
M includes/changes/ChangesListBooleanFilter.php
M includes/changes/ChangesListFilter.php
M includes/changes/ChangesListFilterGroup.php
M includes/changes/ChangesListStringOptionsFilterGroup.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/changetags/ChangeTags.php
M includes/changetags/ChangeTagsList.php
M includes/changetags/ChangeTagsLogList.php
M includes/changetags/ChangeTagsRevisionList.php
M includes/content/AbstractContent.php
M includes/content/ContentHandler.php
M includes/content/WikitextContent.php
M includes/debug/logger/monolog/LegacyHandler.php
M includes/diff/DiffEngine.php
M includes/diff/DiffFormatter.php
M includes/diff/TableDiffFormatter.php
M includes/export/XmlDumpWriter.php
M includes/gallery/PackedOverlayImageGallery.php
M includes/import/WikiImporter.php
M includes/installer/PostgresUpdater.php
M includes/interwiki/InterwikiLookupAdapter.php
M includes/libs/CryptRand.php
M includes/libs/objectcache/MemcachedClient.php
M includes/libs/xmp/XMP.php
M includes/media/BitmapMetadataHandler.php
M includes/media/Exif.php
M includes/media/IPTC.php
M includes/media/JpegMetadataExtractor.php
M includes/media/MediaHandler.php
M includes/media/PNG.php
M includes/media/TransformationalImageHandler.php
M includes/page/Article.php
M includes/page/WikiPage.php
M includes/parser/CoreParserFunctions.php
M includes/parser/Parser.php
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/resourceloader/ResourceLoaderStartUpModule.php
M includes/search/SearchNearMatcher.php
M includes/site/MediaWikiPageNameNormalizer.php
M includes/skins/MediaWikiI18N.php
M includes/skins/Skin.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/specialpage/QueryPage.php
M includes/specialpage/SpecialPageFactory.php
M includes/specials/SpecialChangeEmail.php
M includes/specials/SpecialContributions.php
M includes/specials/SpecialExport.php
M includes/specials/SpecialPageData.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialRecentchangeslinked.php
M includes/specials/SpecialSearch.php
M includes/specials/SpecialSpecialpages.php
M includes/specials/SpecialStatistics.php
M includes/specials/SpecialUpload.php
M includes/specials/SpecialUserrights.php
M includes/specials/SpecialWatchlist.php
M includes/title/MediaWikiTitleCodec.php
M includes/upload/UploadBase.php
M includes/user/UserGroupMembership.php
M includes/utils/AutoloadGenerator.php
M includes/widget/search/InterwikiSearchResultSetWidget.php
M includes/widget/search/InterwikiSearchResultWidget.php
M languages/Language.php
M languages/LanguageConverter.php
M languages/classes/LanguageBe_tarask.php
M languages/classes/LanguageKk.php
M languages/classes/LanguageKu_ku.php
M languages/classes/LanguageYue.php
M languages/classes/LanguageZh_hans.php
M maintenance/checkSyntax.php
M maintenance/deleteOldRevisions.php
M maintenance/dumpTextPass.php
M maintenance/importImages.php
M maintenance/language/checkDupeMessages.php
M maintenance/namespaceDupes.php
M maintenance/nukePage.php
M maintenance/oracle/alterSharedConstraints.php
M maintenance/refreshLinks.php
M maintenance/removeUnusedAccounts.php
M maintenance/userOptions.inc
M mw-config/index.php
M phpcs.xml
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/GlobalFunctions/GlobalTest.php
M tests/phpunit/includes/LinkerTest.php
M tests/phpunit/includes/WatchedItemIntegrationTest.php
M tests/phpunit/includes/api/generateRandomImages.php
M tests/phpunit/includes/api/query/ApiQueryBasicTest.php
M tests/phpunit/includes/changes/TestRecentChangesHelper.php
M tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
M tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php
M tests/phpunit/includes/libs/xmp/XMPTest.php
M tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
M tests/phpunit/includes/media/GIFMetadataExtractorTest.php
M tests/phpunit/includes/password/UserPasswordPolicyTest.php
M tests/phpunit/includes/specials/SpecialPreferencesTest.php
M tests/phpunit/includes/title/ForeignTitleTest.php
M tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
M tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
M tests/phpunit/includes/utils/MWCryptHKDFTest.php
M tests/phpunit/maintenance/DumpTestCase.php
M tests/phpunit/maintenance/MaintenanceTest.php
M tests/phpunit/maintenance/backupTextPassTest.php
M tests/phpunit/maintenance/backup_LogTest.php
M tests/qunit/data/testrunner.js
128 files changed, 102 insertions(+), 279 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/04/362704/1
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 3d310c3..62e5bdb 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -74,9 +74,7 @@
stuff in our mainline code. Using hooks, the function becomes:
function showAnArticle( $article ) {
-
if ( Hooks::run( 'ArticleShow', array( &$article ) ) ) {
-
# code to actually show the article goes here
Hooks::run( 'ArticleShowComplete', array( &$article ) );
diff --git a/includes/Block.php b/includes/Block.php
index a7e7308..2c935df 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -829,7 +829,6 @@
* @return bool
*/
public function deleteIfExpired() {
-
if ( $this->isExpired() ) {
wfDebug( "Block::deleteIfExpired() -- deleting\n" );
$this->delete();
@@ -1111,7 +1110,6 @@
* not be the same as the target you gave if you used $vagueTarget!
*/
public static function newFromTarget( $specificTarget, $vagueTarget =
null, $fromMaster = false ) {
-
list( $target, $type ) = self::parseTarget( $specificTarget );
if ( $type == Block::TYPE_ID || $type == Block::TYPE_AUTO ) {
return Block::newFromID( $target );
diff --git a/includes/Category.php b/includes/Category.php
index 5c7cb8d..c22ea64 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -269,7 +269,6 @@
* @return TitleArray TitleArray object for category members.
*/
public function getMembers( $limit = false, $offset = '' ) {
-
$dbr = wfGetDB( DB_REPLICA );
$conds = [ 'cl_to' => $this->getName(), 'cl_from = page_id' ];
diff --git a/includes/CategoryFinder.php b/includes/CategoryFinder.php
index 595cf95..89bf5c7 100644
--- a/includes/CategoryFinder.php
+++ b/includes/CategoryFinder.php
@@ -186,7 +186,6 @@
* Scans a "parent layer" of the articles/categories in $this->next
*/
private function scanNextLayer() {
-
# Find all parents of the article currently in $this->next
$layer = [];
$res = $this->dbr->select(
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 7086a48..9d692d7 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -108,7 +108,6 @@
* @return string HTML output
*/
public function getHTML() {
-
$this->showGallery = $this->getConfig()->get(
'CategoryMagicGallery' )
&& !$this->getOutput()->mNoGallery;
diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index 14329d3..7c592c6 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -38,7 +38,6 @@
// PSR2.Methods.MethodDeclaration.Underscore
// PSR2.Classes.PropertyDeclaration.ScopeMissing
function _newObject() {
-
/* Put the caller offset for wfDeprecated as 6, as
* that gives the function that uses this object, since:
* 1 = this function ( _newObject )
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index 3268291..96a88d3 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -188,7 +188,6 @@
}
if ( $html === null ) {
-
// Omit large new page diffs, T31110
// Also use diff link for non-textual content
$diffText = self::getDiffLink( $title, $newid );
diff --git a/includes/Linker.php b/includes/Linker.php
index 6942a39..5845532 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1882,7 +1882,6 @@
* @return string HTML output
*/
public static function formatHiddenCategories( $hiddencats ) {
-
$outText = '';
if ( count( $hiddencats ) > 0 ) {
# Construct the HTML
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 9fdc95a..4df4d76 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -821,7 +821,6 @@
// ATTENTION: This hook is likely to be removed soon
due to overall design of the system.
if ( Hooks::run( 'BeforeHttpsRedirect', [
$this->context, &$redirUrl ] ) ) {
-
if ( $request->wasPosted() ) {
// This is weird and we'd hope it
almost never happens. This
// means that a POST came in via HTTP
and policy requires us
diff --git a/includes/MovePage.php b/includes/MovePage.php
index ce6ecad..8d0c33dc 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -440,8 +440,8 @@
* @throws MWException
*/
private function moveToInternal( User $user, &$nt, $reason = '',
$createRedirect = true,
- array $changeTags = [] ) {
-
+ array $changeTags = []
+ ) {
global $wgContLang;
if ( $nt->exists() ) {
$moveOverRedirect = true;
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php
index 2f47006..2dc3732 100644
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -183,7 +183,6 @@
* @return string
*/
function wfHtmlValidationHandler( $s ) {
-
$errors = '';
if ( MWTidy::checkErrors( $s, $errors ) ) {
return $s;
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 8424432..dd4a314 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -906,7 +906,6 @@
* @return string normalized css
*/
public static function normalizeCss( $value ) {
-
// Decode character references like {
$value = Sanitizer::decodeCharReferences( $value );
diff --git a/includes/Title.php b/includes/Title.php
index 2ebeb0d..083a725 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3735,8 +3735,8 @@
* @return array|bool True on success, getUserPermissionsErrors()-like
array on failure
*/
public function moveTo( &$nt, $auth = true, $reason = '',
$createRedirect = true,
- array $changeTags = [] ) {
-
+ array $changeTags = []
+ ) {
global $wgUser;
$err = $this->isValidMoveOperation( $nt, $auth, $reason );
if ( is_array( $err ) ) {
@@ -3773,8 +3773,8 @@
* no pages were moved
*/
public function moveSubpages( $nt, $auth = true, $reason = '',
$createRedirect = true,
- array $changeTags = [] ) {
-
+ array $changeTags = []
+ ) {
global $wgMaximumMovedPages;
// Check permissions
if ( !$this->userCan( 'move-subpages' ) ) {
diff --git a/includes/actions/CreditsAction.php
b/includes/actions/CreditsAction.php
index 803695a..021f426 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -44,7 +44,6 @@
* @return string HTML
*/
public function onView() {
-
if ( $this->page->getID() == 0 ) {
$s = $this->msg( 'nocredits' )->parse();
} else {
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 3a9167f..2dcece1 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -967,7 +967,6 @@
* @return bool
*/
protected function getWatchlistValue( $watchlist, $titleObj,
$userOption = null ) {
-
$userWatching = $this->getUser()->isWatched( $titleObj,
User::IGNORE_USER_RIGHTS );
switch ( $watchlist ) {
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 0b8156b..2245195 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -64,7 +64,6 @@
/** @var $newTitle Title */
foreach ( $titles as $id => $newTitle ) {
-
if ( !isset( $titles[$id - 1] ) ) {
$titles[$id - 1] = $oldTitle;
}
diff --git a/includes/api/ApiModuleManager.php
b/includes/api/ApiModuleManager.php
index 42dfb71..b5e47ac 100644
--- a/includes/api/ApiModuleManager.php
+++ b/includes/api/ApiModuleManager.php
@@ -97,7 +97,6 @@
* @param string $group Which group modules belong to
(action,format,...)
*/
public function addModules( array $modules, $group ) {
-
foreach ( $modules as $name => $moduleSpec ) {
if ( is_array( $moduleSpec ) ) {
$class = $moduleSpec['class'];
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index baefbda..f8eaa84 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -356,7 +356,6 @@
* @return ResultWrapper
*/
protected function select( $method, $extraQuery = [], array &$hookData
= null ) {
-
$tables = array_merge(
$this->tables,
isset( $extraQuery['tables'] ) ?
(array)$extraQuery['tables'] : []
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 5b094cd..2a0eadd 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -182,7 +182,6 @@
}
foreach ( $res as $row ) {
-
// create user object and pass along
$userGroups if set
// that reduces the number of database queries
needed in User dramatically
if ( !isset( $userGroups ) ) {
diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php
index 11f3c2b..4341daa 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -174,7 +174,6 @@
* @return ResultWrapper
*/
protected function queryLinks( $table, $startId, $endId, $max, $select
= 'all' ) {
-
$fromField = $this->getPrefix( $table ) . '_from';
if ( !$startId && !$endId && is_infinite( $max )
diff --git a/includes/changes/ChangesListBooleanFilter.php
b/includes/changes/ChangesListBooleanFilter.php
index 73c0fb0..930269c 100644
--- a/includes/changes/ChangesListBooleanFilter.php
+++ b/includes/changes/ChangesListBooleanFilter.php
@@ -184,8 +184,8 @@
* @param array &$join_conds Array of join conditions; see
IDatabase::select $join_conds
*/
public function modifyQuery( IDatabase $dbr, ChangesListSpecialPage
$specialPage,
- &$tables, &$fields, &$conds, &$query_options, &$join_conds ) {
-
+ &$tables, &$fields, &$conds, &$query_options, &$join_conds
+ ) {
if ( $this->queryCallable === null ) {
return;
}
diff --git a/includes/changes/ChangesListFilter.php
b/includes/changes/ChangesListFilter.php
index bd895bb..0b34a5d 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -186,12 +186,8 @@
* @param string $backwardKey i18n key for conflict message in reverse
* direction (when in UI context of $other object)
*/
- public function conflictsWith( $other, $globalKey, $forwardKey,
- $backwardKey ) {
-
- if ( $globalKey === null || $forwardKey === null ||
- $backwardKey === null ) {
-
+ public function conflictsWith( $other, $globalKey, $forwardKey,
$backwardKey ) {
+ if ( $globalKey === null || $forwardKey === null ||
$backwardKey === null ) {
throw new MWException( 'All messages must be specified'
);
}
@@ -220,9 +216,7 @@
* @param string $contextDescription i18n key for conflict message in
this
* direction (when in UI context of $this object)
*/
- public function setUnidirectionalConflict( $other, $globalDescription,
- $contextDescription ) {
-
+ public function setUnidirectionalConflict( $other, $globalDescription,
$contextDescription ) {
if ( $other instanceof ChangesListFilterGroup ) {
$this->conflictingGroups[] = [
'group' => $other->getName(),
diff --git a/includes/changes/ChangesListFilterGroup.php
b/includes/changes/ChangesListFilterGroup.php
index 3555158..0dc1145 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -229,12 +229,8 @@
* @param string $backwardKey i18n key for conflict message in reverse
* direction (when in UI context of $other object)
*/
- public function conflictsWith( $other, $globalKey, $forwardKey,
- $backwardKey ) {
-
- if ( $globalKey === null || $forwardKey === null ||
- $backwardKey === null ) {
-
+ public function conflictsWith( $other, $globalKey, $forwardKey,
$backwardKey ) {
+ if ( $globalKey === null || $forwardKey === null ||
$backwardKey === null ) {
throw new MWException( 'All messages must be specified'
);
}
@@ -263,9 +259,7 @@
* @param string $contextDescription i18n key for conflict message in
this
* direction (when in UI context of $this object)
*/
- public function setUnidirectionalConflict( $other, $globalDescription,
- $contextDescription ) {
-
+ public function setUnidirectionalConflict( $other, $globalDescription,
$contextDescription ) {
if ( $other instanceof ChangesListFilterGroup ) {
$this->conflictingGroups[] = [
'group' => $other->getName(),
diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php
b/includes/changes/ChangesListStringOptionsFilterGroup.php
index 86b4a8b..487120d 100644
--- a/includes/changes/ChangesListStringOptionsFilterGroup.php
+++ b/includes/changes/ChangesListStringOptionsFilterGroup.php
@@ -185,8 +185,8 @@
* @param string $value URL parameter value
*/
public function modifyQuery( IDatabase $dbr, ChangesListSpecialPage
$specialPage,
- &$tables, &$fields, &$conds, &$query_options, &$join_conds,
$value ) {
-
+ &$tables, &$fields, &$conds, &$query_options, &$join_conds,
$value
+ ) {
$allowedFilterNames = [];
foreach ( $this->filters as $filter ) {
$allowedFilterNames[] = $filter->getName();
diff --git a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index 64d4aa7..30c6995 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -98,7 +98,6 @@
* @return string
*/
public function recentChangesLine( &$rc, $watched = false, $linenumber
= null ) {
-
$date = $this->getLanguage()->userDate(
$rc->mAttribs['rc_timestamp'],
$this->getUser()
diff --git a/includes/changes/OldChangesList.php
b/includes/changes/OldChangesList.php
index 2a53d66..09205bd 100644
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -32,7 +32,6 @@
* @return string|bool
*/
public function recentChangesLine( &$rc, $watched = false, $linenumber
= null ) {
-
$classes = $this->getHTMLClasses( $rc, $watched );
// use mw-line-even/mw-line-odd class only if linenumber is
given (feature from T16468)
if ( $linenumber ) {
diff --git a/includes/changetags/ChangeTags.php
b/includes/changetags/ChangeTags.php
index 6ba9c10..c9b5f96 100644
--- a/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@ -201,7 +201,6 @@
&$rev_id = null, &$log_id = null, $params = null, RecentChange
$rc = null,
User $user = null
) {
-
$tagsToAdd = array_filter( (array)$tagsToAdd ); // Make sure
we're submitting all tags...
$tagsToRemove = array_filter( (array)$tagsToRemove );
@@ -275,8 +274,8 @@
// update the tag_summary row
$prevTags = [];
if ( !self::updateTagSummaryRow( $tagsToAdd, $tagsToRemove,
$rc_id, $rev_id,
- $log_id, $prevTags ) ) {
-
+ $log_id, $prevTags )
+ ) {
// nothing to do
return [ [], [], $prevTags ];
}
@@ -343,8 +342,8 @@
* @since 1.25
*/
protected static function updateTagSummaryRow( &$tagsToAdd,
&$tagsToRemove,
- $rc_id, $rev_id, $log_id, &$prevTags = [] ) {
-
+ $rc_id, $rev_id, $log_id, &$prevTags = []
+ ) {
$dbw = wfGetDB( DB_MASTER );
$tsConds = array_filter( [
@@ -419,9 +418,7 @@
* @return Status
* @since 1.25
*/
- public static function canAddTagsAccompanyingChange( array $tags,
- User $user = null ) {
-
+ public static function canAddTagsAccompanyingChange( array $tags, User
$user = null ) {
if ( !is_null( $user ) ) {
if ( !$user->isAllowed( 'applychangetags' ) ) {
return Status::newFatal(
'tags-apply-no-permission' );
@@ -465,7 +462,6 @@
public static function addTagsAccompanyingChangeWithChecks(
array $tags, $rc_id, $rev_id, $log_id, $params, User $user
) {
-
// are we allowed to do this?
$result = self::canAddTagsAccompanyingChange( $tags, $user );
if ( !$result->isOK() ) {
@@ -491,8 +487,8 @@
* @since 1.25
*/
public static function canUpdateTags( array $tagsToAdd, array
$tagsToRemove,
- User $user = null ) {
-
+ User $user = null
+ ) {
if ( !is_null( $user ) ) {
if ( !$user->isAllowed( 'changetags' ) ) {
return Status::newFatal(
'tags-update-no-permission' );
@@ -554,8 +550,8 @@
* @since 1.25
*/
public static function updateTagsWithChecks( $tagsToAdd, $tagsToRemove,
- $rc_id, $rev_id, $log_id, $params, $reason, User $user ) {
-
+ $rc_id, $rev_id, $log_id, $params, $reason, User $user
+ ) {
if ( is_null( $tagsToAdd ) ) {
$tagsToAdd = [];
}
@@ -792,8 +788,8 @@
* @since 1.25
*/
protected static function logTagManagementAction( $action, $tag,
$reason,
- User $user, $tagCount = null, array $logEntryTags = [] ) {
-
+ User $user, $tagCount = null, array $logEntryTags = []
+ ) {
$dbw = wfGetDB( DB_MASTER );
$logEntry = new ManualLogEntry( 'managetags', $action );
@@ -869,8 +865,8 @@
* @since 1.25
*/
public static function activateTagWithChecks( $tag, $reason, User $user,
- $ignoreWarnings = false, array $logEntryTags = [] ) {
-
+ $ignoreWarnings = false, array $logEntryTags = []
+ ) {
// are we allowed to do this?
$result = self::canActivateTag( $tag, $user );
if ( $ignoreWarnings ? !$result->isOK() : !$result->isGood() ) {
@@ -932,8 +928,8 @@
* @since 1.25
*/
public static function deactivateTagWithChecks( $tag, $reason, User
$user,
- $ignoreWarnings = false, array $logEntryTags = [] ) {
-
+ $ignoreWarnings = false, array $logEntryTags = []
+ ) {
// are we allowed to do this?
$result = self::canDeactivateTag( $tag, $user );
if ( $ignoreWarnings ? !$result->isOK() : !$result->isGood() ) {
@@ -1034,8 +1030,8 @@
* @since 1.25
*/
public static function createTagWithChecks( $tag, $reason, User $user,
- $ignoreWarnings = false, array $logEntryTags = [] ) {
-
+ $ignoreWarnings = false, array $logEntryTags = []
+ ) {
// are we allowed to do this?
$result = self::canCreateTag( $tag, $user );
if ( $ignoreWarnings ? !$result->isOK() : !$result->isGood() ) {
@@ -1165,8 +1161,8 @@
* @since 1.25
*/
public static function deleteTagWithChecks( $tag, $reason, User $user,
- $ignoreWarnings = false, array $logEntryTags = [] ) {
-
+ $ignoreWarnings = false, array $logEntryTags = []
+ ) {
// are we allowed to do this?
$result = self::canDeleteTag( $tag, $user );
if ( $ignoreWarnings ? !$result->isOK() : !$result->isGood() ) {
diff --git a/includes/changetags/ChangeTagsList.php
b/includes/changetags/ChangeTagsList.php
index a37f5f2..afbbb2b 100644
--- a/includes/changetags/ChangeTagsList.php
+++ b/includes/changetags/ChangeTagsList.php
@@ -39,8 +39,8 @@
* @throws Exception If you give an unknown $typeName
*/
public static function factory( $typeName, IContextSource $context,
- Title $title, array $ids ) {
-
+ Title $title, array $ids
+ ) {
switch ( $typeName ) {
case 'revision':
$className = 'ChangeTagsRevisionList';
diff --git a/includes/changetags/ChangeTagsLogList.php
b/includes/changetags/ChangeTagsLogList.php
index 271005f..e6d918a 100644
--- a/includes/changetags/ChangeTagsLogList.php
+++ b/includes/changetags/ChangeTagsLogList.php
@@ -71,9 +71,7 @@
* @param User $user
* @return Status
*/
- public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove,
$params,
- $reason, $user ) {
-
+ public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove,
$params, $reason, $user ) {
// @codingStandardsIgnoreStart
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $this->reset(); $this->current(); $this->next() ) {
// @codingStandardsIgnoreEnd
diff --git a/includes/changetags/ChangeTagsRevisionList.php
b/includes/changetags/ChangeTagsRevisionList.php
index a0248c6..91193b0 100644
--- a/includes/changetags/ChangeTagsRevisionList.php
+++ b/includes/changetags/ChangeTagsRevisionList.php
@@ -81,9 +81,7 @@
* @param User $user
* @return Status
*/
- public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove,
$params,
- $reason, $user ) {
-
+ public function updateChangeTagsOnAll( $tagsToAdd, $tagsToRemove,
$params, $reason, $user ) {
// @codingStandardsIgnoreStart
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $this->reset(); $this->current(); $this->next() ) {
// @codingStandardsIgnoreEnd
diff --git a/includes/content/AbstractContent.php
b/includes/content/AbstractContent.php
index 811b241..1d472e0 100644
--- a/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@ -488,8 +488,8 @@
$po = new ParserOutput();
if ( Hooks::run( 'ContentGetParserOutput',
- [ $this, $title, $revId, $options, $generateHtml, &$po
] ) ) {
-
+ [ $this, $title, $revId, $options, $generateHtml, &$po
] )
+ ) {
// Save and restore the old value, just in case
something is reusing
// the ParserOptions object in some weird way.
$oldRedir = $options->getRedirectTarget();
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 85894ed..f85b00d 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -619,8 +619,8 @@
*/
public function createDifferenceEngine( IContextSource $context, $old =
0, $new = 0,
$rcid = 0, // FIXME: Deprecated, no longer used
- $refreshCache = false, $unhide = false ) {
-
+ $refreshCache = false, $unhide = false
+ ) {
// hook: get difference engine
$differenceEngine = null;
if ( !Hooks::run( 'GetDifferenceEngine',
diff --git a/includes/content/WikitextContent.php
b/includes/content/WikitextContent.php
index d649baf..942390f 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -68,7 +68,6 @@
* @see Content::replaceSection()
*/
public function replaceSection( $sectionId, Content $with,
$sectionTitle = '' ) {
-
$myModelId = $this->getModel();
$sectionModelId = $with->getModel();
diff --git a/includes/debug/logger/monolog/LegacyHandler.php
b/includes/debug/logger/monolog/LegacyHandler.php
index 58fca8e..dbeb136 100644
--- a/includes/debug/logger/monolog/LegacyHandler.php
+++ b/includes/debug/logger/monolog/LegacyHandler.php
@@ -194,7 +194,6 @@
$text = (string)$record['formatted'];
if ( $this->useUdp() ) {
-
// Clean it up for the multiplexer
if ( $this->prefix !== '' ) {
$leader = ( $this->prefix === '{channel}' ) ?
diff --git a/includes/diff/DiffEngine.php b/includes/diff/DiffEngine.php
index 25d50d3..53378e5 100644
--- a/includes/diff/DiffEngine.php
+++ b/includes/diff/DiffEngine.php
@@ -79,7 +79,6 @@
* @return DiffOp[]
*/
public function diff( $from_lines, $to_lines ) {
-
// Diff and store locally
$this->diffInternal( $from_lines, $to_lines );
diff --git a/includes/diff/DiffFormatter.php b/includes/diff/DiffFormatter.php
index 4b44b3c..6231c78 100644
--- a/includes/diff/DiffFormatter.php
+++ b/includes/diff/DiffFormatter.php
@@ -60,7 +60,6 @@
* @return string The formatted output.
*/
public function format( $diff ) {
-
$xi = $yi = 1;
$block = false;
$context = [];
diff --git a/includes/diff/TableDiffFormatter.php
b/includes/diff/TableDiffFormatter.php
index bcae746..14307b5 100644
--- a/includes/diff/TableDiffFormatter.php
+++ b/includes/diff/TableDiffFormatter.php
@@ -196,7 +196,6 @@
* @param string[] $closing
*/
protected function changed( $orig, $closing ) {
-
$diff = new WordLevelDiff( $orig, $closing );
$del = $diff->orig();
$add = $diff->closing();
diff --git a/includes/export/XmlDumpWriter.php
b/includes/export/XmlDumpWriter.php
index 5a1f92c..943408c 100644
--- a/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@ -199,7 +199,6 @@
* @access private
*/
function writeRevision( $row ) {
-
$out = " <revision>\n";
$out .= " " . Xml::element( 'id', null, strval(
$row->rev_id ) ) . "\n";
if ( isset( $row->rev_parent_id ) && $row->rev_parent_id ) {
@@ -287,7 +286,6 @@
* @access private
*/
function writeLogItem( $row ) {
-
$out = " <logitem>\n";
$out .= " " . Xml::element( 'id', null, strval( $row->log_id
) ) . "\n";
diff --git a/includes/gallery/PackedOverlayImageGallery.php
b/includes/gallery/PackedOverlayImageGallery.php
index e1ee7fa..db8ce68 100644
--- a/includes/gallery/PackedOverlayImageGallery.php
+++ b/includes/gallery/PackedOverlayImageGallery.php
@@ -31,7 +31,6 @@
* @return string
*/
protected function wrapGalleryText( $galleryText, $thumb ) {
-
// If we have no text, do not output anything to avoid
// ugly white overlay.
if ( trim( $galleryText ) === '' ) {
diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 2fc9f5e..63258cb 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -394,8 +394,8 @@
* @return bool
*/
public function finishImportPage( $title, $foreignTitle, $revCount,
- $sRevCount, $pageInfo ) {
-
+ $sRevCount, $pageInfo
+ ) {
// Update article count statistics (T42009)
// The normal counting logic in WikiPage->doEditUpdates() is
designed for
// one-revision-at-a-time editing, not bulk imports. In this
situation it
@@ -691,7 +691,6 @@
* @return bool|mixed
*/
private function processLogItem( $logInfo ) {
-
$revision = new WikiRevision( $this->config );
if ( isset( $logInfo['id'] ) ) {
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index 39cb89c..0172f1a 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -751,7 +751,6 @@
}
protected function setDefault( $table, $field, $default ) {
-
$info = $this->db->fieldInfo( $table, $field );
if ( $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default
value\n" );
diff --git a/includes/interwiki/InterwikiLookupAdapter.php
b/includes/interwiki/InterwikiLookupAdapter.php
index 3baea1a..076c37f 100644
--- a/includes/interwiki/InterwikiLookupAdapter.php
+++ b/includes/interwiki/InterwikiLookupAdapter.php
@@ -60,7 +60,6 @@
* @return bool Whether it exists
*/
public function isValidInterwiki( $prefix ) {
-
return array_key_exists( $prefix, $this->getInterwikiMap() );
}
diff --git a/includes/libs/CryptRand.php b/includes/libs/CryptRand.php
index 4b4a913..859d58b 100644
--- a/includes/libs/CryptRand.php
+++ b/includes/libs/CryptRand.php
@@ -234,7 +234,6 @@
* @return string Raw binary random data
*/
public function generate( $bytes, $forceStrong = false ) {
-
$bytes = floor( $bytes );
static $buffer = '';
if ( is_null( $this->strong ) ) {
diff --git a/includes/libs/objectcache/MemcachedClient.php
b/includes/libs/objectcache/MemcachedClient.php
index a94f86a..5cb49a9 100644
--- a/includes/libs/objectcache/MemcachedClient.php
+++ b/includes/libs/objectcache/MemcachedClient.php
@@ -469,7 +469,6 @@
* @return mixed
*/
public function get( $key, &$casToken = null ) {
-
if ( $this->_debug ) {
$this->_debugprint( "get($key)" );
}
diff --git a/includes/libs/xmp/XMP.php b/includes/libs/xmp/XMP.php
index 9d886bf..debe869 100644
--- a/includes/libs/xmp/XMP.php
+++ b/includes/libs/xmp/XMP.php
@@ -135,7 +135,6 @@
* Primary job is to initialize the XMLParser
*/
function __construct( LoggerInterface $logger = null ) {
-
if ( !function_exists( 'xml_parser_create_ns' ) ) {
// this should already be checked by this point
throw new RuntimeException( 'XMP support requires XML
Parser' );
@@ -174,7 +173,6 @@
* For example in jpeg's with extendedXMP
*/
private function resetXMLParser() {
-
$this->destroyXMLParser();
$this->xmlParser = xml_parser_create_ns( 'UTF-8', ' ' );
@@ -495,7 +493,6 @@
* @throws RuntimeException On invalid data
*/
function char( $parser, $data ) {
-
$data = trim( $data );
if ( trim( $data ) === "" ) {
return;
@@ -644,7 +641,6 @@
* @throws RuntimeException
*/
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 */
if ( $this->curItem[0] !== $elm
@@ -754,7 +750,6 @@
* @param string $elm Namespace and element
*/
private function endElementModeQDesc( $elm ) {
-
if ( $elm === self::NS_RDF . ' value' ) {
list( $ns, $tag ) = explode( ' ', $this->curItem[0], 2
);
$this->saveValue( $ns, $tag, $this->charContent );
@@ -1191,7 +1186,6 @@
* @throws RuntimeException
*/
function startElement( $parser, $elm, $attribs ) {
-
if ( $elm === self::NS_RDF . ' RDF'
|| $elm === 'adobe:ns:meta/ xmpmeta'
|| $elm === 'adobe:ns:meta/ xapmeta'
@@ -1332,7 +1326,6 @@
* @param string $val Value to save
*/
private function saveValue( $ns, $tag, $val ) {
-
$info =& $this->items[$ns][$tag];
$finalName = isset( $info['map_name'] )
? $info['map_name'] : $tag;
diff --git a/includes/media/BitmapMetadataHandler.php
b/includes/media/BitmapMetadataHandler.php
index c5f9cbb..35c9751 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -230,7 +230,6 @@
* @return array Metadata array
*/
public static function GIF( $filename ) {
-
$meta = new self();
$baseArray = GIFMetadataExtractor::getMetadata( $filename );
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 95fa859..9bfbc96 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -362,7 +362,6 @@
* if we make up our own types like Exif::DATE.
*/
function collapseData() {
-
$this->exifGPStoNumber( 'GPSLatitude' );
$this->exifGPStoNumber( 'GPSDestLatitude' );
$this->exifGPStoNumber( 'GPSLongitude' );
@@ -446,7 +445,6 @@
*/
private function charCodeString( $prop ) {
if ( isset( $this->mFilteredExifData[$prop] ) ) {
-
if ( strlen( $this->mFilteredExifData[$prop] ) <= 8 ) {
// invalid. Must be at least 9 bytes long.
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index b7ebfc9..343adc2 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -476,7 +476,6 @@
* only code that seems to have wide use. It does detect that code.
*/
static function getCharset( $tag ) {
-
// According to iim standard, charset is defined by the tag
1:90.
// in which there are iso 2022 escape sequences to specify the
character set.
// the iim standard seems to encourage that all necessary
escape sequences are
diff --git a/includes/media/JpegMetadataExtractor.php
b/includes/media/JpegMetadataExtractor.php
index 67c957a..211845c 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -94,7 +94,6 @@
$buffer = fread( $fh, 1 );
}
if ( $buffer === "\xFE" ) {
-
// COM section -- file comment
// First see if valid utf-8,
// if not try to convert it to windows-1252.
diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 8896264..76c979e 100644
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -157,7 +157,6 @@
*/
function convertMetadataVersion( $metadata, $version = 1 ) {
if ( !is_array( $metadata ) ) {
-
// unserialize to keep return parameter consistent.
MediaWiki\suppressWarnings();
$ret = unserialize( $metadata );
diff --git a/includes/media/PNG.php b/includes/media/PNG.php
index 294abb3..b6288bc 100644
--- a/includes/media/PNG.php
+++ b/includes/media/PNG.php
@@ -112,7 +112,6 @@
}
function isMetadataValid( $image, $metadata ) {
-
if ( $metadata === self::BROKEN_FILE ) {
// Do not repetitivly regenerate metadata on broken
file.
return self::METADATA_GOOD;
diff --git a/includes/media/TransformationalImageHandler.php
b/includes/media/TransformationalImageHandler.php
index 2a74e0d..742a5b7 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -156,7 +156,6 @@
&& $scalerParams['physicalHeight'] ==
$scalerParams['srcHeight']
&& !isset( $scalerParams['quality'] )
) {
-
# normaliseParams (or the user) wants us to return the
unscaled image
wfDebug( __METHOD__ . ": returning unscaled image\n" );
diff --git a/includes/page/Article.php b/includes/page/Article.php
index dd54232..656e610 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -214,7 +214,6 @@
* @since 1.21
*/
protected function getContentObject() {
-
if ( $this->mPage->getId() === 0 ) {
# If this is a MediaWiki:x message, then load the
messages
# and return the message value for x.
@@ -569,8 +568,8 @@
$outputPage->setRevisionTimestamp(
$this->mPage->getTimestamp() );
if ( !Hooks::run(
'ArticleContentViewCustom',
- [
$this->fetchContentObject(), $this->getTitle(), $outputPage ] ) ) {
-
+ [ $this->fetchContentObject(),
$this->getTitle(), $outputPage ] )
+ ) {
# Allow extensions do their own
custom view for certain pages
$outputDone = true;
}
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 5c7c7fe..3ba2d2e 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1314,7 +1314,6 @@
* @return bool
*/
public function updateIfNewerOn( $dbw, $revision ) {
-
$row = $dbw->selectRow(
[ 'revision', 'page' ],
[ 'rev_id', 'rev_timestamp', 'page_is_redirect' ],
@@ -1386,7 +1385,6 @@
public function replaceSectionContent(
$sectionId, Content $sectionContent, $sectionTitle = '',
$edittime = null
) {
-
$baseRevId = null;
if ( $edittime && $sectionId !== 'new' ) {
$dbr = wfGetDB( DB_REPLICA );
@@ -1425,7 +1423,6 @@
public function replaceSectionAtRev( $sectionId, Content
$sectionContent,
$sectionTitle = '', $baseRevId = null
) {
-
if ( strval( $sectionId ) === '' ) {
// Whole-page edit; let the whole text through
$newContent = $sectionContent;
diff --git a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index e34d10b..f0f1f5f 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -174,7 +174,6 @@
$magicWords = new MagicWordArray( [ 'url_path',
'url_query', 'url_wiki' ] );
}
switch ( $magicWords->matchStartToEnd( $arg ) ) {
-
// Encode as though it's a wiki page, '_' for ' '.
case 'url_wiki':
$func = 'wfUrlencode';
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b0d0e5c..9ea65e0 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1075,7 +1075,6 @@
* @return string
*/
public function doTableStuff( $text ) {
-
$lines = StringUtils::explode( "\n", $text );
$out = '';
$td_history = []; # Is currently a td tag open?
@@ -1279,7 +1278,6 @@
* @return string
*/
public function internalParse( $text, $isMain = true, $frame = false ) {
-
$origText = $text;
// Avoid PHP 7.1 warning from passing $this by reference
@@ -1855,7 +1853,6 @@
* @return string
*/
public function replaceExternalLinks( $text ) {
-
$bits = preg_split( $this->mExtLinkBracketedRegex, $text, -1,
PREG_SPLIT_DELIM_CAPTURE );
if ( $bits === false ) {
throw new MWException( "PCRE needs to be compiled with "
@@ -3031,7 +3028,6 @@
* @return string The text of the template
*/
public function braceSubstitution( $piece, $frame ) {
-
// Flags
// $text has been filled
@@ -3786,7 +3782,6 @@
* @return array
*/
public function argSubstitution( $piece, $frame ) {
-
$error = false;
$parts = $piece['parts'];
$nameWithSpaces = $frame->expand( $piece['title'] );
@@ -3967,7 +3962,6 @@
* @return string
*/
public function doDoubleUnderscore( $text ) {
-
# The position of __TOC__ needs to be recorded
$mw = MagicWord::get( 'toc' );
if ( $mw->match( $text ) ) {
@@ -4948,7 +4942,6 @@
* @return string HTML
*/
public function renderImageGallery( $text, $params ) {
-
$mode = false;
if ( isset( $params['mode'] ) ) {
$mode = $params['mode'];
diff --git a/includes/parser/Preprocessor_DOM.php
b/includes/parser/Preprocessor_DOM.php
index 7539307..3c750ad 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -148,7 +148,6 @@
* @return PPNode_DOM
*/
public function preprocessToObj( $text, $flags = 0 ) {
-
$xml = $this->cacheGetTree( $text, $flags );
if ( $xml === false ) {
$xml = $this->preprocessToXml( $text, $flags );
@@ -373,7 +372,6 @@
}
// Handle comments
if ( isset( $matches[2] ) && $matches[2] ==
'!--' ) {
-
// To avoid leaving blank lines, when a
sequence of
// space-separated comments is both
preceded and followed by
// a newline (ignoring spaces), then
diff --git a/includes/parser/Preprocessor_Hash.php
b/includes/parser/Preprocessor_Hash.php
index 597d1f2..25d253f 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -304,7 +304,6 @@
}
// Handle comments
if ( isset( $matches[2] ) && $matches[2] ==
'!--' ) {
-
// To avoid leaving blank lines, when a
sequence of
// space-separated comments is both
preceded and followed by
// a newline (ignoring spaces), then
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 743b69b..1c767fa 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -461,7 +461,6 @@
* @param array $localFileRefs List of files
*/
protected function saveFileDependencies( ResourceLoaderContext
$context, $localFileRefs ) {
-
try {
// Related bugs and performance considerations:
// 1. Don't needlessly change the database value with
the same list in a
@@ -757,7 +756,6 @@
// (e.g. startup module) iterate more than once over all
modules to get versions.
$contextHash = $context->getHash();
if ( !array_key_exists( $contextHash, $this->versionHash ) ) {
-
if ( $this->enableModuleContentVersion() ) {
// Detect changes directly
$str = json_encode( $this->getModuleContent(
$context ) );
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index d92dc0a..8973fe3 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -33,7 +33,6 @@
* @return array
*/
protected function getConfigSettings( $context ) {
-
$hash = $context->getHash();
if ( isset( $this->configVars[$hash] ) ) {
return $this->configVars[$hash];
@@ -135,7 +134,6 @@
// The list of implicit dependencies won't be altered, so we can
// cache them without having to worry.
if ( !isset( $dependencyCache[$moduleName] ) ) {
-
if ( !isset( $registryData[$moduleName] ) ) {
// Dependencies may not exist
$dependencyCache[$moduleName] = [];
diff --git a/includes/search/SearchNearMatcher.php
b/includes/search/SearchNearMatcher.php
index 0400021..8e86865 100644
--- a/includes/search/SearchNearMatcher.php
+++ b/includes/search/SearchNearMatcher.php
@@ -70,7 +70,6 @@
}
foreach ( $allSearchTerms as $term ) {
-
# Exact match? No need to look further.
$title = Title::newFromText( $term );
if ( is_null( $title ) ) {
diff --git a/includes/site/MediaWikiPageNameNormalizer.php
b/includes/site/MediaWikiPageNameNormalizer.php
index 1a079b4..c4e490a 100644
--- a/includes/site/MediaWikiPageNameNormalizer.php
+++ b/includes/site/MediaWikiPageNameNormalizer.php
@@ -69,7 +69,6 @@
* @throws \MWException
*/
public function normalizePageName( $pageName, $apiUrl ) {
-
// Check if we have strings as arguments.
if ( !is_string( $pageName ) ) {
throw new \MWException( '$pageName must be a string' );
diff --git a/includes/skins/MediaWikiI18N.php b/includes/skins/MediaWikiI18N.php
index 02e8391..7fcdb3c 100644
--- a/includes/skins/MediaWikiI18N.php
+++ b/includes/skins/MediaWikiI18N.php
@@ -33,7 +33,6 @@
}
function translate( $value ) {
-
// Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of
2004-10-23
$value = preg_replace( '/^string:/', '', $value );
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index e9d2f07..6834ca5 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1391,7 +1391,6 @@
* @return string
*/
function getNewtalks() {
-
$newMessagesAlert = '';
$user = $this->getUser();
$newtalks = $user->getNewMessageLinks();
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 1b561ef..0be0646 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -92,8 +92,8 @@
'showHideSuffix' =>
'showhideliu',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_user =
0';
},
'cssClassSuffix' => 'liu',
@@ -111,8 +111,8 @@
'showHideSuffix' =>
'showhideanons',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_user !=
0';
},
'cssClassSuffix' => 'anon',
@@ -182,8 +182,8 @@
'showHideSuffix' =>
'showhidemine',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$user = $ctx->getUser();
$conds[] =
'rc_user_text != ' . $dbr->addQuotes( $user->getName() );
},
@@ -198,8 +198,8 @@
'description' =>
'rcfilters-filter-editsbyother-description',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$user = $ctx->getUser();
$conds[] =
'rc_user_text = ' . $dbr->addQuotes( $user->getName() );
},
@@ -225,8 +225,8 @@
'showHideSuffix' =>
'showhidebots',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_bot = 0';
},
'cssClassSuffix' => 'bot',
@@ -240,8 +240,8 @@
'description' =>
'rcfilters-filter-humans-description',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_bot = 1';
},
'cssClassSuffix' => 'human',
@@ -269,8 +269,8 @@
'showHideSuffix' =>
'showhideminor',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_minor =
0';
},
'cssClassSuffix' => 'minor',
@@ -284,8 +284,8 @@
'description' =>
'rcfilters-filter-major-description',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_minor =
1';
},
'cssClassSuffix' => 'major',
@@ -347,8 +347,8 @@
'default' => false,
'priority' => -2,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_type !=
' . $dbr->addQuotes( RC_EDIT );
},
'cssClassSuffix' =>
'src-mw-edit',
@@ -363,8 +363,8 @@
'default' => false,
'priority' => -3,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_type !=
' . $dbr->addQuotes( RC_NEW );
},
'cssClassSuffix' =>
'src-mw-new',
@@ -382,8 +382,8 @@
'default' => false,
'priority' => -5,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] = 'rc_type !=
' . $dbr->addQuotes( RC_LOG );
},
'cssClassSuffix' =>
'src-mw-log',
@@ -412,8 +412,8 @@
'showHideSuffix' =>
'showhidepatr',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] =
'rc_patrolled = 0';
},
'cssClassSuffix' => 'patrolled',
@@ -427,8 +427,8 @@
'description' =>
'rcfilters-filter-unpatrolled-description',
'default' => false,
'queryCallable' => function (
$specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
- &$query_options,
&$join_conds ) {
-
+ &$query_options,
&$join_conds
+ ) {
$conds[] =
'rc_patrolled = 1';
},
'cssClassSuffix' =>
'unpatrolled',
@@ -450,8 +450,8 @@
'default' => false,
'priority' => -4,
'queryCallable' => function ( $specialClassName, $ctx,
$dbr, &$tables, &$fields, &$conds,
- &$query_options, &$join_conds ) {
-
+ &$query_options, &$join_conds
+ ) {
$conds[] = 'rc_type != ' . $dbr->addQuotes(
RC_CATEGORIZE );
},
'cssClassSuffix' => 'src-mw-categorize',
@@ -470,7 +470,6 @@
$opts = $this->getOptions();
/** @var ChangesListFilterGroup $group */
foreach ( $this->getFilterGroups() as $group ) {
-
if ( $group->getConflictingGroups() ) {
wfLogWarning(
$group->getName() .
@@ -487,7 +486,6 @@
/** @var ChangesListFilter $filter */
foreach ( $group->getFilters() as $filter ) {
-
/** @var ChangesListFilter $conflictingFilter */
foreach ( $filter->getConflictingFilters() as
$conflictingFilter ) {
if (
@@ -1061,8 +1059,8 @@
* @param FormOptions $opts
*/
protected function buildQuery( &$tables, &$fields, &$conds,
&$query_options,
- &$join_conds, FormOptions $opts ) {
-
+ &$join_conds, FormOptions $opts
+ ) {
$dbr = $this->getDB();
$user = $this->getUser();
@@ -1121,8 +1119,8 @@
* @return bool|ResultWrapper Result or false
*/
protected function doMainQuery( $tables, $fields, $conds,
- $query_options, $join_conds, FormOptions $opts ) {
-
+ $query_options, $join_conds, FormOptions $opts
+ ) {
$tables[] = 'recentchanges';
$fields = array_merge( RecentChange::selectFields(), $fields );
@@ -1332,8 +1330,8 @@
* (optional)
*/
public function filterOnUserExperienceLevel( $specialPageClassName,
$context, $dbr,
- &$tables, &$fields, &$conds, &$query_options, &$join_conds,
$selectedExpLevels, $now = 0 ) {
-
+ &$tables, &$fields, &$conds, &$query_options, &$join_conds,
$selectedExpLevels, $now = 0
+ ) {
global $wgLearnerEdits,
$wgExperiencedUserEdits,
$wgLearnerMemberSince,
diff --git a/includes/specialpage/QueryPage.php
b/includes/specialpage/QueryPage.php
index 93873c0..73b8128 100644
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -601,7 +601,6 @@
# Get the cached result, select one extra row for
navigation
$res = $this->fetchFromCache( $dbLimit, $this->offset );
if ( !$this->listoutput ) {
-
# Fetch the timestamp of this update
$ts = $this->getCachedTimestamp();
$lang = $this->getLanguage();
diff --git a/includes/specialpage/SpecialPageFactory.php
b/includes/specialpage/SpecialPageFactory.php
index 88336dd..8dcb30c 100644
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -234,7 +234,6 @@
global $wgPageLanguageUseDB, $wgContentHandlerUseDB;
if ( !is_array( self::$list ) ) {
-
self::$list = self::$coreList;
if ( !$wgDisableInternalSearch ) {
diff --git a/includes/specials/SpecialChangeEmail.php
b/includes/specials/SpecialChangeEmail.php
index eb98fe7..c514300 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -63,7 +63,6 @@
}
protected function checkExecutePermissions( User $user ) {
-
if ( !AuthManager::singleton()->allowsPropertyChange(
'emailaddress' ) ) {
throw new ErrorPageError( 'changeemail',
'cannotchangeemail' );
}
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 40706ac..3845649 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -329,7 +329,6 @@
* @return array
*/
public static function getUserLinks( SpecialPage $sp, User $target ) {
-
$id = $target->getId();
$username = $target->getName();
$userpage = $target->getUserPage();
diff --git a/includes/specials/SpecialExport.php
b/includes/specials/SpecialExport.php
index f5e9e49..d5c5528 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -330,7 +330,6 @@
* @param bool $exportall Whether to export everything
*/
private function doExport( $page, $history, $list_authors, $exportall )
{
-
// If we are grabbing everything, enable full history and
ignore the rest
if ( $exportall ) {
$history = WikiExporter::FULL;
diff --git a/includes/specials/SpecialPageData.php
b/includes/specials/SpecialPageData.php
index f7084a8..c52c426 100644
--- a/includes/specials/SpecialPageData.php
+++ b/includes/specials/SpecialPageData.php
@@ -48,7 +48,6 @@
* @return PageDataRequestHandler
*/
private function newDefaultRequestHandler() {
-
return new PageDataRequestHandler();
}
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 75d104b..21f6b69 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -367,8 +367,8 @@
* @inheritdoc
*/
protected function buildQuery( &$tables, &$fields, &$conds,
- &$query_options, &$join_conds, FormOptions $opts ) {
-
+ &$query_options, &$join_conds, FormOptions $opts
+ ) {
$dbr = $this->getDB();
parent::buildQuery( $tables, $fields, $conds,
$query_options, $join_conds, $opts );
@@ -392,8 +392,8 @@
* @inheritdoc
*/
protected function doMainQuery( $tables, $fields, $conds,
$query_options,
- $join_conds, FormOptions $opts ) {
-
+ $join_conds, FormOptions $opts
+ ) {
$dbr = $this->getDB();
$user = $this->getUser();
diff --git a/includes/specials/SpecialRecentchangeslinked.php
b/includes/specials/SpecialRecentchangeslinked.php
index 873285b..b3b9210 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -50,8 +50,8 @@
* @inheritdoc
*/
protected function doMainQuery( $tables, $select, $conds,
$query_options,
- $join_conds, FormOptions $opts ) {
-
+ $join_conds, FormOptions $opts
+ ) {
$target = $opts['target'];
$showlinkedto = $opts['showlinkedto'];
$limit = $opts['limit'];
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index e89dbc9..e5adeb5 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -399,7 +399,6 @@
$mainResultWidget = new FullSearchResultWidget( $this,
$linkRenderer );
if ( $search->getFeatureData( 'enable-new-crossproject-page' )
) {
-
$sidebarResultWidget = new InterwikiSearchResultWidget(
$this, $linkRenderer );
$sidebarResultsWidget = new
InterwikiSearchResultSetWidget(
$this,
diff --git a/includes/specials/SpecialSpecialpages.php
b/includes/specials/SpecialSpecialpages.php
index b18b370..451669c 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -96,7 +96,6 @@
$includesCachedPages = false;
foreach ( $groups as $group => $sortedPages ) {
-
$out->wrapWikiMsg(
"<h2 class=\"mw-specialpagesgroup\"
id=\"mw-specialpagesgroup-$group\">$1</h2>\n",
"specialpages-group-$group"
diff --git a/includes/specials/SpecialStatistics.php
b/includes/specials/SpecialStatistics.php
index 19850e6..a60549b 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -253,7 +253,6 @@
foreach ( $stats as $header => $items ) {
// Identify the structure used
if ( is_array( $items ) ) {
-
// Ignore headers that are recursively set as
legacy header
if ( $header !== 'statistics-header-hooks' ) {
$return .= $this->formatRowHeader(
$header );
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index def639d..073e58d 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -678,7 +678,6 @@
*/
protected function processVerificationError( $details ) {
switch ( $details['status'] ) {
-
/** Statuses that only require name changing **/
case UploadBase::MIN_LENGTH_PARTNAME:
$this->showRecoverableUploadError( $this->msg(
'minlength1' )->escaped() );
diff --git a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index d0a0317..0a712ef 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -326,8 +326,8 @@
* @return array Tuple of added, then removed groups
*/
function doSaveUserGroups( $user, $add, $remove, $reason = '', $tags =
[],
- $groupExpiries = [] ) {
-
+ $groupExpiries = []
+ ) {
// Validate input set...
$isself = $user->getName() == $this->getUser()->getName();
$groups = $user->getGroups();
@@ -433,8 +433,8 @@
* @param array $newUGMs Associative array of (group name =>
UserGroupMembership)
*/
protected function addLogEntry( $user, $oldGroups, $newGroups, $reason,
$tags,
- $oldUGMs, $newUGMs ) {
-
+ $oldUGMs, $newUGMs
+ ) {
// make sure $oldUGMs and $newUGMs are in the same order, and
serialise
// each UGM object to a simplified array
$oldUGMs = array_map( function ( $group ) use ( $oldUGMs ) {
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index e9d3f26..65131ec 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -246,8 +246,8 @@
* @inheritdoc
*/
protected function buildQuery( &$tables, &$fields, &$conds,
&$query_options,
- &$join_conds, FormOptions $opts ) {
-
+ &$join_conds, FormOptions $opts
+ ) {
$dbr = $this->getDB();
parent::buildQuery( $tables, $fields, $conds, $query_options,
$join_conds,
$opts );
@@ -263,8 +263,8 @@
* @inheritdoc
*/
protected function doMainQuery( $tables, $fields, $conds,
$query_options,
- $join_conds, FormOptions $opts ) {
-
+ $join_conds, FormOptions $opts
+ ) {
$dbr = $this->getDB();
$user = $this->getUser();
diff --git a/includes/title/MediaWikiTitleCodec.php
b/includes/title/MediaWikiTitleCodec.php
index 7a71714..0fff97c 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -86,7 +86,6 @@
if ( $this->language->needsGenderDistinction() &&
MWNamespace::hasGenderDistinction( $namespace )
) {
-
// NOTE: we are assuming here that the title text is a
user name!
$gender = $this->genderCache->getGenderOf( $text,
__METHOD__ );
$name = $this->language->getGenderNsText( $namespace,
$gender );
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 57bb22a..f08f4cf 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -321,7 +321,6 @@
* @return mixed Const self::OK or else an array with error information
*/
public function verifyUpload() {
-
/**
* If there was no filename or a zero size given, give up quick.
*/
@@ -1431,7 +1430,6 @@
* @return bool
*/
public function checkSvgScriptCallback( $element, $attribs, $data =
null ) {
-
list( $namespace, $strippedElement ) =
$this->splitXmlNamespace( $element );
// We specifically don't include:
@@ -1666,7 +1664,6 @@
* @return bool true if the CSS contains an illegal string, false if
otherwise
*/
private static function checkCssFragment( $value ) {
-
# Forbid external stylesheets, for both reliability and to
protect viewer's privacy
if ( stripos( $value, '@import' ) !== false ) {
return true;
diff --git a/includes/user/UserGroupMembership.php
b/includes/user/UserGroupMembership.php
index cf05df3..a06be83 100644
--- a/includes/user/UserGroupMembership.php
+++ b/includes/user/UserGroupMembership.php
@@ -344,8 +344,8 @@
* @return string
*/
public static function getLink( $ugm, IContextSource $context, $format,
- $userName = null ) {
-
+ $userName = null
+ ) {
if ( $format !== 'wiki' && $format !== 'html' ) {
throw new MWException( 'UserGroupMembership::getLink()
$format parameter should be ' .
"'wiki' or 'html'" );
diff --git a/includes/utils/AutoloadGenerator.php
b/includes/utils/AutoloadGenerator.php
index 54a8677..8931e3c 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -137,13 +137,11 @@
// format class-name : path when they get converted into json.
foreach ( $this->classes as $path => $contained ) {
foreach ( $contained as $fqcn ) {
-
// Using substr to remove the leading '/'
$json[$key][$fqcn] = substr( $path, 1 );
}
}
foreach ( $this->overrides as $path => $fqcn ) {
-
// Using substr to remove the leading '/'
$json[$key][$fqcn] = substr( $path, 1 );
}
@@ -223,7 +221,6 @@
* @return string
*/
public function getAutoload( $commandName = 'AutoloadGenerator' ) {
-
// We need to check whether an extenson.json or skin.json
exists or not, and
// incase it doesn't, update the autoload.php file.
diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index ef93362..9145bb6 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -123,7 +123,6 @@
* @return string HTML
*/
protected function footerHtml( $term, $iwPrefix ) {
-
$href = Title::makeTitle( NS_SPECIAL, 'Search', null, $iwPrefix
)->getLocalURL(
[ 'search' => $term, 'fulltext' => 1 ]
);
@@ -171,7 +170,6 @@
* @return OOUI\IconWidget
**/
protected function iwIcon( $iwPrefix ) {
-
$interwiki = $this->iwLookup->fetch( $iwPrefix );
$parsed = wfParseUrl( wfExpandUrl( $interwiki ?
$interwiki->getURL() : '/' ) );
diff --git a/includes/widget/search/InterwikiSearchResultWidget.php
b/includes/widget/search/InterwikiSearchResultWidget.php
index 861fb6d..bcd1c16 100644
--- a/includes/widget/search/InterwikiSearchResultWidget.php
+++ b/includes/widget/search/InterwikiSearchResultWidget.php
@@ -29,7 +29,6 @@
* @return string HTML
*/
public function render( SearchResult $result, $terms, $position ) {
-
$title = $result->getTitle();
$iwPrefix = $result->getTitle()->getInterwiki();
$titleSnippet = $result->getTitleSnippet();
@@ -46,7 +45,6 @@
$redirectTitle = $result->getRedirectTitle();
$redirect = '';
if ( $redirectTitle !== null ) {
-
$redirectText = $result->getRedirectSnippet();
if ( $redirectText ) {
diff --git a/languages/Language.php b/languages/Language.php
index b5eef8c..83dff65 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -361,7 +361,6 @@
* @return bool
*/
public static function isValidBuiltInCode( $code ) {
-
if ( !is_string( $code ) ) {
if ( is_object( $code ) ) {
$addmsg = " of class " . get_class( $code );
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 2137786..6d0368c 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -339,7 +339,6 @@
* @return string The converted text
*/
public function autoConvert( $text, $toVariant = false ) {
-
$this->loadTables();
if ( !$toVariant ) {
diff --git a/languages/classes/LanguageBe_tarask.php
b/languages/classes/LanguageBe_tarask.php
index 56faa4a..6007bb4 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -44,7 +44,6 @@
* @return string
*/
function normalizeForSearch( $string ) {
-
# MySQL fulltext index doesn't grok utf-8, so we
# need to fold cases and convert to hex
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 3a50987..f6f03c4 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -86,7 +86,6 @@
}
function loadRegs() {
-
$this->mCyrl2Latn = [
# # Punctuation
'/№/u' => 'No.',
@@ -423,7 +422,6 @@
* @return string
*/
function convertGrammar( $word, $case ) {
-
$variant = $this->getPreferredVariant();
switch ( $variant ) {
case 'kk-arab':
diff --git a/languages/classes/LanguageKu_ku.php
b/languages/classes/LanguageKu_ku.php
index e745965..4e9c365 100644
--- a/languages/classes/LanguageKu_ku.php
+++ b/languages/classes/LanguageKu_ku.php
@@ -37,7 +37,6 @@
* @return string
*/
function commafy( $_ ) {
-
if ( !preg_match( '/^\d{1,4}$/', $_ ) ) {
return strrev( (string)preg_replace(
'/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
} else {
diff --git a/languages/classes/LanguageYue.php
b/languages/classes/LanguageYue.php
index d5f3e76..1107fa6 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -54,7 +54,6 @@
* @return string
*/
function normalizeForSearch( $string ) {
-
// Double-width roman characters
$s = self::convertDoubleWidth( $string );
$s = trim( $s );
diff --git a/languages/classes/LanguageZh_hans.php
b/languages/classes/LanguageZh_hans.php
index 77a41e1..9d81c21 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -56,7 +56,6 @@
* @return string
*/
function normalizeForSearch( $s ) {
-
// Double-width roman characters
$s = parent::normalizeForSearch( $s );
$s = trim( $s );
diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index 49bd05c..3910f29 100644
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -168,7 +168,6 @@
* @return array Resulting list of changed files
*/
private function getGitModifiedFiles( $path ) {
-
global $wgMaxShellMemory;
if ( !is_dir( "$path/.git" ) ) {
diff --git a/maintenance/deleteOldRevisions.php
b/maintenance/deleteOldRevisions.php
index 24a63a3..9559623 100644
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -43,7 +43,6 @@
}
function doDelete( $delete = false, $args = [] ) {
-
# Data should come off the master, wrapped in a transaction
$dbw = $this->getDB( DB_MASTER );
$this->beginTransaction( $dbw, __METHOD__ );
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index c6e9aad..2b79b54 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -575,7 +575,6 @@
}
while ( $failures < $this->maxFailures ) {
-
// As soon as we found a good text for the $id, we will
return immediately.
// Hence, if we make it past the try catch block, we
know that we did not
// find a good text.
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index b3866c1..625e1f7 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -185,9 +185,7 @@
# Batch "upload" operation
$count = count( $files );
if ( $count > 0 ) {
-
foreach ( $files as $file ) {
-
if ( $sleep && ( $processed > 0 ) ) {
sleep( $sleep );
}
diff --git a/maintenance/language/checkDupeMessages.php
b/maintenance/language/checkDupeMessages.php
index baf917c..92ddc44 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -93,7 +93,6 @@
$count = 0;
if ( ( $messageExist ) && ( $messageCExist ) ) {
-
if ( !strcmp( $runMode, 'php' ) ) {
print "<?php\n";
print '$dupeMessages = [' . "\n";
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 0bd627f..4a2b49a 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -256,7 +256,6 @@
$ok = true;
foreach ( $targets as $row ) {
-
// Find the new title and determine the action to take
$newTitle = $this->getDestinationTitle( $ns, $name,
diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php
index de037dc..ff821cc 100644
--- a/maintenance/nukePage.php
+++ b/maintenance/nukePage.php
@@ -39,7 +39,6 @@
}
public function execute() {
-
$name = $this->getArg();
$delete = $this->getOption( 'delete', false );
diff --git a/maintenance/oracle/alterSharedConstraints.php
b/maintenance/oracle/alterSharedConstraints.php
index 48c3d37..ed412da 100644
--- a/maintenance/oracle/alterSharedConstraints.php
+++ b/maintenance/oracle/alterSharedConstraints.php
@@ -67,8 +67,8 @@
AND ucc.constraint_name =
uc.constraint_name
AND uccpk.constraint_name =
uc.r_constraint_name
AND uccpk.table_name =
'$ltable'" );
- while ( ( $row = $result->fetchRow() ) !== false ) {
+ while ( ( $row = $result->fetchRow() ) !== false ) {
$this->output( "Altering
{$row['constraint_name']} ..." );
try {
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 9f3552a..facc506 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -178,7 +178,6 @@
$this->output( "Starting from page_id $start of
$end.\n" );
for ( $id = $start; $id <= $end; $id++ ) {
-
if ( !( $id % self::REPORTING_INTERVAL ) ) {
$this->output( "$id\n" );
wfWaitForSlaves();
@@ -191,7 +190,6 @@
$this->output( "Starting from page_id $start of
$end.\n" );
for ( $id = $start; $id <= $end; $id++ ) {
-
if ( !( $id % self::REPORTING_INTERVAL
) ) {
$this->output( "$id\n" );
wfWaitForSlaves();
diff --git a/maintenance/removeUnusedAccounts.php
b/maintenance/removeUnusedAccounts.php
index ec8fcfe..c750784 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -39,7 +39,6 @@
}
public function execute() {
-
$this->output( "Remove unused accounts\n\n" );
# Do an initial scan for inactive accounts and report the result
diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc
index c657c03..5d773d1 100644
--- a/maintenance/userOptions.inc
+++ b/maintenance/userOptions.inc
@@ -82,7 +82,6 @@
* @return bool
*/
private function initializeOpts( $opts, $args ) {
-
$this->mQuick = isset( $opts['nowarn'] );
$this->mQuiet = isset( $opts['quiet'] );
$this->mDry = isset( $opts['dry'] );
@@ -149,12 +148,10 @@
);
foreach ( $result as $id ) {
-
$user = User::newFromId( $id->user_id );
// Get the options and update stats
if ( $this->mAnOption ) {
-
if ( !array_key_exists( $this->mAnOption,
$defaultOptions ) ) {
print "Invalid user option. Use --list
to see valid choices\n";
exit;
@@ -203,14 +200,12 @@
);
foreach ( $result as $id ) {
-
$user = User::newFromId( $id->user_id );
$curValue = $user->getOption( $this->mAnOption );
$username = $user->getName();
if ( $curValue == $this->mOldValue ) {
-
if ( !$this->mQuiet ) {
print "Setting {$this->mAnOption} for
$username from '{$this->mOldValue}' " .
"to '{$this->mNewValue}'): ";
@@ -279,7 +274,6 @@
* @return bool
*/
public function warn() {
-
if ( $this->mQuick ) {
return true;
}
diff --git a/mw-config/index.php b/mw-config/index.php
index be9debc..10b8d97 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -44,7 +44,6 @@
$installer = InstallerOverrides::getWebInstaller( $wgRequest );
if ( !$installer->startSession() ) {
-
if ( $installer->request->getVal( "css" ) ) {
// Do not display errors on css pages
$installer->outputCss();
diff --git a/phpcs.xml b/phpcs.xml
index 7eca9ea..f46817c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -17,9 +17,6 @@
<exclude
name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd"
/>
<exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures"
/>
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
- <exclude
name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment"
/>
<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index c2eebfa..26ee420 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1049,7 +1049,6 @@
private function addCoreDBData() {
if ( $this->db->getType() == 'oracle' ) {
-
# Insert 0 user to prevent FK violations
# Anonymous user
if ( !$this->db->selectField( 'user', '1', [ 'user_id'
=> 0 ] ) ) {
@@ -1713,7 +1712,6 @@
if ( !isset( $wgNamespaceContentModels[$ns] ) ||
$wgNamespaceContentModels[$ns] ===
CONTENT_MODEL_WIKITEXT
) {
-
$wikitextNS = $ns;
return $wikitextNS;
diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 33b6e2f..5e54b8d 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -362,7 +362,6 @@
* @covers ::wfClientAcceptsGzip
*/
public function testClientAcceptsGzipTest() {
-
$settings = [
'gzip' => true,
'bzip' => false,
@@ -396,7 +395,6 @@
* @covers ::wfPercent
*/
public function testWfPercentTest() {
-
$pcts = [
[ 6 / 7, '0.86%', 2, false ],
[ 3 / 3, '1%' ],
diff --git a/tests/phpunit/includes/LinkerTest.php
b/tests/phpunit/includes/LinkerTest.php
index 2ca5935..3e3fb0f 100644
--- a/tests/phpunit/includes/LinkerTest.php
+++ b/tests/phpunit/includes/LinkerTest.php
@@ -265,7 +265,6 @@
* @dataProvider provideCasesForFormatLinksInComment
*/
public function testFormatLinksInComment( $expected, $input, $wiki ) {
-
$conf = new SiteConfiguration();
$conf->settings = [
'wgServer' => [
diff --git a/tests/phpunit/includes/WatchedItemIntegrationTest.php
b/tests/phpunit/includes/WatchedItemIntegrationTest.php
index 65a8c86..01e7ecb 100644
--- a/tests/phpunit/includes/WatchedItemIntegrationTest.php
+++ b/tests/phpunit/includes/WatchedItemIntegrationTest.php
@@ -28,7 +28,6 @@
}
public function testWatchAndUnWatchItem() {
-
$user = $this->getUser();
$title = Title::newFromText( 'WatchedItemIntegrationTestPage' );
// Cleanup after previous tests
diff --git a/tests/phpunit/includes/api/generateRandomImages.php
b/tests/phpunit/includes/api/generateRandomImages.php
index d499714..d4a5acf 100644
--- a/tests/phpunit/includes/api/generateRandomImages.php
+++ b/tests/phpunit/includes/api/generateRandomImages.php
@@ -16,7 +16,6 @@
}
public function execute() {
-
$getOptSpec = [
'dictionaryFile::',
'minWidth::',
diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index fbc794e..c612f26 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -248,7 +248,6 @@
* Test basic lists
*/
public function testAllTogether() {
-
// All props together
$this->check( $this->merge(
self::$links,
diff --git a/tests/phpunit/includes/changes/TestRecentChangesHelper.php
b/tests/phpunit/includes/changes/TestRecentChangesHelper.php
index 2f908fe..4da09d8 100644
--- a/tests/phpunit/includes/changes/TestRecentChangesHelper.php
+++ b/tests/phpunit/includes/changes/TestRecentChangesHelper.php
@@ -12,7 +12,6 @@
public function makeEditRecentChange( User $user, $titleText, $curid,
$thisid, $lastid,
$timestamp, $counter, $watchingUsers
) {
-
$attribs = array_merge(
$this->getDefaultAttributes( $titleText, $timestamp ),
[
@@ -72,7 +71,6 @@
public function makeNewBotEditRecentChange( User $user, $titleText,
$curid, $thisid, $lastid,
$timestamp, $counter, $watchingUsers
) {
-
$attribs = array_merge(
$this->getDefaultAttributes( $titleText, $timestamp ),
[
@@ -111,7 +109,6 @@
public function makeCategorizationRecentChange(
User $user, $titleText, $curid, $thisid, $lastid, $timestamp
) {
-
$attribs = array_merge(
$this->getDefaultAttributes( $titleText, $timestamp ),
[
diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
index 8e06f9e..bdb4831 100644
--- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
+++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
@@ -27,7 +27,6 @@
}
public function testImportForImportSource() {
-
$this->doImport( $this->importStreamSource );
// Imported title
@@ -56,7 +55,6 @@
* @depends testImportForImportSource
*/
public function testReImportForImportSource() {
-
$this->doImport( $this->importStreamSource );
// ReImported title
@@ -76,7 +74,6 @@
}
private function doImport( $importStreamSource ) {
-
$importer = new WikiImporter(
$importStreamSource->value,
MediaWikiServices::getInstance()->getMainConfig()
diff --git a/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php
b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php
index 1d62a78..31c9e50 100644
--- a/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php
+++ b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php
@@ -39,7 +39,6 @@
}
public function testFetch() {
-
$interwiki = $this->interwikiLookup->fetch( '' );
$this->assertNull( $interwiki );
diff --git a/tests/phpunit/includes/libs/xmp/XMPTest.php
b/tests/phpunit/includes/libs/xmp/XMPTest.php
index 9291eb6..5eee8b8 100644
--- a/tests/phpunit/includes/libs/xmp/XMPTest.php
+++ b/tests/phpunit/includes/libs/xmp/XMPTest.php
@@ -181,7 +181,6 @@
* @covers XMPReader::checkParseSafety
*/
public function testCheckParseSafety() {
-
// Test for detection
$xmpPath = __DIR__ . '/../../../data/xmp/';
$file = fopen( $xmpPath . 'doctype-included.xmp', 'rb' );
diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
index 666dcf2..2b18b08 100644
--- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
+++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
@@ -77,7 +77,6 @@
}
public function handleRequestProvider() {
-
$cases = [];
$cases[] = [ '', [], [], '!!', 400 ];
diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
index 1044e52..278b441 100644
--- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -24,7 +24,6 @@
}
public static function provideGetMetadata() {
-
$xmpNugget = <<<EOF
<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 7.30'>
diff --git a/tests/phpunit/includes/password/UserPasswordPolicyTest.php
b/tests/phpunit/includes/password/UserPasswordPolicyTest.php
index 3bd82b4..0839cfb 100644
--- a/tests/phpunit/includes/password/UserPasswordPolicyTest.php
+++ b/tests/phpunit/includes/password/UserPasswordPolicyTest.php
@@ -58,7 +58,6 @@
}
public function testGetPoliciesForUser() {
-
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( 'TestUserPolicy' );
@@ -100,7 +99,6 @@
* @dataProvider provideCheckUserPassword
*/
public function testCheckUserPassword( $username, $groups, $password,
$valid, $ok, $msg ) {
-
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( $username );
diff --git a/tests/phpunit/includes/specials/SpecialPreferencesTest.php
b/tests/phpunit/includes/specials/SpecialPreferencesTest.php
index fd587bf..ac58d68 100644
--- a/tests/phpunit/includes/specials/SpecialPreferencesTest.php
+++ b/tests/phpunit/includes/specials/SpecialPreferencesTest.php
@@ -21,7 +21,6 @@
* @todo give this test a real name explaining what is being tested here
*/
public function testBug41337() {
-
// Set a low limit
$this->setMwGlobals( 'wgMaxSigChars', 2 );
diff --git a/tests/phpunit/includes/title/ForeignTitleTest.php
b/tests/phpunit/includes/title/ForeignTitleTest.php
index b6c2427..25ff186 100644
--- a/tests/phpunit/includes/title/ForeignTitleTest.php
+++ b/tests/phpunit/includes/title/ForeignTitleTest.php
@@ -51,8 +51,8 @@
* @dataProvider basicProvider
*/
public function testBasic( ForeignTitle $title, $expectedId,
$expectedName,
- $expectedText ) {
-
+ $expectedText
+ ) {
$this->assertEquals( true, $title->isNamespaceIdKnown() );
$this->assertEquals( $expectedId, $title->getNamespaceId() );
$this->assertEquals( $expectedName, $title->getNamespaceName()
);
diff --git
a/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
b/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
index 520108a..9aa3578d 100644
--- a/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
@@ -76,7 +76,6 @@
* @dataProvider basicProvider
*/
public function testBasic( $title, $ns, ForeignTitle $foreignTitle ) {
-
$foreignNamespaces = [
0 => '', 1 => 'Talk', 100 => 'Portal', 9000 => 'Bogus'
];
diff --git a/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
b/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
index baeb95c..93ce080 100644
--- a/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
@@ -60,8 +60,8 @@
* @dataProvider basicProvider
*/
public function testBasic( ForeignTitle $foreignTitle, Title $rootPage,
- Title $title ) {
-
+ Title $title
+ ) {
$factory = new SubpageImportTitleFactory( $rootPage );
$testTitle = $factory->createTitleFromForeignTitle(
$foreignTitle );
diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php
b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
index 760d41e..86c19ae 100644
--- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
@@ -40,7 +40,6 @@
* Test vectors from Appendix A on https://tools.ietf.org/html/rfc5869
*/
public static function providerRfc5869() {
-
// @codingStandardsIgnoreStart Generic.Files.LineLength
return [
// A.1
diff --git a/tests/phpunit/maintenance/DumpTestCase.php
b/tests/phpunit/maintenance/DumpTestCase.php
index 1d55ab8..99bd427 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -298,7 +298,6 @@
* @param string $name Title of the current page
*/
protected function assertPageStart( $id, $ns, $name ) {
-
$this->assertNodeStart( "page" );
$this->skipWhitespace();
@@ -393,7 +392,6 @@
if ( ( $this->xml->nodeType == XMLReader::END_ELEMENT )
&& ( $this->xml->name == "text" )
) {
-
$this->xml->read();
}
$this->skipWhitespace();
diff --git a/tests/phpunit/maintenance/MaintenanceTest.php
b/tests/phpunit/maintenance/MaintenanceTest.php
index 6b0e344..e21e726 100644
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -52,7 +52,6 @@
* Simulates what Maintenance wants to happen at script's end.
*/
public function simulateShutdown() {
-
if ( $this->shutdownSimulated ) {
$this->testCase->fail( __METHOD__ . " called more than
once" );
}
@@ -175,7 +174,6 @@
* after shutdown simulation.
*/
private function assertOutputPrePostShutdown( $preShutdownOutput,
$expectNLAppending ) {
-
$this->assertEquals( $preShutdownOutput,
$this->getActualOutput(),
"Output before shutdown simulation" );
diff --git a/tests/phpunit/maintenance/backupTextPassTest.php
b/tests/phpunit/maintenance/backupTextPassTest.php
index ea5ca8d..8242c79 100644
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -265,7 +265,6 @@
// duration. If the dump did not take long enough increase the
iteration
// count, to generate a bigger stub file next time.
while ( $lastDuration < $minDuration ) {
-
// Setting up the dump
wfRecursiveRemoveDir( $nameOutputDir );
$this->assertTrue( wfMkdirParents( $nameOutputDir ),
@@ -323,7 +322,6 @@
// Each run of the following loop body tries to handle exactly
1 /page/ (not
// iteration of stub content). $i is only increased after
having treated page 4.
for ( $i = 0; $i < $iterations; ) {
-
// 1. Assuring a file is opened and ready. Skipping
across header if
// necessary.
if ( !$fileOpened ) {
@@ -511,7 +509,6 @@
$content = $header;
$iterations = intval( $iterations );
for ( $i = 0; $i < $iterations; $i++ ) {
-
$page1 = ' <page>
<title>BackupDumperTestP1</title>
<ns>0</ns>
diff --git a/tests/phpunit/maintenance/backup_LogTest.php
b/tests/phpunit/maintenance/backup_LogTest.php
index 0019a3f..91e1b1e 100644
--- a/tests/phpunit/maintenance/backup_LogTest.php
+++ b/tests/phpunit/maintenance/backup_LogTest.php
@@ -104,7 +104,6 @@
private function assertLogItem( $id, $user_name, $user_id, $comment,
$type,
$subtype, $title, $parameters = []
) {
-
$this->assertNodeStart( "logitem" );
$this->skipWhitespace();
diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 39baf17..d7da5a0 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -202,7 +202,6 @@
return {
setup: function () {
-
// Greetings, mock environment!
mw.config = new MwMap();
mw.config.set( freshConfigCopy(
localEnv.config ) );
--
To view, visit https://gerrit.wikimedia.org/r/362704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb767729b481b4b686e6d6444cf48b1f580cc478
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
