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

@@ -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

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

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 );
-

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

includes/api/ApiBase.php

@@ -214,7 +214,6 @@ abstract class ApiBase extends ContextSource {
 		}
 	}
 
-
 	/************************************************************************//**
 	 * @name   Methods to implement
 	 * @{

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

includes/changes/RecentChange.php

@@ -960,4 +960,3 @@ class RecentChange {
 		return $unserializedParams;
 	}
 }
-

includes/compat/normal/UtfNormalUtil.php

@@ -25,7 +25,6 @@
  * @ingroup UtfNormal
  */
 
-
 use UtfNormal\Utils;
 
 /**

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()

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.
 	*

includes/debug/logger/LegacySpi.php

@@ -42,7 +42,6 @@ class LegacySpi implements Spi {
 	 */
 	protected $singletons = array();
 
-
 	/**
 	 * Get a logger instance.
 	 *

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.
 	 */

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

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.
 	 *

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

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() ) {

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.
 	 *

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

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

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];

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().

includes/resourceloader/ResourceLoaderStartUpModule.php

@@ -178,7 +178,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		}
 	}
 
-
 	/**
 	 * Get registration code for all modules.
 	 *

includes/specials/SpecialActiveusers.php

@@ -318,5 +318,3 @@ class SpecialActiveUsers extends SpecialPage {
 		return 'users';
 	}
 }
-
-

includes/specials/SpecialBrokenRedirects.php

@@ -164,7 +164,6 @@ class BrokenRedirectsPage extends QueryPage {
 		return $out;
 	}
 
-
 	/**
 	 * Cache page content model for performance
 	 *

includes/specials/SpecialListDuplicatedFiles.php

@@ -87,7 +87,6 @@ class ListDuplicatedFilesPage extends QueryPage {
 		}
 	}
 
-
 	/**
 	 * @param Skin $skin
 	 * @param object $result Result row

includes/specials/SpecialMovepage.php

@@ -33,7 +33,6 @@ class MovePageForm extends UnlistedSpecialPage {
 	/** @var Title */
 	protected $newTitle;
 
-
 	/** @var string Text input */
 	protected $reason;
 

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.
 	 *

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:

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."
 }
-
-

load.php

@@ -26,7 +26,6 @@ use MediaWiki\Logger\LoggerFactory;
 
 require __DIR__ . '/includes/WebStart.php';
 
-
 // URL safety checks
 if ( !$wgRequest->checkUrlExtension() ) {
 	return;

maintenance/cleanupTable.inc

@@ -172,4 +172,3 @@ class TableCleanup extends Maintenance {
 		return sprintf( "\\x%02x", ord( $matches[1] ) );
 	}
 }
-

maintenance/commandLine.inc

@@ -63,4 +63,3 @@ class CommandLineInc extends Maintenance {
 
 $maintClass = 'CommandLineInc';
 require RUN_MAINTENANCE_IF_MAIN;
-

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.

maintenance/generateLocalAutoload.php

@@ -22,4 +22,3 @@ $generator->forceClassPath( 'MyLocalSettingsGenerator', "$base/mw-config/overrid
 
 // Write out the autoload
 $generator->generateAutoload( 'maintenance/generateLocalAutoload.php' );
-

maintenance/importImages.inc

@@ -135,4 +135,3 @@ function getFileUserFromSourceWiki( $wiki_host, $file ) {
 
 	return html_entity_decode( $matches[1] );
 }
-

maintenance/importSites.php

@@ -24,7 +24,6 @@ class ImportSites extends Maintenance {
 		parent::__construct();
 	}
 
-
 	/**
 	 * Do the import.
 	 */

maintenance/pageExists.php

@@ -51,4 +51,3 @@ class PageExists extends Maintenance {
 
 $maintClass = "PageExists";
 require_once RUN_MAINTENANCE_IF_MAIN;
-

maintenance/storage/blob_tracking.sql

@@ -54,4 +54,3 @@ CREATE TABLE /*$wgDBprefix*/blob_orphans (
 
 	PRIMARY KEY (bo_cluster, bo_blob_id)
 ) /*$wgDBTableOptions*/;
-

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') {

resources/src/jquery/jquery.farbtastic.css

@@ -51,4 +51,3 @@
 	/* @embed */
 	background: url(images/marker.png) no-repeat;
 }
-

resources/src/mediawiki.action/mediawiki.action.view.filepage.css

@@ -68,4 +68,3 @@ ul#filetoc {
 #shared-image-conflict {
 	font-style: italic;
 }
-

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+

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;

resources/src/mediawiki.special/mediawiki.special.preferences.styles.css

@@ -50,4 +50,3 @@
 .client-js #preferences #mw-prefsection-personal {
 	display: block;
 }
-

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

resources/src/mediawiki.ui/components/icons.less

@@ -64,7 +64,6 @@
 		content: '';
 	}
 
-
 	// Icons with text
 	//
 	// Markup:

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()

tests/phpunit/includes/exception/HttpErrorTest.php

@@ -60,6 +60,4 @@ class HttpErrorTest extends MediaWikiTestCase {
 			)
 		);
 	}
-
-
 }

tests/phpunit/includes/libs/MemoizedCallableTest.php

@@ -20,7 +20,6 @@ class ArrayBackedMemoizedCallable extends MemoizedCallable {
 	}
 }
 
-
 /**
  * PHP Unit tests for MemoizedCallable class.
  * @covers MemoizedCallable

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
 	 */

tests/phpunit/includes/media/MediaWikiMediaTestCase.php

@@ -11,7 +11,6 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase {
 	/** @var string */
 	protected $filePath;
 
-
 	protected function setUp() {
 		parent::setUp();
 

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

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

tests/phpunit/includes/upload/UploadBaseTest.php

@@ -125,7 +125,6 @@ class UploadBaseTest extends MediaWikiTestCase {
 		);
 	}
 
-
 	/**
 	 * @dataProvider provideCheckSvgScriptCallback
 	 */

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 ) {

tests/phpunit/includes/utils/MWCryptHKDFTest.php

@@ -91,6 +91,4 @@ class MWCryptHKDFTest extends MediaWikiTestCase {
 		);
 		// @codingStandardsIgnoreEnd
 	}
-
-
 }

tests/phpunit/phpunit.php

@@ -242,7 +242,6 @@ if ( version_compare( PHP_VERSION, '5.4.0', '<' ) ) {
 	} );
 }
 
-
 $ok = false;
 
 if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {

thumb.php

@@ -567,7 +567,6 @@ function wfExtractThumbParams( $file, $params ) {
 	return null;
 }
 
-
 /**
  * Output a thumbnail generation error message
  *