Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54216
Change subject: Remove spaces between parentheses in function calls
......................................................................
Remove spaces between parentheses in function calls
Change-Id: If8ec665a01b566fa5189dfcc810b2d9a17f371e1
---
M includes/DataUpdate.php
M includes/GlobalFunctions.php
M includes/SqlDataUpdate.php
M includes/WikiFilePage.php
M includes/WikiPage.php
M includes/api/ApiUpload.php
M includes/content/Content.php
M includes/content/CssContent.php
M includes/content/JavaScriptContent.php
M includes/content/TextContent.php
M includes/content/WikitextContent.php
M includes/installer/CliInstaller.php
M includes/installer/DatabaseUpdater.php
M includes/installer/WebInstaller.php
M includes/installer/WebInstallerOutput.php
M includes/media/Exif.php
M includes/media/SVGMetadataExtractor.php
M includes/media/XMPInfo.php
M includes/specials/SpecialListusers.php
M languages/Language.php
M maintenance/benchmarks/Benchmarker.php
M maintenance/findHooks.php
M maintenance/fuzz-tester.php
M maintenance/parse.php
M maintenance/userOptions.inc
25 files changed, 41 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/54216/1
diff --git a/includes/DataUpdate.php b/includes/DataUpdate.php
index 114ae14..c1076b2 100644
--- a/includes/DataUpdate.php
+++ b/includes/DataUpdate.php
@@ -34,7 +34,7 @@
/**
* Constructor
*/
- public function __construct( ) {
+ public function __construct() {
# noop
}
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0feddd2..016736f 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2710,7 +2710,7 @@
* @param varargs
* @return String
*/
-function wfEscapeShellArg( ) {
+function wfEscapeShellArg() {
wfInitShellLocale();
$args = func_get_args();
diff --git a/includes/SqlDataUpdate.php b/includes/SqlDataUpdate.php
index c01cdd0..79dcdc5 100644
--- a/includes/SqlDataUpdate.php
+++ b/includes/SqlDataUpdate.php
@@ -48,7 +48,7 @@
public function __construct( $withTransaction = true ) {
global $wgAntiLockFlags;
- parent::__construct( );
+ parent::__construct();
if ( $wgAntiLockFlags & ALF_NO_LINK_LOCK ) {
$this->mOptions = array();
diff --git a/includes/WikiFilePage.php b/includes/WikiFilePage.php
index fa23072..5e603d3 100644
--- a/includes/WikiFilePage.php
+++ b/includes/WikiFilePage.php
@@ -107,7 +107,7 @@
/**
* @return bool
*/
- public function isRedirect( ) {
+ public function isRedirect() {
$this->loadFile();
if ( $this->mFile->isLocal() ) {
return parent::isRedirect();
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 6e24527..8d9d740 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -460,7 +460,7 @@
*
* @return bool
*/
- public function isRedirect( ) {
+ public function isRedirect() {
$content = $this->getContent();
if ( !$content ) return false;
@@ -821,7 +821,7 @@
$content = $this->getContent();
}
- if ( !$content || $content->isRedirect( ) ) {
+ if ( !$content || $content->isRedirect() ) {
return false;
}
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index deeb1c1..2dcf392 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -81,7 +81,7 @@
// Check if the uploaded file is sane
if ( $this->mParams['chunk'] ) {
- $maxSize = $this->mUpload->getMaxUploadSize( );
+ $maxSize = $this->mUpload->getMaxUploadSize();
if( $this->mParams['filesize'] > $maxSize ) {
$this->dieUsage( 'The file you submitted was
too large', 'file-too-large' );
}
@@ -440,8 +440,8 @@
/**
* Performs file verification, dies on error.
*/
- protected function verifyUpload( ) {
- $verification = $this->mUpload->verifyUpload( );
+ protected function verifyUpload() {
+ $verification = $this->mUpload->verifyUpload();
if ( $verification['status'] === UploadBase::OK ) {
return;
} else {
diff --git a/includes/content/Content.php b/includes/content/Content.php
index 9b59a27..72729b0 100644
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@ -231,7 +231,7 @@
*
* @return Content. A copy of this object
*/
- public function copy( );
+ public function copy();
/**
* Returns true if this content is countable as a "real" wiki page,
provided
diff --git a/includes/content/CssContent.php b/includes/content/CssContent.php
index 75f1aa0..569d122 100644
--- a/includes/content/CssContent.php
+++ b/includes/content/CssContent.php
@@ -54,10 +54,10 @@
return new CssContent( $pst );
}
- protected function getHtml( ) {
+ protected function getHtml() {
$html = "";
$html .= "<pre class=\"mw-code mw-css\" dir=\"ltr\">\n";
- $html .= $this->getHighlightHtml( );
+ $html .= $this->getHighlightHtml();
$html .= "\n</pre>\n";
return $html;
diff --git a/includes/content/JavaScriptContent.php
b/includes/content/JavaScriptContent.php
index 5221168..9cd947f 100644
--- a/includes/content/JavaScriptContent.php
+++ b/includes/content/JavaScriptContent.php
@@ -55,10 +55,10 @@
return new JavaScriptContent( $pst );
}
- protected function getHtml( ) {
+ protected function getHtml() {
$html = "";
$html .= "<pre class=\"mw-code mw-js\" dir=\"ltr\">\n";
- $html .= $this->getHighlightHtml( );
+ $html .= $this->getHighlightHtml();
$html .= "\n</pre>\n";
return $html;
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index 91ba6ef..8fafcb6 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -72,8 +72,8 @@
*
* @return int The size
*/
- public function getSize( ) {
- $text = $this->getNativeData( );
+ public function getSize() {
+ $text = $this->getNativeData();
return strlen( $text );
}
@@ -89,7 +89,7 @@
public function isCountable( $hasLinks = null ) {
global $wgArticleCountMethod;
- if ( $this->isRedirect( ) ) {
+ if ( $this->isRedirect() ) {
return false;
}
@@ -105,7 +105,7 @@
*
* @return string: the raw text
*/
- public function getNativeData( ) {
+ public function getNativeData() {
$text = $this->mText;
return $text;
}
@@ -115,7 +115,7 @@
*
* @return string: the raw text
*/
- public function getTextForSearchIndex( ) {
+ public function getTextForSearchIndex() {
return $this->getNativeData();
}
@@ -127,7 +127,7 @@
*
* @return string|false: the raw text, or null if the conversion failed
*/
- public function getWikitextForTransclusion( ) {
+ public function getWikitextForTransclusion() {
$wikitext = $this->convert( CONTENT_MODEL_WIKITEXT, 'lossy' );
if ( $wikitext ) {
@@ -248,7 +248,7 @@
*
* @return string an HTML representation of the content's markup
*/
- protected function getHighlightHtml( ) {
+ protected function getHighlightHtml() {
# TODO: make Highlighter interface, use highlighter here, if
available
return htmlspecialchars( $this->getNativeData() );
}
diff --git a/includes/content/WikitextContent.php
b/includes/content/WikitextContent.php
index 7d3cd37..8be4eba 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -231,7 +231,7 @@
public function isCountable( $hasLinks = null, Title $title = null ) {
global $wgArticleCountMethod;
- if ( $this->isRedirect( ) ) {
+ if ( $this->isRedirect() ) {
return false;
}
diff --git a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index 997255d..bb7e877 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -191,7 +191,7 @@
}
}
- public function envCheckPath( ) {
+ public function envCheckPath() {
if ( !$this->specifiedScriptPath ) {
$this->showMessage( 'config-no-cli-uri', $this->getVar(
"wgScriptPath" ) );
}
diff --git a/includes/installer/DatabaseUpdater.php
b/includes/installer/DatabaseUpdater.php
index 4b4bc23..b88ae61 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -402,7 +402,7 @@
if( $this->fileHandle ) {
$this->skipSchema = false;
- $this->writeSchemaUpdateFile( );
+ $this->writeSchemaUpdateFile();
$this->setAppliedUpdates( "$wgVersion-schema",
$this->updatesSkipped );
}
diff --git a/includes/installer/WebInstaller.php
b/includes/installer/WebInstaller.php
index a325507..35d649b 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1086,7 +1086,7 @@
/**
* @return bool
*/
- public function envCheckPath( ) {
+ public function envCheckPath() {
// PHP_SELF isn't available sometimes, such as when PHP is CGI
but
// cgi.fix_pathinfo is disabled. In that case, fall back to
SCRIPT_NAME
// to get the path to the current script... hopefully it's
reliable. SIGH
diff --git a/includes/installer/WebInstallerOutput.php
b/includes/installer/WebInstallerOutput.php
index afbb9ab..d61d843 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -157,7 +157,7 @@
* "<link>" to index.php?css=foobar for the "<head>"
* @return String
*/
- private function getCssUrl( ) {
+ private function getCssUrl() {
return Html::linkedStyle( $_SERVER['PHP_SELF'] . '?css=' .
$this->getDir() );
}
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index c50b2f0..20b84d5 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -363,7 +363,7 @@
* As an alternative approach, some of this could be done in the
validate phase
* if we make up our own types like Exif::DATE.
*/
- function collapseData( ) {
+ function collapseData() {
$this->exifGPStoNumber( 'GPSLatitude' );
$this->exifGPStoNumber( 'GPSDestLatitude' );
@@ -545,7 +545,7 @@
*
* @deprecated since 1.18
*/
- function makeFormattedData( ) {
+ function makeFormattedData() {
wfDeprecated( __METHOD__, '1.18' );
$this->mFormattedExifData = FormatMetadata::getFormattedData(
$this->mFilteredExifData );
diff --git a/includes/media/SVGMetadataExtractor.php
b/includes/media/SVGMetadataExtractor.php
index f8cd6df..e07fd86 100644
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -278,7 +278,7 @@
*
* The parser has to be in the start element of "<svg>"
*/
- private function handleSVGAttribs( ) {
+ private function handleSVGAttribs() {
$defaultWidth = self::DEFAULT_WIDTH;
$defaultHeight = self::DEFAULT_HEIGHT;
$aspect = 1.0;
diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 01b07db..102547f 100644
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -31,7 +31,7 @@
/** get the items array
* @return Array XMP item configuration array.
*/
- public static function getItems ( ) {
+ public static function getItems () {
if( !self::$ranHooks ) {
// This is for if someone makes a custom metadata
extension.
// For example, a medical wiki might want to decode
DICOM xmp properties.
diff --git a/includes/specials/SpecialListusers.php
b/includes/specials/SpecialListusers.php
index ed21396..d253a4d 100644
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -206,7 +206,7 @@
/**
* @return string
*/
- function getPageHeader( ) {
+ function getPageHeader() {
global $wgScript;
list( $self ) = explode( '/',
$this->getTitle()->getPrefixedDBkey() );
diff --git a/languages/Language.php b/languages/Language.php
index 01751db..1c52da5 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -531,7 +531,7 @@
/**
* Resets all of the namespace caches. Mainly used for testing
*/
- public function resetNamespaces( ) {
+ public function resetNamespaces() {
$this->namespaceNames = null;
$this->mNamespaceIds = null;
$this->namespaceAliases = null;
diff --git a/maintenance/benchmarks/Benchmarker.php
b/maintenance/benchmarks/Benchmarker.php
index c198e0f..98b35b5 100644
--- a/maintenance/benchmarks/Benchmarker.php
+++ b/maintenance/benchmarks/Benchmarker.php
@@ -75,7 +75,7 @@
}
}
- public function getFormattedResults( ) {
+ public function getFormattedResults() {
$ret = '';
foreach( $this->results as $res ) {
// show function with args
diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index 9ad4df4..778da5a 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -115,7 +115,7 @@
*/
private function getHooksFromDoc( $doc ) {
if ( $this->hasOption( 'online' ) ) {
- return $this->getHooksFromOnlineDoc( );
+ return $this->getHooksFromOnlineDoc();
} else {
return $this->getHooksFromLocalDoc( $doc );
}
@@ -137,7 +137,7 @@
* Get hooks from www.mediawiki.org using the API
* @return array of documented hooks
*/
- private function getHooksFromOnlineDoc( ) {
+ private function getHooksFromOnlineDoc() {
// All hooks
$allhookdata = Http::get(
'http://www.mediawiki.org/w/api.php?action=query&list=categorymembers&cmtitle=Category:MediaWiki_hooks&cmlimit=500&format=php'
);
$allhookdata = unserialize( $allhookdata );
diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php
index 6bb44a1..4c03980 100644
--- a/maintenance/fuzz-tester.php
+++ b/maintenance/fuzz-tester.php
@@ -1490,7 +1490,7 @@
function __construct() {
$this->pagePath = "index.php?title=Special:Blockme";
- $this->params = array ( );
+ $this->params = array ();
// sometimes we specify "ip", and sometimes we don't.
if ( wikiFuzz::randnum( 1 ) == 0 ) {
diff --git a/maintenance/parse.php b/maintenance/parse.php
index b0ab624..58e76b0 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -109,7 +109,7 @@
*
* @return Title object
*/
- protected function getTitle( ) {
+ protected function getTitle() {
$title =
$this->getOption( 'title' )
? $this->getOption( 'title' )
diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc
index 2a06657..cbe6b05 100644
--- a/maintenance/userOptions.inc
+++ b/maintenance/userOptions.inc
@@ -108,7 +108,7 @@
return false;
}
- $this->{ $this->mMode } ( );
+ $this->{ $this->mMode } ();
return true;
}
@@ -117,7 +117,7 @@
#
/** List default options and their value */
- private function LISTER( ) {
+ private function LISTER() {
$def = User::getDefaultOptions();
ksort( $def );
$maxOpt = 0;
@@ -130,7 +130,7 @@
}
/** List options usage */
- private function USAGER( ) {
+ private function USAGER() {
$ret = array();
$defaultOptions = User::getDefaultOptions();
@@ -181,7 +181,7 @@
/** Change our users options */
- private function CHANGER( ) {
+ private function CHANGER() {
$this->warn();
// We list user by user_id from one of the slave database
--
To view, visit https://gerrit.wikimedia.org/r/54216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8ec665a01b566fa5189dfcc810b2d9a17f371e1
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
