Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319979
Change subject: Remove empty lines at end of functions
......................................................................
Remove empty lines at end of functions
It looks like there is something missing after the last statement
Also remove some other empty lines at begin of functions, ifs or loops
while at these files
Change-Id: Ib00b5cfd31ca4dcd0c32ce33754d3c80bae70641
---
M includes/AjaxDispatcher.php
M includes/EditPage.php
M includes/Feed.php
M includes/MediaWikiServices.php
M includes/OutputPage.php
M includes/Preferences.php
M includes/Title.php
M includes/Xml.php
M includes/actions/HistoryAction.php
M includes/api/ApiQuerySiteinfo.php
M includes/cache/UserCache.php
M includes/cache/localisation/LocalisationCache.php
M includes/deferred/SearchUpdate.php
M includes/diff/WordLevelDiff.php
M includes/filerepo/file/OldLocalFile.php
M includes/htmlform/fields/HTMLSelectAndOtherField.php
M includes/htmlform/fields/HTMLSelectNamespace.php
M includes/htmlform/fields/HTMLSelectOrOtherField.php
M includes/http/MWHttpRequest.php
M includes/installer/DatabaseInstaller.php
M includes/libs/CSSMin.php
M includes/libs/filebackend/SwiftFileBackend.php
M includes/libs/mime/XmlTypeCheck.php
M includes/libs/virtualrest/ParsoidVirtualRESTService.php
M includes/libs/virtualrest/RestbaseVirtualRESTService.php
M includes/media/FormatMetadata.php
M includes/page/ImagePage.php
M includes/parser/LinkHolderArray.php
M includes/parser/ParserOptions.php
M includes/resourceloader/ResourceLoader.php
M includes/search/SearchPostgres.php
M includes/skins/BaseTemplate.php
M includes/skins/SkinTemplate.php
M includes/specialpage/LoginSignupSpecialPage.php
M includes/specials/SpecialSearch.php
M includes/user/User.php
M languages/classes/LanguageSr.php
M languages/classes/LanguageZh.php
M maintenance/Maintenance.php
M maintenance/checkComposerLockUpToDate.php
M maintenance/createCommonPasswordCdb.php
M tests/parser/TestFileReader.php
M tests/phpunit/includes/GitInfoTest.php
M tests/phpunit/includes/HtmlTest.php
M tests/phpunit/includes/LinkFilterTest.php
M tests/phpunit/includes/PagePropsTest.php
M tests/phpunit/includes/TemplateCategoriesTest.php
M tests/phpunit/includes/api/ApiContinuationManagerTest.php
M tests/phpunit/includes/api/ApiResultTest.php
M tests/phpunit/includes/api/ApiRevisionDeleteTest.php
M tests/phpunit/includes/auth/AuthManagerTest.php
M
tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
M
tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
M tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
M tests/phpunit/includes/exception/MWExceptionTest.php
M tests/phpunit/includes/linker/LinkRendererTest.php
M tests/phpunit/includes/media/ExifBitmapTest.php
M tests/phpunit/includes/session/SessionProviderTest.php
M tests/phpunit/includes/session/SessionTest.php
M tests/phpunit/includes/user/UserTest.php
61 files changed, 0 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/319979/1
diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index 9142238..d444a27 100644
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -90,7 +90,6 @@
# Or we could throw an exception:
# throw new MWException( __METHOD__ . ' called
without any data (mode empty).' );
}
-
}
/**
@@ -156,6 +155,5 @@
}
}
}
-
}
}
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7dd68e4..9c5c91a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1044,7 +1044,6 @@
// Allow extensions to modify form data
Hooks::run( 'EditPage::importFormData', [ $this, $request ] );
-
}
/**
@@ -2237,7 +2236,6 @@
* @return bool
*/
private function mergeChangesIntoContent( &$editContent ) {
-
$db = wfGetDB( DB_MASTER );
// This is the revision the editor started from
@@ -2813,7 +2811,6 @@
if ( !$wgUser->getOption( 'previewontop' ) ) {
$this->displayPreviewArea( $previewOutput, false );
}
-
}
/**
@@ -2839,7 +2836,6 @@
return Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
$templateListFormatter->format( $templates, $type )
);
-
}
/**
diff --git a/includes/Feed.php b/includes/Feed.php
index 8bfe1c7..189fd9f 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -236,7 +236,6 @@
$wgOut->addVaryHeader( 'X-Forwarded-Proto' );
}
$wgOut->sendCacheControl();
-
}
/**
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index bb2ed5b..a0c00c6 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -192,7 +192,6 @@
} else {
$oldInstance->destroy();
}
-
}
/**
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bf59c9a..07b7029 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1713,7 +1713,6 @@
$popts->setTidy( $oldTidy );
$this->addParserOutput( $parserOutput );
-
}
/**
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 9f8c06b..d86b19a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -861,7 +861,6 @@
'section' => 'editing/preview',
'label-message' => 'tog-uselivepreview',
];
-
}
/**
@@ -1614,7 +1613,6 @@
* @return string
*/
function getButtons() {
-
$attrs = [ 'id' => 'mw-prefs-restoreprefs' ];
if ( !$this->getModifiedUser()->isAllowedAny(
'editmyprivateinfo', 'editmyoptions' ) ) {
diff --git a/includes/Title.php b/includes/Title.php
index 213572b..3c51bae 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1412,7 +1412,6 @@
$fragment,
$this->getInterwiki()
);
-
}
/**
@@ -2926,7 +2925,6 @@
# Cycle through all the restrictions.
foreach ( $rows as $row ) {
-
// Don't take care of restrictions types that
aren't allowed
if ( !in_array( $row->pr_type,
$restrictionTypes ) ) {
continue;
@@ -4600,7 +4598,6 @@
: $wgExemptFromUserRobotsControl;
return !in_array( $this->mNamespace, $bannedNamespaces );
-
}
/**
diff --git a/includes/Xml.php b/includes/Xml.php
index b1bd098..4c6b071 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -238,7 +238,6 @@
Xml::label( $msg->text(), $attrs['id'] ),
Xml::tags( 'select', $attrs, $options )
];
-
}
/**
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 1e1bb39..c1763fa 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -218,7 +218,6 @@
$pager->getNavigationBar()
);
$out->preventClickjacking( $pager->getPreventClickjacking() );
-
}
/**
diff --git a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index 99f722d..0bb7ff8 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -576,7 +576,6 @@
ApiResult::setIndexedTagName( $data, 'library' );
return $this->getResult()->addValue( 'query', $property, $data
);
-
}
protected function appendExtensions( $property ) {
diff --git a/includes/cache/UserCache.php b/includes/cache/UserCache.php
index 016306a..5c75292 100644
--- a/includes/cache/UserCache.php
+++ b/includes/cache/UserCache.php
@@ -80,7 +80,6 @@
* @param string $caller The calling method
*/
public function doQuery( array $userIds, $options = [], $caller = '' ) {
-
$usersToCheck = [];
$usersToQuery = [];
@@ -132,7 +131,6 @@
}
}
$lb->execute();
-
}
/**
diff --git a/includes/cache/localisation/LocalisationCache.php
b/includes/cache/localisation/LocalisationCache.php
index 4970a2b..4b6362f 100644
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -549,7 +549,6 @@
* @return array Array with a 'messages' key, or empty array if the
file doesn't exist
*/
public function readJSONFile( $fileName ) {
-
if ( !is_readable( $fileName ) ) {
return [];
}
@@ -561,7 +560,6 @@
$data = FormatJson::decode( $json, true );
if ( $data === null ) {
-
throw new MWException( __METHOD__ . ": Invalid JSON
file: $fileName" );
}
@@ -1036,7 +1034,6 @@
$blobStore = new MessageBlobStore();
$blobStore->clear();
}
-
}
/**
diff --git a/includes/deferred/SearchUpdate.php
b/includes/deferred/SearchUpdate.php
index 62c8b00..b9a259b 100644
--- a/includes/deferred/SearchUpdate.php
+++ b/includes/deferred/SearchUpdate.php
@@ -108,7 +108,6 @@
# Perform the actual update
$search->update( $this->id, $normalTitle,
$search->normalizeText( $text ) );
}
-
}
/**
diff --git a/includes/diff/WordLevelDiff.php b/includes/diff/WordLevelDiff.php
index 296e3b7..9c9b1c9 100644
--- a/includes/diff/WordLevelDiff.php
+++ b/includes/diff/WordLevelDiff.php
@@ -42,7 +42,6 @@
* @param string[] $linesAfter
*/
public function __construct( $linesBefore, $linesAfter ) {
-
list( $wordsBefore, $wordsBeforeStripped ) = $this->split(
$linesBefore );
list( $wordsAfter, $wordsAfterStripped ) = $this->split(
$linesAfter );
@@ -68,7 +67,6 @@
$yi += count( $closing );
}
}
-
}
/**
@@ -77,7 +75,6 @@
* @return array[]
*/
private function split( $lines ) {
-
$words = [];
$stripped = [];
$first = true;
diff --git a/includes/filerepo/file/OldLocalFile.php
b/includes/filerepo/file/OldLocalFile.php
index a17ca6e..06fef4f 100644
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -194,14 +194,12 @@
} else {
$this->fileExists = false;
}
-
}
/**
* Load lazy file metadata from the DB
*/
protected function loadExtraFromDB() {
-
$this->extraDataLoaded = true;
$dbr = $this->repo->getSlaveDB();
$conds = [ 'oi_name' => $this->getName() ];
@@ -227,7 +225,6 @@
} else {
throw new MWException( "Could not find data for image
'{$this->archive_name}'." );
}
-
}
/**
diff --git a/includes/htmlform/fields/HTMLSelectAndOtherField.php
b/includes/htmlform/fields/HTMLSelectAndOtherField.php
index 363769d..86e8e75 100644
--- a/includes/htmlform/fields/HTMLSelectAndOtherField.php
+++ b/includes/htmlform/fields/HTMLSelectAndOtherField.php
@@ -31,7 +31,6 @@
$this->mOptions = [ $params['other'] => 'other' ] +
$this->mOptions;
}
$this->mFlatOptions = self::flattenOptions( $this->getOptions()
);
-
}
public function getInputHTML( $value ) {
diff --git a/includes/htmlform/fields/HTMLSelectNamespace.php
b/includes/htmlform/fields/HTMLSelectNamespace.php
index 2e07af6..f13aa17 100644
--- a/includes/htmlform/fields/HTMLSelectNamespace.php
+++ b/includes/htmlform/fields/HTMLSelectNamespace.php
@@ -9,7 +9,6 @@
$this->mAllValue = array_key_exists( 'all', $params )
? $params['all']
: 'all';
-
}
public function getInputHTML( $value ) {
diff --git a/includes/htmlform/fields/HTMLSelectOrOtherField.php
b/includes/htmlform/fields/HTMLSelectOrOtherField.php
index 1afb0a9..bb41079 100644
--- a/includes/htmlform/fields/HTMLSelectOrOtherField.php
+++ b/includes/htmlform/fields/HTMLSelectOrOtherField.php
@@ -18,7 +18,6 @@
// Have 'other' always as first element
$this->mOptions = [ $msg => 'other' ] + $this->mOptions;
}
-
}
public function getInputHTML( $value ) {
diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
index 458854a..08883ae 100644
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -362,7 +362,6 @@
* @return Status
*/
public function execute() {
-
$this->content = "";
if ( strtoupper( $this->method ) == "HEAD" ) {
@@ -378,7 +377,6 @@
if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
$this->setUserAgent( Http::userAgent() );
}
-
}
/**
@@ -387,7 +385,6 @@
* found in an array in the member variable headerList.
*/
protected function parseHeader() {
-
$lastname = "";
foreach ( $this->headerList as $header ) {
@@ -404,7 +401,6 @@
}
$this->parseCookies();
-
}
/**
@@ -538,7 +534,6 @@
* Parse the cookies in the response headers and store them in the
cookie jar.
*/
protected function parseCookies() {
-
if ( !$this->cookieJar ) {
$this->cookieJar = new CookieJar;
}
@@ -549,7 +544,6 @@
$this->cookieJar->parseCookieResponseHeader(
$cookie, $url['host'] );
}
}
-
}
/**
diff --git a/includes/installer/DatabaseInstaller.php
b/includes/installer/DatabaseInstaller.php
index 331d1a1..50d73de 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -336,7 +336,6 @@
$services->redefineService( 'DBLoadBalancerFactory', function()
use ( $connection ) {
return LBFactorySingle::newFromConnection( $connection
);
} );
-
}
/**
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 797a438..bc99672 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -357,7 +357,6 @@
}, $source );
return $source;
-
}
/**
diff --git a/includes/libs/filebackend/SwiftFileBackend.php
b/includes/libs/filebackend/SwiftFileBackend.php
index 4bc0ce6..1593457 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -176,7 +176,6 @@
return isset( $params['headers'] )
? $this->getCustomHeaders( $params['headers'] )
: [];
-
}
/**
diff --git a/includes/libs/mime/XmlTypeCheck.php
b/includes/libs/mime/XmlTypeCheck.php
index f057140..3958f8c 100644
--- a/includes/libs/mime/XmlTypeCheck.php
+++ b/includes/libs/mime/XmlTypeCheck.php
@@ -175,7 +175,6 @@
}
private function validate( $reader ) {
-
// First, move through anything that isn't an element, and
// handle any processing instructions with the callback
do {
@@ -240,7 +239,6 @@
// NOTATION, or XML_DECLARATION
// xml_parse didn't send these to the
filter, so we won't.
}
-
} while ( $this->readNext( $reader ) );
if ( $this->stackDepth !== 0 ) {
@@ -248,7 +246,6 @@
} elseif ( $this->wellFormed === null ) {
$this->wellFormed = true;
}
-
}
/**
diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index da47d35..a148a39 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -103,7 +103,6 @@
continue;
}
if ( $targetWiki !== 'local' ) {
-
throw new Exception( "Only 'local' target wiki
is currently supported" );
}
if ( $reqType !== 'page' && $reqType !== 'transform' ) {
@@ -150,7 +149,6 @@
* API. We now translate these to the "real" Parsoid v3 API.
*/
public function onParsoid1Request( array $req, Closure $idGeneratorFunc
) {
-
$parts = explode( '/', $req['url'] );
list(
$targetWiki, // 'local'
@@ -221,7 +219,6 @@
}
return $req;
-
}
}
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index 3afbaa3..35c45de 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -78,7 +78,6 @@
}
public function onRequests( array $reqs, Closure $idGenFunc ) {
-
if ( $this->params['parsoidCompat'] ) {
return $this->onParsoidRequests( $reqs, $idGenFunc );
}
@@ -117,7 +116,6 @@
* Remaps Parsoid v1/v3 requests to RESTBase v1 requests.
*/
public function onParsoidRequests( array $reqs, Closure
$idGeneratorFunc ) {
-
$result = [];
foreach ( $reqs as $key => $req ) {
$version = explode( '/', $req['url'] )[1];
@@ -131,7 +129,6 @@
}
return $result;
-
}
/**
@@ -223,7 +220,6 @@
}
return $req;
-
}
/**
@@ -241,7 +237,6 @@
* * $revision is optional
*/
public function onParsoid3Request( array $req, Closure $idGeneratorFunc
) {
-
$parts = explode( '/', $req['url'] );
list(
$targetWiki, // 'local'
@@ -272,7 +267,6 @@
}
return $req;
-
}
}
diff --git a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index fffc262..51a0135 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -102,7 +102,6 @@
unset( $tags['ResolutionUnit'] );
foreach ( $tags as $tag => &$vals ) {
-
// This seems ugly to wrap non-array's in an array just
to unwrap again,
// especially when most of the time it is not an array
if ( !is_array( $tags[$tag] ) ) {
@@ -165,7 +164,6 @@
}
foreach ( $vals as &$val ) {
-
switch ( $tag ) {
case 'Compression':
switch ( $val ) {
@@ -1683,7 +1681,6 @@
protected function getExtendedMetadataFromHook( File $file, array
$extendedMetadata,
&$maxCacheTime
) {
-
Hooks::run( 'GetExtendedMetadata', [
&$extendedMetadata,
$file,
@@ -1807,7 +1804,6 @@
$field['value'] =
$this->resolveMultivalueValue( $field['value'] );
}
}
-
}
/**
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index af77868..db3ec14 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -215,7 +215,6 @@
'filepage', // always show the local local
Filepage.css, bug 29277
'mediawiki.action.view.filepage', // Add MediaWiki
styles for a file page
] );
-
}
/**
diff --git a/includes/parser/LinkHolderArray.php
b/includes/parser/LinkHolderArray.php
index b32f43b..e7712f2 100644
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -267,10 +267,8 @@
* @param string $text
*/
public function replace( &$text ) {
-
$this->replaceInternal( $text );
$this->replaceInterwiki( $text );
-
}
/**
@@ -414,7 +412,6 @@
$replacer->cb(),
$text
);
-
}
/**
@@ -614,7 +611,6 @@
* @return string
*/
public function replaceText( $text ) {
-
$text = preg_replace_callback(
'/<!--(LINK|IWLINK) (.*?)-->/',
[ &$this, 'replaceTextCallback' ],
diff --git a/includes/parser/ParserOptions.php
b/includes/parser/ParserOptions.php
index 9a10878..2900f41 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -733,7 +733,6 @@
$this->mThumbSize = $user->getOption( 'thumbsize' );
$this->mStubThreshold = $user->getStubThreshold();
$this->mUserLang = $lang;
-
}
/**
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 143f5cc..b05b51b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -388,7 +388,6 @@
}
}
}
-
}
/**
@@ -428,7 +427,6 @@
// Keep track of their names so that they can be loaded
together
$this->testModuleNames[$id] = array_keys(
$testModules[$id] );
}
-
}
/**
@@ -779,7 +777,6 @@
$this->errors = [];
echo $response;
-
}
/**
@@ -1142,7 +1139,6 @@
protected static function makeLoaderImplementScript(
$name, $scripts, $styles, $messages, $templates
) {
-
if ( $scripts instanceof XmlJsCode ) {
$scripts = new XmlJsCode( "function ( $, jQuery,
require, module ) {\n{$scripts->value}\n}" );
} elseif ( !is_string( $scripts ) && !is_array( $scripts ) ) {
diff --git a/includes/search/SearchPostgres.php
b/includes/search/SearchPostgres.php
index 8ba49b6..5a50b17 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -62,7 +62,6 @@
* @return string
*/
function parseQuery( $term ) {
-
wfDebug( "parseQuery received: $term \n" );
# # No backslashes allowed
@@ -115,7 +114,6 @@
wfDebug( "parseQuery returned: $searchstring \n" );
return $searchstring;
-
}
/**
diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 6ea8b89..65eb9b7 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -289,7 +289,6 @@
if ( $content !== '' ) {
echo "<div class='after-portlet
after-portlet-$name'>$content</div>";
}
-
}
/**
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 3efbd3b..9c5600d 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -196,7 +196,6 @@
}
protected function setupTemplateForOutput() {
-
$request = $this->getRequest();
$user = $this->getUser();
$title = $this->getTitle();
@@ -257,7 +256,6 @@
if ( $oldContext ) {
$this->setContext( $oldContext );
}
-
}
/**
@@ -1171,7 +1169,6 @@
* @return array
*/
private function buildContentActionUrls( $content_navigation ) {
-
// content_actions has been replaced with content_navigation
for backwards
// compatibility and also for skins that just want simple tabs
content_actions
// is now built by flattening the content_navigation arrays
into one
diff --git a/includes/specialpage/LoginSignupSpecialPage.php
b/includes/specialpage/LoginSignupSpecialPage.php
index 984e32b..00c2416 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -770,7 +770,6 @@
}
return $template;
-
}
public function onAuthChangeFormFields(
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 6daf19f..252ac31 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -455,7 +455,6 @@
$out->addHTML( "</div>" );
Hooks::run( 'SpecialSearchResultsAppend', [ $this, $out, $term
] );
-
}
/**
@@ -752,7 +751,6 @@
* @return string
*/
protected function showHit( SearchResult $result, $terms, $position ) {
-
if ( $result->isBrokenTitle() ) {
return '';
}
@@ -972,7 +970,6 @@
* @return string
*/
protected function showInterwikiHit( $result, $lastInterwiki, $query ) {
-
if ( $result->isBrokenTitle() ) {
return '';
}
@@ -1342,7 +1339,6 @@
* @return bool
*/
protected function startsWithAll( $term ) {
-
$allkeyword = $this->msg( 'searchall'
)->inContentLanguage()->text();
$parts = explode( ':', $term );
diff --git a/includes/user/User.php b/includes/user/User.php
index 92a65f0..2a59d5d 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1658,7 +1658,6 @@
// Extensions
Hooks::run( 'GetBlockedStatus', [ &$this ] );
-
}
/**
@@ -1690,7 +1689,6 @@
* @return bool True if blacklisted.
*/
public function inDnsBlacklist( $ip, $bases ) {
-
$found = false;
// @todo FIXME: IPv6 ??? (http://bugs.php.net/bug.php?id=33170)
if ( IP::isIPv4( $ip ) ) {
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index fc91443..886ee94 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -186,7 +186,6 @@
} else {
return false;
}
-
}
}
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index d9111a6..e1099f8 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -174,7 +174,6 @@
* @return string
*/
function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
-
// always convert to zh-hans before indexing. it should be
// better to use zh-hans for search, since conversion from
// Traditional to Simplified is less ambiguous than the
@@ -183,7 +182,6 @@
// LanguageZh_hans::normalizeForSearch
$s = parent::normalizeForSearch( $s );
return $s;
-
}
/**
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index c74cae2..552bec0 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -459,7 +459,6 @@
* Add the default parameters to the scripts
*/
protected function addDefaultParams() {
-
# Generic (non script dependant) options:
$this->addOption( 'help', 'Display this help message', false,
false, 'h' );
@@ -546,7 +545,6 @@
. "for this script to run: $joined. Please
enable them and then try again.";
$this->error( $msg, 1 );
}
-
}
/**
diff --git a/maintenance/checkComposerLockUpToDate.php
b/maintenance/checkComposerLockUpToDate.php
index 3f0a83d..b504bde 100644
--- a/maintenance/checkComposerLockUpToDate.php
+++ b/maintenance/checkComposerLockUpToDate.php
@@ -60,7 +60,6 @@
// We couldn't find any out-of-date dependencies, so
assume everything is ok!
$this->output( "Your composer.lock file is up to date
with current dependencies!\n" );
}
-
}
}
diff --git a/maintenance/createCommonPasswordCdb.php
b/maintenance/createCommonPasswordCdb.php
index f13dd93..388ad8a 100644
--- a/maintenance/createCommonPasswordCdb.php
+++ b/maintenance/createCommonPasswordCdb.php
@@ -109,7 +109,6 @@
} catch ( \Cdb\Exception $e ) {
$this->error( "Error writing cdb file: " .
$e->getMessage(), 2 );
}
-
}
}
diff --git a/tests/parser/TestFileReader.php b/tests/parser/TestFileReader.php
index 59f88c9..b6e811b 100644
--- a/tests/parser/TestFileReader.php
+++ b/tests/parser/TestFileReader.php
@@ -264,7 +264,6 @@
$this->sectionLineNum = [];
$this->sectionData = [];
$this->section = null;
-
}
/**
diff --git a/tests/phpunit/includes/GitInfoTest.php
b/tests/phpunit/includes/GitInfoTest.php
index 9f4a01c..89416f2 100644
--- a/tests/phpunit/includes/GitInfoTest.php
+++ b/tests/phpunit/includes/GitInfoTest.php
@@ -18,7 +18,6 @@
$this->assertEquals( 'master', $gitInfo->getCurrentBranch() );
$this->assertContains(
'0123456789abcdef0123456789abcdef01234567',
$gitInfo->getHeadViewUrl() );
-
}
public function testValidJsonData() {
diff --git a/tests/phpunit/includes/HtmlTest.php
b/tests/phpunit/includes/HtmlTest.php
index bc50966..95c7a61 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -92,7 +92,6 @@
* @covers Html::expandAttributes
*/
public function testExpandAttributesSkipsNullAndFalse() {
-
# ## EMPTY ########
$this->assertEmpty(
Html::expandAttributes( [ 'foo' => null ] ),
@@ -190,7 +189,6 @@
Html::expandAttributes( [ 'zero' => 0 ] ),
'Number 0 value needs no quotes'
);
-
}
/**
diff --git a/tests/phpunit/includes/LinkFilterTest.php
b/tests/phpunit/includes/LinkFilterTest.php
index 61b165a..428b012 100644
--- a/tests/phpunit/includes/LinkFilterTest.php
+++ b/tests/phpunit/includes/LinkFilterTest.php
@@ -6,7 +6,6 @@
class LinkFilterTest extends MediaWikiLangTestCase {
protected function setUp() {
-
parent::setUp();
$this->setMwGlobals( 'wgUrlProtocols', [
@@ -26,7 +25,6 @@
'mms://',
'//',
] );
-
}
/**
@@ -38,11 +36,9 @@
* @return string Regex
*/
function createRegexFromLIKE( $like ) {
-
$regex = '!^';
foreach ( $like as $item ) {
-
if ( $item instanceof LikeMatch ) {
if ( $item->toString() == '%' ) {
$regex .= '.*';
@@ -58,7 +54,6 @@
$regex .= '$!';
return $regex;
-
}
/**
@@ -67,7 +62,6 @@
* @return array
*/
public static function provideValidPatterns() {
-
return [
// Protocol, Search pattern, URL which matches the
pattern
[ 'http://', '*.test.com', 'http://www.test.com' ],
@@ -164,7 +158,6 @@
// [ '',
'https://*.wikimedia.org/r/#/q/status:open,n,z',
//
'https://gerrit.wikimedia.org/XXX/r/#/q/status:open,n,z', false ],
];
-
}
/**
@@ -181,7 +174,6 @@
* @param bool $shouldBeFound Should the URL be found? (defaults true)
*/
function testMakeLikeArrayWithValidPatterns( $protocol, $pattern, $url,
$shouldBeFound = true ) {
-
$indexes = wfMakeUrlIndexes( $url );
$likeArray = LinkFilter::makeLikeArray( $pattern, $protocol );
@@ -211,7 +203,6 @@
"Search pattern '$protocol$pattern' should not
find url '$url' \n$debugmsg"
);
}
-
}
/**
@@ -220,7 +211,6 @@
* @return array
*/
public static function provideInvalidPatterns() {
-
return [
[ '' ],
[ '*' ],
@@ -240,7 +230,6 @@
[ 'test.com/*/index' ],
[ 'test.com/dir/index?arg=*' ],
];
-
}
/**
@@ -253,12 +242,10 @@
* @param string $pattern Invalid search pattern
*/
function testMakeLikeArrayWithInvalidPatterns( $pattern ) {
-
$this->assertFalse(
LinkFilter::makeLikeArray( $pattern ),
"'$pattern' is not a valid pattern and should be
rejected"
);
-
}
}
diff --git a/tests/phpunit/includes/PagePropsTest.php
b/tests/phpunit/includes/PagePropsTest.php
index cc1708a..29c9e22 100644
--- a/tests/phpunit/includes/PagePropsTest.php
+++ b/tests/phpunit/includes/PagePropsTest.php
@@ -266,11 +266,9 @@
}
protected function setProperties( $pageID, $properties ) {
-
$rows = [];
foreach ( $properties as $propertyName => $propertyValue ) {
-
$row = [
'pp_page' => $pageID,
'pp_propname' => $propertyName,
@@ -295,11 +293,9 @@
}
protected function setProperty( $pageID, $propertyName, $propertyValue
) {
-
$properties = [];
$properties[$propertyName] = $propertyValue;
$this->setProperties( $pageID, $properties );
-
}
}
diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php
b/tests/phpunit/includes/TemplateCategoriesTest.php
index 9359568..152602a 100644
--- a/tests/phpunit/includes/TemplateCategoriesTest.php
+++ b/tests/phpunit/includes/TemplateCategoriesTest.php
@@ -91,6 +91,5 @@
$title->getParentCategories(),
'Verify that the page is no longer in the category
after template deletion'
);
-
}
}
diff --git a/tests/phpunit/includes/api/ApiContinuationManagerTest.php
b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
index 6da16a0..3ad16d1 100644
--- a/tests/phpunit/includes/api/ApiContinuationManagerTest.php
+++ b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
@@ -195,7 +195,6 @@
'Expected exception'
);
}
-
}
}
diff --git a/tests/phpunit/includes/api/ApiResultTest.php
b/tests/phpunit/includes/api/ApiResultTest.php
index 48472cf..98e24fb 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -1230,7 +1230,6 @@
],
],
];
-
}
/**
@@ -1380,7 +1379,6 @@
'two' => 2,
], $arr['foo'] );
}
-
}
class ApiResultTestStringifiableObject {
diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
index 6359983..d8282be 100644
--- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
@@ -25,7 +25,6 @@
$this->revs[] = Title::newFromText( self::$page )
->getLatestRevID( Title::GAID_FOR_UPDATE );
}
-
}
public function testHidingRevisions() {
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php
b/tests/phpunit/includes/auth/AuthManagerTest.php
index 13486e2..f57db11 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -695,7 +695,6 @@
$ex->getMessage()
);
}
-
}
public function testBeginAuthentication() {
@@ -3265,7 +3264,6 @@
$this->manager->removeAuthenticationSessionData( null );
$this->assertNull(
$this->manager->getAuthenticationSessionData( 'foo' ) );
$this->assertNull(
$this->manager->getAuthenticationSessionData( 'bar' ) );
-
}
public function testCanLinkAccounts() {
diff --git
a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
index c52c3e9..ec4bea1 100644
---
a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
+++
b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
@@ -104,6 +104,5 @@
$authManager->setAuthenticationSessionData( 'no-email', true );
$provider->setManager( $authManager );
$provider->beginSecondaryAccountCreation(
$userNotExpectsConfirmation, $creator, [] );
-
}
}
diff --git
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index 088dd00..caf1680 100644
---
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -328,7 +328,6 @@
AuthenticationResponse::newPass( $userName ),
$provider->beginPrimaryAuthentication( $reqs )
);
-
}
/**
@@ -645,7 +644,6 @@
$this->assertNull( $provider->finishAccountCreation( $user,
$user, $res2 ) );
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals( AuthenticationResponse::PASS,
$ret->status, 'new password is set' );
-
}
}
diff --git
a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
index bc78c08..d4ebe34 100644
---
a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
+++
b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
@@ -347,7 +347,6 @@
'wrongpassword',
$ret->message->getKey()
);
-
}
/**
diff --git a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
index 7fe3351..7dea123 100644
--- a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
+++ b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
@@ -36,7 +36,6 @@
$this->assertSame( $email ?: 'defa...@example.com',
$user->getEmail() );
$this->assertSame( $realname ?: 'Fake Name',
$user->getRealName() );
}
-
}
public static function providePopulateUser() {
diff --git a/tests/phpunit/includes/exception/MWExceptionTest.php
b/tests/phpunit/includes/exception/MWExceptionTest.php
index 0e87ffa..7c36f7d 100644
--- a/tests/phpunit/includes/exception/MWExceptionTest.php
+++ b/tests/phpunit/includes/exception/MWExceptionTest.php
@@ -173,7 +173,6 @@
* @dataProvider provideJsonSerializedKeys
*/
public function testJsonserializeexceptionKeys( $expectedKeyType,
$exClass, $key ) {
-
# Make sure we log a backtrace:
$this->setMwGlobals( [ 'wgLogExceptionBacktrace' => true ] );
@@ -235,7 +234,6 @@
MWExceptionHandler::jsonSerializeException( new
Exception() )
);
$this->assertObjectNotHasAttribute( 'backtrace', $json );
-
}
}
diff --git a/tests/phpunit/includes/linker/LinkRendererTest.php
b/tests/phpunit/includes/linker/LinkRendererTest.php
index 70c0ece..6d096c2 100644
--- a/tests/phpunit/includes/linker/LinkRendererTest.php
+++ b/tests/phpunit/includes/linker/LinkRendererTest.php
@@ -24,7 +24,6 @@
'wgScript' => '/w/index.php',
] );
$this->factory =
MediaWikiServices::getInstance()->getLinkRendererFactory();
-
}
public function testMergeAttribs() {
diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php
b/tests/phpunit/includes/media/ExifBitmapTest.php
index f70b42d..47ed67b 100644
--- a/tests/phpunit/includes/media/ExifBitmapTest.php
+++ b/tests/phpunit/includes/media/ExifBitmapTest.php
@@ -17,7 +17,6 @@
$this->setMwGlobals( 'wgShowEXIF', true );
$this->handler = new ExifBitmapHandler;
-
}
/**
diff --git a/tests/phpunit/includes/session/SessionProviderTest.php
b/tests/phpunit/includes/session/SessionProviderTest.php
index 4cbeeb9..8284d05 100644
--- a/tests/phpunit/includes/session/SessionProviderTest.php
+++ b/tests/phpunit/includes/session/SessionProviderTest.php
@@ -138,7 +138,6 @@
$ex->getMessage()
);
}
-
}
public function testHashToSessionId() {
diff --git a/tests/phpunit/includes/session/SessionTest.php
b/tests/phpunit/includes/session/SessionTest.php
index 3815416..e6a6ad3 100644
--- a/tests/phpunit/includes/session/SessionTest.php
+++ b/tests/phpunit/includes/session/SessionTest.php
@@ -299,7 +299,6 @@
$session->resetAllTokens();
$this->assertArrayNotHasKey( 'wsTokenSecrets', $backend->data );
-
}
/**
diff --git a/tests/phpunit/includes/user/UserTest.php
b/tests/phpunit/includes/user/UserTest.php
index 34548c0..199fc8f 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -269,7 +269,6 @@
// let the user have a few (3) edits
$page = WikiPage::factory( Title::newFromText(
'Help:UserTest_EditCount' ) );
for ( $i = 0; $i < 3; $i++ ) {
-
$page->doEditContent(
ContentHandler::makeContent( (string)$i,
$page->getTitle() ),
'test',
@@ -505,7 +504,6 @@
public function testGetId() {
$user = static::getTestUser()->getUser();
$this->assertTrue( $user->getId() > 0 );
-
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/319979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib00b5cfd31ca4dcd0c32ce33754d3c80bae70641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
