jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366495 )
Change subject: phpcs: Enable MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines and make pass ...................................................................... phpcs: Enable MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines and make pass Change-Id: I13051dc8bd3e3b354627793f36bf62028d730da7 --- M phpcs.xml M search-redirect.php M tests/dblistTest.php M tests/timelineTest.php M wmf-config/CirrusSearch-common.php M wmf-config/CommonSettings-labs.php M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php M wmf-config/StartProfiler.php M wmf-config/db-eqiad.php M wmf-config/flaggedrevs.php M wmf-config/logging.php 12 files changed, 0 insertions(+), 24 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/phpcs.xml b/phpcs.xml index 693b480..d2e3ee2 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -16,7 +16,6 @@ <exclude name="MediaWiki.NamingConventions.ValidGlobalName.wgPrefix" /> <exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals" /> <exclude name="MediaWiki.VariableAnalysis.UnusedGlobalVariables" /> - <exclude name="MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines" /> <exclude name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" /> <exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect" /> <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment" /> diff --git a/search-redirect.php b/search-redirect.php index ea7169f..12afdd3 100644 --- a/search-redirect.php +++ b/search-redirect.php @@ -14,7 +14,6 @@ $proto = 'http'; } - // validate $language if ( !preg_match( '/^[a-zA-Z\-]*$/', $language ) ) { $language = 'en'; diff --git a/tests/dblistTest.php b/tests/dblistTest.php index 9af9d62..b3c9b49 100644 --- a/tests/dblistTest.php +++ b/tests/dblistTest.php @@ -8,7 +8,6 @@ * @file */ - class DbListTests extends PHPUnit_Framework_TestCase { public static function provideProjectDbnames() { @@ -51,7 +50,6 @@ // Content of all.dblist $all = $lists['all']; - // dblist files that are exceptions $skip = array( diff --git a/tests/timelineTest.php b/tests/timelineTest.php index 90993a4..4540d75 100644 --- a/tests/timelineTest.php +++ b/tests/timelineTest.php @@ -13,7 +13,6 @@ $this->assertStringEndsNotWith( '.ttf', $filename ); } - /** * @dataProvider wgTimelineFontFileValues */ diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index a99774e..46e4aef 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -94,7 +94,6 @@ $wgCirrusSearchWikimediaExtraPlugin['token_count_router'] = true; } - # Enable the "experimental" highlighter on all wikis $wgCirrusSearchUseExperimentalHighlighter = true; $wgCirrusSearchOptimizeIndexForExperimentalHighlighter = true; diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 50be44b..f2299d5 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -367,7 +367,6 @@ $wg3dProcessor = ['/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0 1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js']; } - $wgAuthManagerAutoConfig['preauth'][GuanacoProvider::class] = [ 'class' => GuanacoProvider::class, 'sort' => 0, @@ -405,6 +404,5 @@ return \StatusValue::newGood(); } } - } # end safeguard diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5cb764f..8ed2397 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -465,7 +465,6 @@ $wgBotPasswordsCluster = $wmgBotPasswordsCluster; $wgBotPasswordsDatabase = $wmgBotPasswordsDatabase; - if ( PHP_SAPI === 'cli' ) { $wgShowExceptionDetails = true; $wgShowDBErrorBacktrace = true; @@ -929,7 +928,6 @@ ]; $wgUrlShortenerReadOnly = true; } - if ( $wmgPFEnableStringFunctions ) { $wgPFEnableStringFunctions = true; @@ -2765,7 +2763,6 @@ if ( $wmgUseThanks ) { wfLoadExtension( 'Thanks' ); } - // Flow configuration diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 36028c2..a587923 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1462,8 +1462,6 @@ 'zhwiki' => [ '1.5x' => '/static/images/project-logos/zhwiki-1.5x.png', '2x' => '/static/images/project-logos/zhwiki-2x.png' ], 'zh_yuewiki' => [ '1.5x' => '/static/images/project-logos/zh_yuewiki-1.5x.png', '2x' => '/static/images/project-logos/zh_yuewiki-2x.png' ], // T150618 - - # Wiktionary 'amwiktionary' => [ '1.5x' => '/static/images/project-logos/amwiktionary-1.5x.png', '2x' => '/static/images/project-logos/amwiktionary-2x.png' ], // T150618 'arwiktionary' => [ '1.5x' => '/static/images/project-logos/arwiktionary-1.5x.png', '2x' => '/static/images/project-logos/arwiktionary-2x.png' ], // T150618 @@ -1556,7 +1554,6 @@ 'suwikiquote' => [ '1.5x' => '/static/images/project-logos/suwikiquote-1.5x.png', '2x' => '/static/images/project-logos/suwikiquote-2x.png' ], // T150618 'viwikiquote' => [ '1.5x' => '/static/images/project-logos/viwikiquote-1.5x.png', '2x' => '/static/images/project-logos/viwikiquote-2x.png' ], 'zhwikiquote' => [ '1.5x' => '/static/images/project-logos/zhwikiquote-1.5x.png', '2x' => '/static/images/project-logos/zhwikiquote-2x.png' ], // T150618 - # Wikibooks 'eswikibooks' => [ '1.5x' => '/static/images/project-logos/eswikibooks-1.5x.png', '2x' => '/static/images/project-logos/eswikibooks-2x.png'], // T170248 @@ -11876,7 +11873,6 @@ 'test2wiki' => true, ], - # below seems to be for extensions # EXTENSIONS @{ @@ -17986,7 +17982,6 @@ 'itwikivoyage' => true, ], - // Define list of projects to blacklist from CrossProject search // (only effective if SiteMatrix implementation is being used) 'wmgCirrusSearchCrossProjectSearchBlackList' => [ @@ -18026,7 +18021,6 @@ 'wiki' => 2.5, ], ], - // Shard each wiki to be under 2gb per shard if possible. Changing this for a wiki // requires an in place reindex. Last full review 2014-07-01. See diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php index f04ec1a..95504b7 100644 --- a/wmf-config/StartProfiler.php +++ b/wmf-config/StartProfiler.php @@ -80,7 +80,6 @@ return; } - $entryPoint = basename( $_SERVER['SCRIPT_NAME'] ); // Collate stack samples and fold into single lines. diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1963d3b..9d27143 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -434,7 +434,6 @@ ], ], - 'groupLoadsByDB' => [], # Hosts settings diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php index fb97c4d..da5566e 100644 --- a/wmf-config/flaggedrevs.php +++ b/wmf-config/flaggedrevs.php @@ -307,7 +307,6 @@ $wgGroupPermissions['sysop']['stablesettings'] = true; // -aaron 3/20/10 $wgGroupPermissions['sysop']['autoreview'] = false; // T25948 - $wgFeedbackNamespaces = [ NS_MAIN ]; // per Aaron 2008-10-06 unset( $wgGroupPermissions['reviewer'] ); diff --git a/wmf-config/logging.php b/wmf-config/logging.php index 049952e..647201d 100644 --- a/wmf-config/logging.php +++ b/wmf-config/logging.php @@ -44,8 +44,6 @@ $wmgMonologChannels = []; } - - // Monolog logging configuration // T124985: The Processors listed in $wmgMonologProcessors are applied to @@ -131,7 +129,6 @@ ]; } } - // Post construction calls to make for new Logger instances $wmgMonologLoggerCalls = [ @@ -281,7 +278,6 @@ $handlers[] = $logstashHandler; } } - if ( $opts['sample'] ) { $sample = $opts['sample']; -- To view, visit https://gerrit.wikimedia.org/r/366495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13051dc8bd3e3b354627793f36bf62028d730da7 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits