From 5dbfd5bf80a4469fef2da1b56d57129a454dc03f Mon Sep 17 00:00:00 2001 From: umherirrender Date: Thu, 21 Nov 2013 18:19:44 +0100 Subject: [PATCH] Fixed spacing - Removed trailing spaces in comments - Removed multiple empty lines - Removed space after object operator Change-Id: I9fd3256ab490c7cd2034de3fd94e6be6e6d6d8f2 --- includes/Block.php | 1 - includes/DefaultSettings.php | 2 +- includes/GlobalFunctions.php | 12 +++++------- includes/HTMLForm.php | 2 +- includes/Setup.php | 1 - includes/SpecialPage.php | 1 - includes/filebackend/FileOp.php | 1 - includes/filerepo/FileRepo.php | 1 - includes/filerepo/file/LocalFile.php | 1 - includes/gallery/TraditionalImageGallery.php | 3 --- includes/installer/WebInstallerOutput.php | 1 - includes/job/jobs/PublishStashedFileJob.php | 1 - includes/media/Bitmap.php | 1 - includes/media/ImageHandler.php | 1 - includes/parser/Preprocessor_DOM.php | 1 - includes/profiler/ProfilerSimpleUDP.php | 2 +- includes/resourceloader/ResourceLoader.php | 1 - includes/revisiondelete/RevisionDeleter.php | 1 - includes/specials/SpecialImport.php | 1 - includes/specials/SpecialRandomInCategory.php | 1 - includes/upload/UploadBase.php | 3 --- languages/classes/LanguageBs.php | 1 - languages/classes/LanguageOs.php | 1 - languages/classes/LanguageTr.php | 1 - maintenance/Maintenance.php | 1 - maintenance/backupTextPass.inc | 4 ---- maintenance/dumpTextPass.php | 1 - maintenance/dumpUploads.php | 2 +- maintenance/generateSitemap.php | 1 - maintenance/moveBatch.php | 1 - maintenance/reassignEdits.php | 2 -- maintenance/refreshImageMetadata.php | 1 - maintenance/runBatchedQuery.php | 1 - maintenance/showCacheStats.php | 1 - maintenance/storage/checkStorage.php | 2 -- maintenance/storage/testCompression.php | 1 - maintenance/storage/trackBlobs.php | 1 - maintenance/userOptions.inc | 2 -- skins/CologneBlue.php | 4 ---- skins/MonoBook.php | 2 -- tests/phpunit/MediaWikiPHPUnitCommand.php | 3 --- tests/phpunit/includes/EditPageTest.php | 1 - tests/phpunit/includes/ExceptionTest.php | 1 - .../phpunit/includes/GlobalFunctions/GlobalTest.php | 1 - tests/phpunit/includes/PathRouterTest.php | 1 - tests/phpunit/includes/RevisionStorageTest.php | 1 - .../RevisionStorageTest_ContentHandlerUseDB.php | 1 - tests/phpunit/includes/RevisionTest.php | 2 -- tests/phpunit/includes/StatusTest.php | 2 +- tests/phpunit/includes/WikiPageTest.php | 2 -- tests/phpunit/includes/api/ApiUploadTest.php | 4 ---- tests/phpunit/includes/api/RandomImageGenerator.php | 4 ---- tests/phpunit/includes/db/DatabaseMysqlBaseTest.php | 1 - tests/phpunit/includes/debug/MWDebugTest.php | 1 - tests/phpunit/includes/media/ExifRotationTest.php | 1 - tests/phpunit/includes/media/ExifTest.php | 2 -- .../includes/media/JpegMetadataExtractorTest.php | 1 - tests/phpunit/includes/media/JpegTest.php | 1 - .../includes/media/PNGMetadataExtractorTest.php | 1 - tests/phpunit/includes/upload/UploadBaseTest.php | 1 - .../includes/utils/ZipDirectoryReaderTest.php | 1 - tests/phpunit/languages/LanguageSrTest.php | 1 - tests/phpunit/languages/LanguageTest.php | 1 - tests/phpunit/languages/LanguageUzTest.php | 1 - tests/phpunit/maintenance/DumpTestCase.php | 3 --- tests/phpunit/maintenance/MaintenanceTest.php | 6 ------ tests/phpunit/maintenance/backupPrefetchTest.php | 1 - tests/phpunit/maintenance/backupTextPassTest.php | 1 - tests/phpunit/maintenance/backup_LogTest.php | 2 -- tests/phpunit/maintenance/backup_PageTest.php | 1 - tests/phpunit/maintenance/fetchTextTest.php | 6 ------ tests/phpunit/skins/SideBarTest.php | 1 - tests/phpunit/structure/ResourcesTest.php | 1 - tests/testHelpers.inc | 1 - thumb.php | 2 -- 75 files changed, 10 insertions(+), 120 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index 34b89e73a3..9aeb99b9d5 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -1083,7 +1083,6 @@ class Block { return null; } - /** * Get all blocks that match any IP from an array of IP addresses * diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index fbf838c006..8e7e76e8a4 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5037,7 +5037,7 @@ $wgProfilePerHost = false; * Host for UDP profiler. * * The host should be running a daemon which can be obtained from MediaWiki - * Git at: + * Git at: * http://git.wikimedia.org/tree/operations%2Fsoftware.git/master/udpprofile */ $wgUDPProfilerHost = '127.0.0.1'; diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 57877a2b0f..ca0ca41335 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -508,7 +508,6 @@ function wfExpandUrl( $url, $defaultProto = PROTO_CURRENT ) { } } - // Analyze $serverUrl to obtain its protocol $bits = wfParseUrl( $serverUrl ); $serverHasProto = $bits && $bits['scheme'] != ''; @@ -2773,9 +2772,9 @@ function wfShellExecDisabled() { * @param array $limits optional array with limits(filesize, memory, time, walltime) * this overwrites the global wgShellMax* limits. * @param array $options Array of options: - * - duplicateStderr: Set this to true to duplicate stderr to stdout, + * - duplicateStderr: Set this to true to duplicate stderr to stdout, * including errors from limit.sh - * + * * @return string collected stdout as a string */ function wfShellExec( $cmd, &$retval = null, $environ = array(), @@ -2878,9 +2877,9 @@ function wfShellExec( $cmd, &$retval = null, $environ = array(), $logMsg = false; // According to the documentation, it is possible for stream_select() - // to fail due to EINTR. I haven't managed to induce this in testing - // despite sending various signals. If it did happen, the error - // message would take the form: + // to fail due to EINTR. I haven't managed to induce this in testing + // despite sending various signals. If it did happen, the error + // message would take the form: // // stream_select(): unable to select [4]: Interrupted system call (max_fd=5) // @@ -3514,7 +3513,6 @@ function wfResetSessionID() { wfRunHooks( 'ResetSessionID', array( $oldSessionId, $newSessionId ) ); } - /** * Initialise php session * diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php index b60146a63a..1680fd6bf0 100644 --- a/includes/HTMLForm.php +++ b/includes/HTMLForm.php @@ -745,7 +745,7 @@ class HTMLForm extends ContextSource { $attribs['class'] = array( 'mw-htmlform-submit' ); if ( $this->isVForm() ) { - // mw-ui-block is necessary because the buttons aren't necessarily in an + // mw-ui-block is necessary because the buttons aren't necessarily in an // immediate child div of the vform. array_push( $attribs['class'], 'mw-ui-button', 'mw-ui-big', 'mw-ui-primary', 'mw-ui-block' ); } diff --git a/includes/Setup.php b/includes/Setup.php index 2e083d83cd..81dada2d3a 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -293,7 +293,6 @@ if ( $wgMetaNamespace === false ) { $wgMetaNamespace = str_replace( ' ', '_', $wgSitename ); } - // Default value is either the suhosin limit or -1 for unlimited if ( $wgResourceLoaderMaxQueryLength === false ) { $maxValueLength = ini_get( 'suhosin.get.max_value_length' ); diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index 9fb39da077..f70a6dc192 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -1460,7 +1460,6 @@ class SpecialAllMyUploads extends RedirectSpecialPage { } } - /** * Redirect from Special:PermanentLink/### to index.php?oldid=### */ diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php index 3c5b7b26bc..05c0a39b1c 100644 --- a/includes/filebackend/FileOp.php +++ b/includes/filebackend/FileOp.php @@ -84,7 +84,6 @@ abstract class FileOp { } } - /** * Normalize a string if it is a valid storage path * diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 62e6388263..660116fbca 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -1717,7 +1717,6 @@ class FileRepo { */ protected function assertWritableRepo() {} - /** * Return information about the repository. * diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index b609f4328e..2cd4f90745 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -1371,7 +1371,6 @@ class LocalFile extends File { $dbw->commit( __METHOD__ ); // commit before anything bad can happen } - wfProfileOut( __METHOD__ . '-edit' ); # Save to cache and purge the squid diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php index 1f60fa69b5..c6e6dd36d9 100644 --- a/includes/gallery/TraditionalImageGallery.php +++ b/includes/gallery/TraditionalImageGallery.php @@ -22,7 +22,6 @@ class TraditionalImageGallery extends ImageGalleryBase { - /** * Return a HTML representation of the image gallery * @@ -167,7 +166,6 @@ class TraditionalImageGallery extends ImageGalleryBase { ) . "
\n" : ''; - $galleryText = $textlink . $text . $fileSize; $galleryText = $this->wrapGalleryText( $galleryText, $thumb ); @@ -185,7 +183,6 @@ class TraditionalImageGallery extends ImageGalleryBase { return $output; } - /** * Add the wrapper html around the thumb's caption * diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index 6178e5bfa2..fd91bcbcc7 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -302,7 +302,6 @@ class WebInstallerOutput { -