From 54c1e18eec6985ec72ca89142b27b9f6b9ac7eb2 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sun, 27 Dec 2015 18:48:47 +0100 Subject: [PATCH] Remove various double empty newlines The double empty newline is not needed between functions, variable or at end of file Change-Id: Ib866a95084c4601ac150a2b402cfa184ebc18afa --- includes/DefaultSettings.php | 3 --- includes/Sanitizer.php | 1 - includes/Setup.php | 2 -- includes/WebStart.php | 3 --- includes/api/ApiBase.php | 1 - includes/api/ApiFormatRaw.php | 1 - includes/changes/RecentChange.php | 1 - includes/compat/normal/UtfNormalUtil.php | 1 - includes/context/ContextSource.php | 1 - includes/debug/logger/LegacyLogger.php | 10 ---------- includes/debug/logger/LegacySpi.php | 1 - includes/debug/logger/LoggerFactory.php | 4 ---- includes/debug/logger/MonologSpi.php | 8 -------- includes/debug/logger/NullSpi.php | 2 -- includes/debug/logger/monolog/AvroFormatter.php | 1 - includes/debug/logger/monolog/LegacyHandler.php | 5 ----- includes/debug/logger/monolog/LineFormatter.php | 4 ---- includes/debug/logger/monolog/SyslogHandler.php | 1 - includes/exception/MWExceptionHandler.php | 1 - includes/parser/Parser.php | 1 - includes/parser/Preprocessor_Hash.php | 1 - .../resourceloader/ResourceLoaderStartUpModule.php | 1 - includes/specials/SpecialActiveusers.php | 2 -- includes/specials/SpecialBrokenRedirects.php | 1 - includes/specials/SpecialListDuplicatedFiles.php | 1 - includes/specials/SpecialMovepage.php | 1 - includes/user/User.php | 1 - includes/utils/MWCryptHKDF.php | 2 -- languages/i18n/en.json | 2 -- load.php | 1 - maintenance/cleanupTable.inc | 1 - maintenance/commandLine.inc | 1 - maintenance/findDeprecated.php | 1 - maintenance/generateLocalAutoload.php | 1 - maintenance/importImages.inc | 1 - maintenance/importSites.php | 1 - maintenance/pageExists.php | 1 - maintenance/storage/blob_tracking.sql | 1 - resources/src/jquery.tipsy/jquery.tipsy.js | 1 - resources/src/jquery/jquery.farbtastic.css | 1 - .../mediawiki.action.view.filepage.css | 1 - resources/src/mediawiki.less/mediawiki.mixins.less | 1 - .../src/mediawiki.less/mediawiki.ui/variables.less | 1 - .../mediawiki.special.preferences.styles.css | 1 - resources/src/mediawiki.ui/components/forms.less | 1 - resources/src/mediawiki.ui/components/icons.less | 1 - .../includes/debug/logger/monolog/KafkaHandlerTest.php | 1 - tests/phpunit/includes/exception/HttpErrorTest.php | 2 -- tests/phpunit/includes/libs/MemoizedCallableTest.php | 1 - .../includes/logging/ProtectLogFormatterTest.php | 3 --- .../phpunit/includes/media/MediaWikiMediaTestCase.php | 1 - tests/phpunit/includes/media/XCFTest.php | 1 - .../includes/registration/ExtensionProcessorTest.php | 2 -- tests/phpunit/includes/upload/UploadBaseTest.php | 1 - tests/phpunit/includes/utils/BatchRowUpdateTest.php | 1 - tests/phpunit/includes/utils/MWCryptHKDFTest.php | 2 -- tests/phpunit/phpunit.php | 1 - thumb.php | 1 - 58 files changed, 98 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 76309b997a..0d4ecacb0e 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1003,7 +1003,6 @@ $wgJpegTran = '/usr/bin/jpegtran'; */ $wgExiv2Command = '/usr/bin/exiv2'; - /** * Path to exiftool binary. Used for lossless ICC profile swapping. * @@ -1470,7 +1469,6 @@ $wgDjvuOutputExtension = 'jpg'; * @{ */ - /** * Site admin email address. * @@ -4434,7 +4432,6 @@ $wgPasswordPolicy = array( ), ); - /** * For compatibility with old installations set to false * @deprecated since 1.24 will be removed in future diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 5242856434..d41e559511 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -950,7 +950,6 @@ class Sanitizer { return $value; } - /** * Pick apart some CSS and check it for forbidden or unsafe structures. * Returns a sanitized string. This sanitized string will have diff --git a/includes/Setup.php b/includes/Setup.php index e22184fc88..c86372286a 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -509,7 +509,6 @@ MWExceptionHandler::installHandler(); require_once "$IP/includes/compat/normal/UtfNormalUtil.php"; - $ps_validation = Profiler::instance()->scopedProfileIn( $fname . '-validation' ); // T48998: Bail out early if $wgArticlePath is non-absolute @@ -734,4 +733,3 @@ $wgFullyInitialised = true; Profiler::instance()->scopedProfileOut( $ps_extensions ); Profiler::instance()->scopedProfileOut( $ps_setup ); - diff --git a/includes/WebStart.php b/includes/WebStart.php index c5e74576f0..fb6c3e6768 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -40,7 +40,6 @@ if ( function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() ) { . 'for help on how to disable magic quotes.' ); } - # bug 15461: Make IE8 turn off content sniffing. Everybody else should ignore this # We're adding it here so that it's *always* set, even for alternate entry # points and when $wgOut gets disabled or overridden. @@ -91,7 +90,6 @@ if ( file_exists( "$IP/StartProfiler.php" ) ) { require "$IP/StartProfiler.php"; } - # Load default settings require_once "$IP/includes/DefaultSettings.php"; @@ -141,7 +139,6 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) { require_once MW_CONFIG_FILE; } - # Initialise output buffering # Check that there is no previous output or previously set up buffers, because # that would cause us to potentially mix gzip and non-gzip output, creating a diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index cb74ae1bfd..56a8a7a2c7 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -214,7 +214,6 @@ abstract class ApiBase extends ContextSource { } } - /************************************************************************//** * @name Methods to implement * @{ diff --git a/includes/api/ApiFormatRaw.php b/includes/api/ApiFormatRaw.php index b1a9c984f0..9da040ca0b 100644 --- a/includes/api/ApiFormatRaw.php +++ b/includes/api/ApiFormatRaw.php @@ -33,7 +33,6 @@ class ApiFormatRaw extends ApiFormatBase { private $errorFallback; private $mFailWithHTTPError = false; - /** * @param ApiMain $main * @param ApiFormatBase|null $errorFallback Object to fall back on for errors diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index 7c6fbb9133..408b5eedcf 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -960,4 +960,3 @@ class RecentChange { return $unserializedParams; } } - diff --git a/includes/compat/normal/UtfNormalUtil.php b/includes/compat/normal/UtfNormalUtil.php index 9ed9bc2431..0bc8d0f92c 100644 --- a/includes/compat/normal/UtfNormalUtil.php +++ b/includes/compat/normal/UtfNormalUtil.php @@ -25,7 +25,6 @@ * @ingroup UtfNormal */ - use UtfNormal\Utils; /** diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php index a8850fc8bd..df5f71c318 100644 --- a/includes/context/ContextSource.php +++ b/includes/context/ContextSource.php @@ -172,7 +172,6 @@ abstract class ContextSource implements IContextSource { return $this->getContext()->getStats(); } - /** * Get a Message object with context set * Parameters are the same as wfMessage() diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php index 65719fa574..ef7d81947c 100644 --- a/includes/debug/logger/LegacyLogger.php +++ b/includes/debug/logger/LegacyLogger.php @@ -70,7 +70,6 @@ class LegacyLogger extends AbstractLogger { LogLevel::EMERGENCY => 600, ); - /** * @param string $channel */ @@ -95,7 +94,6 @@ class LegacyLogger extends AbstractLogger { MWDebug::debugMsg( $message, array( 'channel' => $this->channel ) + $context ); } - /** * Determine if the given message should be emitted or not. * @@ -154,7 +152,6 @@ class LegacyLogger extends AbstractLogger { return $shouldEmit; } - /** * Format a message. * @@ -239,7 +236,6 @@ class LegacyLogger extends AbstractLogger { return self::interpolate( $text, $context ); } - /** * Format a message as `wfDebug()` would have formatted it. * @@ -261,7 +257,6 @@ class LegacyLogger extends AbstractLogger { return "{$text}\n"; } - /** * Format a message as `wfLogDBError()` would have formatted it. * @@ -294,7 +289,6 @@ class LegacyLogger extends AbstractLogger { return $text; } - /** * Format a message as `wfDebugLog() would have formatted it. * @@ -310,7 +304,6 @@ class LegacyLogger extends AbstractLogger { return $text; } - /** * Interpolate placeholders in logging message. * @@ -329,7 +322,6 @@ class LegacyLogger extends AbstractLogger { return $message; } - /** * Convert a logging context element to a string suitable for * interpolation. @@ -389,7 +381,6 @@ class LegacyLogger extends AbstractLogger { return '[Unknown ' . gettype( $item ) . ']'; } - /** * Select the appropriate log output destination for the given log event. * @@ -430,7 +421,6 @@ class LegacyLogger extends AbstractLogger { return $destination; } - /** * Log to a file without getting "file size exceeded" signals. * diff --git a/includes/debug/logger/LegacySpi.php b/includes/debug/logger/LegacySpi.php index 1bf39e41b0..1bb779dd7a 100644 --- a/includes/debug/logger/LegacySpi.php +++ b/includes/debug/logger/LegacySpi.php @@ -42,7 +42,6 @@ class LegacySpi implements Spi { */ protected $singletons = array(); - /** * Get a logger instance. * diff --git a/includes/debug/logger/LoggerFactory.php b/includes/debug/logger/LoggerFactory.php index e0c4989bf0..ce92dbd508 100644 --- a/includes/debug/logger/LoggerFactory.php +++ b/includes/debug/logger/LoggerFactory.php @@ -51,7 +51,6 @@ class LoggerFactory { */ private static $spi; - /** * Register a service provider to create new \Psr\Log\LoggerInterface * instances. @@ -62,7 +61,6 @@ class LoggerFactory { self::$spi = $provider; } - /** * Get the registered service provider. * @@ -86,7 +84,6 @@ class LoggerFactory { return self::$spi; } - /** * Get a named logger instance from the currently configured logger factory. * @@ -97,7 +94,6 @@ class LoggerFactory { return self::getProvider()->getLogger( $channel ); } - /** * Construction of utility class is not allowed. */ diff --git a/includes/debug/logger/MonologSpi.php b/includes/debug/logger/MonologSpi.php index eea9adc4c4..4b9c3f5217 100644 --- a/includes/debug/logger/MonologSpi.php +++ b/includes/debug/logger/MonologSpi.php @@ -126,7 +126,6 @@ class MonologSpi implements Spi { */ protected $config; - /** * @param array $config Configuration data. */ @@ -135,7 +134,6 @@ class MonologSpi implements Spi { $this->mergeConfig( $config ); } - /** * Merge additional configuration data into the configuration. * @@ -153,7 +151,6 @@ class MonologSpi implements Spi { $this->reset(); } - /** * Reset internal caches. * @@ -169,7 +166,6 @@ class MonologSpi implements Spi { ); } - /** * Get a logger instance. * @@ -195,7 +191,6 @@ class MonologSpi implements Spi { return $this->singletons['loggers'][$channel]; } - /** * Create a logger. * @param string $channel Logger channel @@ -225,7 +220,6 @@ class MonologSpi implements Spi { return $obj; } - /** * Create or return cached processor. * @param string $name Processor name @@ -240,7 +234,6 @@ class MonologSpi implements Spi { return $this->singletons['processors'][$name]; } - /** * Create or return cached handler. * @param string $name Processor name @@ -263,7 +256,6 @@ class MonologSpi implements Spi { return $this->singletons['handlers'][$name]; } - /** * Create or return cached formatter. * @param string $name Formatter name diff --git a/includes/debug/logger/NullSpi.php b/includes/debug/logger/NullSpi.php index 8ae34e83e4..f92ff7d11f 100644 --- a/includes/debug/logger/NullSpi.php +++ b/includes/debug/logger/NullSpi.php @@ -44,12 +44,10 @@ class NullSpi implements Spi { */ protected $singleton; - public function __construct() { $this->singleton = new NullLogger(); } - /** * Get a logger instance. * diff --git a/includes/debug/logger/monolog/AvroFormatter.php b/includes/debug/logger/monolog/AvroFormatter.php index 510d42aab0..fc24e828cf 100644 --- a/includes/debug/logger/monolog/AvroFormatter.php +++ b/includes/debug/logger/monolog/AvroFormatter.php @@ -171,7 +171,6 @@ class AvroFormatter implements FormatterInterface { return null; } - /** * convert an integer to a 64bits big endian long (Java compatible) * NOTE: certainly only compatible with PHP 64bits diff --git a/includes/debug/logger/monolog/LegacyHandler.php b/includes/debug/logger/monolog/LegacyHandler.php index a4bb17268f..7c75a7d624 100644 --- a/includes/debug/logger/monolog/LegacyHandler.php +++ b/includes/debug/logger/monolog/LegacyHandler.php @@ -87,7 +87,6 @@ class LegacyHandler extends AbstractProcessingHandler { */ protected $prefix; - /** * @param string $stream Stream URI * @param bool $useLegacyFilter Filter log events using legacy rules @@ -160,7 +159,6 @@ class LegacyHandler extends AbstractProcessingHandler { } } - /** * Custom error handler. * @param int $code Error number @@ -170,7 +168,6 @@ class LegacyHandler extends AbstractProcessingHandler { $this->error = $msg; } - /** * Should we use UDP to send messages to the sink? * @return bool @@ -179,7 +176,6 @@ class LegacyHandler extends AbstractProcessingHandler { return $this->host !== null; } - protected function write( array $record ) { if ( $this->useLegacyFilter && !LegacyLogger::shouldEmit( @@ -228,7 +224,6 @@ class LegacyHandler extends AbstractProcessingHandler { } } - public function close() { if ( is_resource( $this->sink ) ) { if ( $this->useUdp() ) { diff --git a/includes/debug/logger/monolog/LineFormatter.php b/includes/debug/logger/monolog/LineFormatter.php index 2ba7a53cb5..acc2b30bfa 100644 --- a/includes/debug/logger/monolog/LineFormatter.php +++ b/includes/debug/logger/monolog/LineFormatter.php @@ -60,7 +60,6 @@ class LineFormatter extends MonologLineFormatter { $this->includeStacktraces( $includeStacktraces ); } - /** * {@inheritdoc} */ @@ -94,7 +93,6 @@ class LineFormatter extends MonologLineFormatter { return $output; } - /** * Convert an Exception to a string. * @@ -105,7 +103,6 @@ class LineFormatter extends MonologLineFormatter { return $this->normalizeExceptionArray( $this->exceptionAsArray( $e ) ); } - /** * Convert an exception to an array of structured data. * @@ -130,7 +127,6 @@ class LineFormatter extends MonologLineFormatter { return $out; } - /** * Convert an array of Exception data to a string. * diff --git a/includes/debug/logger/monolog/SyslogHandler.php b/includes/debug/logger/monolog/SyslogHandler.php index 2614b16ce8..104ee5808f 100644 --- a/includes/debug/logger/monolog/SyslogHandler.php +++ b/includes/debug/logger/monolog/SyslogHandler.php @@ -58,7 +58,6 @@ class SyslogHandler extends SyslogUdpHandler { */ private $hostname; - /** * @param string $appname Application name to report to syslog * @param string $host Syslog host diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 88d94f1164..d653dd0afb 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -246,7 +246,6 @@ class MWExceptionHandler { return false; } - /** * Dual purpose callback used as both a set_error_handler() callback and * a registered shutdown function. Receive a callback from the interpreter diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index cfbf0b46cd..eaecedd5a3 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -3752,7 +3752,6 @@ class Parser { public function callParserFunction( $frame, $function, array $args = array() ) { global $wgContLang; - # Case sensitive functions if ( isset( $this->mFunctionSynonyms[1][$function] ) ) { $function = $this->mFunctionSynonyms[1][$function]; diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index 14292a59b1..50eaefbce3 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -88,7 +88,6 @@ class Preprocessor_Hash extends Preprocessor { return $node; } - /** * Preprocess some wikitext and return the document tree. * This is the ghost of Parser::replace_variables(). diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index fc128fb7d0..4a68f8ed92 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -178,7 +178,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { } } - /** * Get registration code for all modules. * diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php index 70c7a8b6d5..1f369d804c 100644 --- a/includes/specials/SpecialActiveusers.php +++ b/includes/specials/SpecialActiveusers.php @@ -318,5 +318,3 @@ class SpecialActiveUsers extends SpecialPage { return 'users'; } } - - diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php index 9ea18daa87..71616fa2a2 100644 --- a/includes/specials/SpecialBrokenRedirects.php +++ b/includes/specials/SpecialBrokenRedirects.php @@ -164,7 +164,6 @@ class BrokenRedirectsPage extends QueryPage { return $out; } - /** * Cache page content model for performance * diff --git a/includes/specials/SpecialListDuplicatedFiles.php b/includes/specials/SpecialListDuplicatedFiles.php index 317b62fe6f..3f47f91cb3 100644 --- a/includes/specials/SpecialListDuplicatedFiles.php +++ b/includes/specials/SpecialListDuplicatedFiles.php @@ -87,7 +87,6 @@ class ListDuplicatedFilesPage extends QueryPage { } } - /** * @param Skin $skin * @param object $result Result row diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index a1bd2fae1e..0c0d929ddb 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -33,7 +33,6 @@ class MovePageForm extends UnlistedSpecialPage { /** @var Title */ protected $newTitle; - /** @var string Text input */ protected $reason; diff --git a/includes/user/User.php b/includes/user/User.php index fed9664abd..8fa430f812 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -895,7 +895,6 @@ class User implements IDBAccessObject { return $this->getPasswordValidity( $password ) === true; } - /** * Given unvalidated password input, return error message on failure. * diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php index 2dfc902c96..f5d7828814 100644 --- a/includes/utils/MWCryptHKDF.php +++ b/includes/utils/MWCryptHKDF.php @@ -97,7 +97,6 @@ class MWCryptHKDF { 'whirlpool' => 64, ); - /** * @param string $secretKeyMaterial * @param string $algorithm Name of hashing algorithm @@ -214,7 +213,6 @@ class MWCryptHKDF { ); } - /** * RFC5869 defines HKDF in 2 steps, extraction and expansion. * From http://eprint.iacr.org/2010/264.pdf: diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 1eb76a7543..349cac6c0f 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3917,5 +3917,3 @@ "mw-widgets-titleinput-description-redirect": "redirect to $1", "api-error-blacklisted": "Please choose a different, descriptive title." } - - diff --git a/load.php b/load.php index 43c2fafce8..1d6a242575 100644 --- a/load.php +++ b/load.php @@ -26,7 +26,6 @@ use MediaWiki\Logger\LoggerFactory; require __DIR__ . '/includes/WebStart.php'; - // URL safety checks if ( !$wgRequest->checkUrlExtension() ) { return; diff --git a/maintenance/cleanupTable.inc b/maintenance/cleanupTable.inc index 8368c8449d..74073bc588 100644 --- a/maintenance/cleanupTable.inc +++ b/maintenance/cleanupTable.inc @@ -172,4 +172,3 @@ class TableCleanup extends Maintenance { return sprintf( "\\x%02x", ord( $matches[1] ) ); } } - diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 88776f4f41..1a05907979 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -63,4 +63,3 @@ class CommandLineInc extends Maintenance { $maintClass = 'CommandLineInc'; require RUN_MAINTENANCE_IF_MAIN; - diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php index cbb1d5bf19..8c7e242207 100644 --- a/maintenance/findDeprecated.php +++ b/maintenance/findDeprecated.php @@ -117,7 +117,6 @@ class DeprecatedInterfaceFinder extends FileAwareNodeVisitor { } } - /** * Maintenance task that recursively scans MediaWiki PHP files for deprecated * functions and interfaces and produces a report. diff --git a/maintenance/generateLocalAutoload.php b/maintenance/generateLocalAutoload.php index b8caa4d93f..d3f082dbf0 100644 --- a/maintenance/generateLocalAutoload.php +++ b/maintenance/generateLocalAutoload.php @@ -22,4 +22,3 @@ $generator->forceClassPath( 'MyLocalSettingsGenerator', "$base/mw-config/overrid // Write out the autoload $generator->generateAutoload( 'maintenance/generateLocalAutoload.php' ); - diff --git a/maintenance/importImages.inc b/maintenance/importImages.inc index 4b839a0f8a..0f69f6680d 100644 --- a/maintenance/importImages.inc +++ b/maintenance/importImages.inc @@ -135,4 +135,3 @@ function getFileUserFromSourceWiki( $wiki_host, $file ) { return html_entity_decode( $matches[1] ); } - diff --git a/maintenance/importSites.php b/maintenance/importSites.php index 7cd2000820..c5c00aa24d 100644 --- a/maintenance/importSites.php +++ b/maintenance/importSites.php @@ -24,7 +24,6 @@ class ImportSites extends Maintenance { parent::__construct(); } - /** * Do the import. */ diff --git a/maintenance/pageExists.php b/maintenance/pageExists.php index 3bde81ef31..f4143834da 100644 --- a/maintenance/pageExists.php +++ b/maintenance/pageExists.php @@ -51,4 +51,3 @@ class PageExists extends Maintenance { $maintClass = "PageExists"; require_once RUN_MAINTENANCE_IF_MAIN; - diff --git a/maintenance/storage/blob_tracking.sql b/maintenance/storage/blob_tracking.sql index 6cac9a3836..fbc407c76a 100644 --- a/maintenance/storage/blob_tracking.sql +++ b/maintenance/storage/blob_tracking.sql @@ -54,4 +54,3 @@ CREATE TABLE /*$wgDBprefix*/blob_orphans ( PRIMARY KEY (bo_cluster, bo_blob_id) ) /*$wgDBTableOptions*/; - diff --git a/resources/src/jquery.tipsy/jquery.tipsy.js b/resources/src/jquery.tipsy/jquery.tipsy.js index 29b7490f7f..2c6a5887e0 100644 --- a/resources/src/jquery.tipsy/jquery.tipsy.js +++ b/resources/src/jquery.tipsy/jquery.tipsy.js @@ -109,7 +109,6 @@ } }, - fixTitle: function() { var $e = this.$element; if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') { diff --git a/resources/src/jquery/jquery.farbtastic.css b/resources/src/jquery/jquery.farbtastic.css index 1c6428f8a5..baba3480fb 100644 --- a/resources/src/jquery/jquery.farbtastic.css +++ b/resources/src/jquery/jquery.farbtastic.css @@ -51,4 +51,3 @@ /* @embed */ background: url(images/marker.png) no-repeat; } - diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css index bfc201afc7..5112728b16 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css +++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css @@ -68,4 +68,3 @@ ul#filetoc { #shared-image-conflict { font-style: italic; } - diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less index 06c18e6d6c..457e8c1ca1 100644 --- a/resources/src/mediawiki.less/mediawiki.mixins.less +++ b/resources/src/mediawiki.less/mediawiki.mixins.less @@ -19,7 +19,6 @@ background-size: @width @height; } - .vertical-gradient(@startColor: gray, @endColor: white, @startPos: 0, @endPos: 100%) { background-color: @endColor; background-image: -moz-linear-gradient( top, @startColor @startPos, @endColor @endPos ); // Firefox 3.6+ diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less index 4b6bb48b36..d87e1177e3 100644 --- a/resources/src/mediawiki.less/mediawiki.ui/variables.less +++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less @@ -69,7 +69,6 @@ // Global border radius to be used to buttons and inputs @borderRadius: 2px; - // Icon related variables @iconSize: 1.5em; @iconGutterWidth: 1em; diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css index 4a797a67f7..e05d16344e 100644 --- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css +++ b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css @@ -50,4 +50,3 @@ .client-js #preferences #mw-prefsection-personal { display: block; } - diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less index dc49e2023c..6a5fa96339 100644 --- a/resources/src/mediawiki.ui/components/forms.less +++ b/resources/src/mediawiki.ui/components/forms.less @@ -72,7 +72,6 @@ width: auto; } - // Styles for information boxes // // Regular HTMLForm uses .error class, some special pages like diff --git a/resources/src/mediawiki.ui/components/icons.less b/resources/src/mediawiki.ui/components/icons.less index d9e8c4202e..c90a6b9e93 100644 --- a/resources/src/mediawiki.ui/components/icons.less +++ b/resources/src/mediawiki.ui/components/icons.less @@ -64,7 +64,6 @@ content: ''; } - // Icons with text // // Markup: diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php index 9866ce140d..d2b267a060 100644 --- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php +++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php @@ -167,7 +167,6 @@ class KafkaHandlerTest extends MediaWikiTestCase { } } - public function testBatchHandlesNullFormatterResult() { $produce = $this->getMockBuilder( 'Kafka\Produce' ) ->disableOriginalConstructor() diff --git a/tests/phpunit/includes/exception/HttpErrorTest.php b/tests/phpunit/includes/exception/HttpErrorTest.php index 66fe90c955..0aef146e2a 100644 --- a/tests/phpunit/includes/exception/HttpErrorTest.php +++ b/tests/phpunit/includes/exception/HttpErrorTest.php @@ -60,6 +60,4 @@ class HttpErrorTest extends MediaWikiTestCase { ) ); } - - } diff --git a/tests/phpunit/includes/libs/MemoizedCallableTest.php b/tests/phpunit/includes/libs/MemoizedCallableTest.php index 921bba8466..6edb3d84d6 100644 --- a/tests/phpunit/includes/libs/MemoizedCallableTest.php +++ b/tests/phpunit/includes/libs/MemoizedCallableTest.php @@ -20,7 +20,6 @@ class ArrayBackedMemoizedCallable extends MemoizedCallable { } } - /** * PHP Unit tests for MemoizedCallable class. * @covers MemoizedCallable diff --git a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php index 17decf36fa..8010b77383 100644 --- a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php +++ b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php @@ -160,7 +160,6 @@ class ProtectLogFormatterTest extends LogFormatterTestCase { ); } - /** * @dataProvider provideProtectLogDatabaseRows */ @@ -329,7 +328,6 @@ class ProtectLogFormatterTest extends LogFormatterTestCase { ); } - /** * @dataProvider provideModifyLogDatabaseRows */ @@ -362,7 +360,6 @@ class ProtectLogFormatterTest extends LogFormatterTestCase { ); } - /** * @dataProvider provideUnprotectLogDatabaseRows */ diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php index 8f28158dcd..cb10be3d27 100644 --- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php +++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php @@ -11,7 +11,6 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase { /** @var string */ protected $filePath; - protected function setUp() { parent::setUp(); diff --git a/tests/phpunit/includes/media/XCFTest.php b/tests/phpunit/includes/media/XCFTest.php index 5b2de151f2..536827ae3a 100644 --- a/tests/phpunit/includes/media/XCFTest.php +++ b/tests/phpunit/includes/media/XCFTest.php @@ -13,7 +13,6 @@ class XCFHandlerTest extends MediaWikiMediaTestCase { $this->handler = new XCFHandler(); } - /** * @param string $filename * @param int $expectedWidth Width diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php index ddf552ef0d..843f576f79 100644 --- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php +++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php @@ -166,7 +166,6 @@ class ExtensionProcessorTest extends MediaWikiTestCase { } } - public static function provideExtractMessagesDirs() { $dir = __DIR__ . '/FooBar/'; return array( @@ -400,7 +399,6 @@ class ExtensionProcessorTest extends MediaWikiTestCase { } } - /** * Allow overriding the default value of $this->globals * so we can test merging diff --git a/tests/phpunit/includes/upload/UploadBaseTest.php b/tests/phpunit/includes/upload/UploadBaseTest.php index 9ec1b4667b..90051ee11b 100644 --- a/tests/phpunit/includes/upload/UploadBaseTest.php +++ b/tests/phpunit/includes/upload/UploadBaseTest.php @@ -125,7 +125,6 @@ class UploadBaseTest extends MediaWikiTestCase { ); } - /** * @dataProvider provideCheckSvgScriptCallback */ diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php b/tests/phpunit/includes/utils/BatchRowUpdateTest.php index d224af8ed0..61d9a70a15 100644 --- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php +++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php @@ -221,7 +221,6 @@ class BatchRowUpdateTest extends MediaWikiTestCase { return call_user_func_array( array( $this, 'onConsecutiveCalls' ), $retvals ); } - protected function genSelectResult( $batchSize, $numRows, $rowGenerator ) { $res = array(); for ( $i = 0; $i < $numRows; $i += $batchSize ) { diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php b/tests/phpunit/includes/utils/MWCryptHKDFTest.php index 2c51af3ce9..5dc049831b 100644 --- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php +++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php @@ -91,6 +91,4 @@ class MWCryptHKDFTest extends MediaWikiTestCase { ); // @codingStandardsIgnoreEnd } - - } diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index aaa77514f6..29ff1a01f3 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -242,7 +242,6 @@ if ( version_compare( PHP_VERSION, '5.4.0', '<' ) ) { } ); } - $ok = false; if ( class_exists( 'PHPUnit_TextUI_Command' ) ) { diff --git a/thumb.php b/thumb.php index fed025874b..04b3e42ac8 100644 --- a/thumb.php +++ b/thumb.php @@ -567,7 +567,6 @@ function wfExtractThumbParams( $file, $params ) { return null; } - /** * Output a thumbnail generation error message * -- 2.20.1