Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366494 )
Change subject: phpcs: Enable
MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords
and make pass
......................................................................
phpcs: Enable
MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords
and make pass
Also MediaWiki.ExtraCharacters.CharacterBeforePHPOpeningTag.Found whilst we're
at
it, as there are no issues.
Change-Id: I9310f590e88f97ef9d9f3390426e8c023a09eda8
---
M phpcs.xml
M tests/dbconfigTest.php
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase.php
M wmf-config/flaggedrevs.php
M wmf-config/liquidthreads.php
M wmf-config/mobile.php
M wmf-config/wikitech.php
10 files changed, 39 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/94/366494/1
diff --git a/phpcs.xml b/phpcs.xml
index 0d80989..5eac3a2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,8 +11,6 @@
<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
<exclude
name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart"
/>
<exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures"
/>
- <exclude
name="MediaWiki.ExtraCharacters.CharacterBeforePHPOpeningTag.Found" />
- <exclude
name="MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords"
/>
<exclude
name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix" />
<exclude
name="MediaWiki.NamingConventions.ValidGlobalName.wgPrefix" />
<exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals"
/>
diff --git a/tests/dbconfigTest.php b/tests/dbconfigTest.php
index b0acaf7..0122a7e 100644
--- a/tests/dbconfigTest.php
+++ b/tests/dbconfigTest.php
@@ -41,7 +41,7 @@
$wmfMasterDatacenter = $masterdatacenter;
$wmfRealm = $realm;
$wmfDatacenter = $datacenter;
- include( getRealmSpecificFilename( __DIR__ .
'/../wmf-config/db.php' ) );
+ include getRealmSpecificFilename( __DIR__ .
'/../wmf-config/db.php' );
$this->restoreGlobals();
return $wgLBFactoryConf;
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index dc724f0..f0f0fd6 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -268,7 +268,7 @@
}
if ( $wmgUseSentry ) {
- require_once( "$IP/extensions/Sentry/Sentry.php" );
+ require_once "$IP/extensions/Sentry/Sentry.php" ;
$wgSentryDsn = $wmgSentryDsn;
$wgSentryLogPhpErrors = false;
}
@@ -348,7 +348,7 @@
// Test of new import source configuration on labs cluster
$wgImportSources = false;
-include( "$wmfConfigDir/import.php" );
+include "$wmfConfigDir/import.php" ;
$wgHooks['ImportSources'][] = 'wmfImportSources';
// Reenable Preview and Changes tabs for wikieditor preview
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d213a1c..2f69902 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -109,10 +109,10 @@
$wmfUdp2logDest = $wmfLocalServices['udp2log'];
# Initialise wgConf
-require( "$wmfConfigDir/wgConf.php" );
+require "$wmfConfigDir/wgConf.php" ;
function wmfLoadInitialiseSettings( $conf ) {
global $wmfConfigDir;
- require( "$wmfConfigDir/InitialiseSettings.php" );
+ require "$wmfConfigDir/InitialiseSettings.php" ;
}
$wgLocalVirtualHosts = [
@@ -138,7 +138,7 @@
if ( $wgCommandLineMode ) {
print "Database name $wgDBname is not listed in dblist\n";
} else {
- require( "$wmfConfigDir/missing.php" );
+ require "$wmfConfigDir/missing.php" ;
}
exit;
}
@@ -165,7 +165,7 @@
if ( !$globals ) {
# Get configuration from SiteConfiguration object
- require( "$wmfConfigDir/InitialiseSettings.php" );
+ require "$wmfConfigDir/InitialiseSettings.php" ;
$wikiTags = [];
foreach ( [ 'private', 'fishbowl', 'special', 'closed', 'flow',
'flaggedrevs', 'small', 'medium',
@@ -210,7 +210,7 @@
# Private settings such as passwords, that shouldn't be published
# Needs to be before db.php
-require( "$wmfConfigDir/PrivateSettings.php" );
+require "$wmfConfigDir/PrivateSettings.php" ;
$wgMemCachedServers = [];
@@ -564,13 +564,13 @@
if ( $wmfRealm === 'production' ) {
if ( $wmgUseClusterSquid ) {
$wgUseSquid = true;
- require( "$wmfConfigDir/squid.php" );
+ require "$wmfConfigDir/squid.php" ;
}
} elseif ( $wmfRealm === 'labs' ) {
$wgStatsdMetricPrefix = 'BetaMediaWiki';
if ( $wmgUseClusterSquid ) {
$wgUseSquid = true;
- require( "$wmfConfigDir/squid-labs.php" );
+ require "$wmfConfigDir/squid-labs.php" ;
}
}
@@ -683,7 +683,7 @@
};
if ( $wmgUseTimeline ) {
- include( "$wmfConfigDir/timeline.php" );
+ include "$wmfConfigDir/timeline.php" ;
}
# Most probably only used by EasyTimeline which is conditionally included above
# but it is hard know whether there other use cases.
@@ -788,7 +788,7 @@
// Per-wiki config for Flagged Revisions
if ( $wmgUseFlaggedRevs ) {
- include( "$wmfConfigDir/flaggedrevs.php" );
+ include "$wmfConfigDir/flaggedrevs.php" ;
}
if ( $wmgUseCategoryTree ) {
@@ -849,7 +849,7 @@
}
if ( $wmgUseTimedMediaHandler ) {
- require_once( "$IP/extensions/TimedMediaHandler/TimedMediaHandler.php"
);
+ require_once "$IP/extensions/TimedMediaHandler/TimedMediaHandler.php" ;
$wgTimedTextForeignNamespaces = [ 'commonswiki' => 102 ];
if ( $wgDBname === 'commonswiki' ) {
$wgTimedTextNS = 102;
@@ -1001,7 +1001,7 @@
$wgContactConfig['default'] = array_merge( $wgContactConfig['default'],
$wmgContactPageConf );
if ( $wgDBname === 'metawiki' ) {
- include( "$wmfConfigDir/MetaContactPages.php" );
+ include "$wmfConfigDir/MetaContactPages.php" ;
$wgContactConfig['stewards'] = [ // T98625
'RecipientUser' => 'Wikimedia Stewards',
'SenderEmail' => $wmgNotificationSender,
@@ -1043,7 +1043,7 @@
// PoolCounter
if ( $wmgUsePoolCounter ) {
- include( "$wmfConfigDir/PoolCounterSettings.php" );
+ include "$wmfConfigDir/PoolCounterSettings.php" ;
}
if ( $wmgUseScore ) {
@@ -1105,8 +1105,8 @@
# All wikis are special and get Cirrus :)
# Must come *AFTER* PoolCounterSettings.php
wfLoadExtension( 'Elastica' );
-require_once( "$IP/extensions/CirrusSearch/CirrusSearch.php" );
-include( "$wmfConfigDir/CirrusSearch-common.php" );
+require_once "$IP/extensions/CirrusSearch/CirrusSearch.php" ;
+include "$wmfConfigDir/CirrusSearch-common.php" ;
// Various DB contention settings
if ( in_array( $wgDBname, [ 'testwiki', 'test2wiki', 'mediawikiwiki',
'commonswiki' ] ) ) {
@@ -1320,7 +1320,7 @@
$wgDiff = false;
}
-$wgInterwikiCache = include_once( "$wmfConfigDir/interwiki.php" );
+$wgInterwikiCache = include_once "$wmfConfigDir/interwiki.php" ;
$wgEnotifUseJobQ = true;
@@ -1833,7 +1833,7 @@
# Various system to allow/prevent flooding
# (including exemptions for scheduled outreach events)
-require( "$wmfConfigDir/throttle.php" );
+require "$wmfConfigDir/throttle.php" ;
if ( $wmgUseNewUserMessage ) {
wfLoadExtension( 'NewUserMessage' );
@@ -1862,7 +1862,7 @@
# AbuseFilter
wfLoadExtension( 'AbuseFilter' );
-include( "$wmfConfigDir/abusefilter.php" );
+include "$wmfConfigDir/abusefilter.php" ;
$wgAbuseFilterEmergencyDisableThreshold =
$wmgAbuseFilterEmergencyDisableThreshold;
$wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount;
$wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge;
@@ -1921,7 +1921,7 @@
}
if ( $wmgUseLiquidThreads || $wmgLiquidThreadsFrozen ) {
- require_once( "$wmfConfigDir/liquidthreads.php" );
+ require_once "$wmfConfigDir/liquidthreads.php" ;
}
if ( $wmgUseGlobalUsage ) {
@@ -2131,7 +2131,7 @@
}
if ( $wmgUseGWToolset ) {
- require_once( "$IP/extensions/GWToolset/GWToolset.php" );
+ require_once "$IP/extensions/GWToolset/GWToolset.php" ;
$wgGWTFileBackend = 'local-multiwrite';
$wgGWTFBMaxAge = '1 week';
if ( $wmgUseClusterJobqueue ) {
@@ -2431,7 +2431,7 @@
}
if ( $wmgUseTranslate ) {
- require_once( "$IP/extensions/Translate/Translate.php" );
+ require_once "$IP/extensions/Translate/Translate.php" ;
$wgGroupPermissions['*']['translate'] = true;
$wgGroupPermissions['translationadmin']['pagetranslation'] = true;
@@ -2599,13 +2599,13 @@
if ( $wmgUseFeaturedFeeds ) {
wfLoadExtension( 'FeaturedFeeds' );
- require_once( "$wmfConfigDir/FeaturedFeedsWMF.php" );
+ require_once "$wmfConfigDir/FeaturedFeedsWMF.php" ;
}
$wgDisplayFeedsInSidebar = $wmgDisplayFeedsInSidebar;
if ( $wmgEnablePageTriage ) {
- require_once( "$IP/extensions/PageTriage/PageTriage.php" );
+ require_once "$IP/extensions/PageTriage/PageTriage.php" ;
$wgPageTriageEnableCurationToolbar =
$wmgPageTriageEnableCurationToolbar;
$wgPageTriageNoIndexUnreviewedNewArticles =
$wmgPageTriageNoIndexUnreviewedNewArticles;
$wgPageTriageNoIndexTemplates = $wmgPageTriageNoIndexTemplates;
@@ -2759,7 +2759,7 @@
}
// Some settings specific to wikitech's extensions
- include( "$wmfConfigDir/wikitech.php" );
+ include "$wmfConfigDir/wikitech.php" ;
}
if ( $wmgUseThanks ) {
@@ -2840,7 +2840,7 @@
}
if ( $wmgUseScribunto ) {
- include( "$IP/extensions/Scribunto/Scribunto.php" );
+ include "$IP/extensions/Scribunto/Scribunto.php" ;
$wgScribuntoUseGeSHi = true;
$wgScribuntoUseCodeEditor = true;
$wgScribuntoGatherFunctionStats = true; // ori, 29-Oct-2015
@@ -3068,7 +3068,7 @@
}
if( $wmgUseWikibaseClient || $wmgUseInterwikiSorting ) {
- $wgInterwikiSortingInterwikiSortOrders = include(
"$wmfConfigDir/InterwikiSortOrders.php" );
+ $wgInterwikiSortingInterwikiSortOrders = include
"$wmfConfigDir/InterwikiSortOrders.php" ;
}
if ( $wmgUseInterwikiSorting ) {
@@ -3083,7 +3083,7 @@
$wmgUseWikibasePropertySuggester = true;
}
- include( "$wmfConfigDir/Wikibase.php" );
+ include "$wmfConfigDir/Wikibase.php" ;
}
if ( $wmfRealm != 'labs' ) {
@@ -3561,11 +3561,11 @@
}
if ( $wmfRealm === 'labs' ) {
- require( "$wmfConfigDir/CommonSettings-labs.php" );
+ require "$wmfConfigDir/CommonSettings-labs.php" ;
}
# THIS MUST BE AFTER ALL EXTENSIONS ARE INCLUDED
#
# REALLY ... we're not kidding here ... NO EXTENSIONS AFTER
-require( "$wmfConfigDir/ExtensionMessages-$wmgVersionNumber.php" );
+require "$wmfConfigDir/ExtensionMessages-$wmgVersionNumber.php" ;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index bee4534..686dfdb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19153,6 +19153,6 @@
### WMF Labs override #####
if ( $wmfRealm == 'labs' ) {
- require ( "$wmfConfigDir/InitialiseSettings-labs.php" );
+ require "$wmfConfigDir/InitialiseSettings-labs.php" ;
wmfLabsOverrideSettings();
}
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 86c9efd..413c6aa 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -1,6 +1,6 @@
<?php
-require_once( "$IP/extensions/Wikidata/Wikidata.php" );
+require_once "$IP/extensions/Wikidata/Wikidata.php" ;
// The version number now comes from the Wikidata build,
// included above, so that cache invalidations can be in sync
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index 1d2bd98..f155ca4 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -5,7 +5,7 @@
# It's set up this way to allow a cron job on terbium to easily determine a
# list of wikis it needs to run updateStats.php on
-include( "$IP/extensions/FlaggedRevs/FlaggedRevs.php" );
+include "$IP/extensions/FlaggedRevs/FlaggedRevs.php" ;
///////////////////////////////////////
// Common configuration
diff --git a/wmf-config/liquidthreads.php b/wmf-config/liquidthreads.php
index 0e3ed27..c5cd4b2 100644
--- a/wmf-config/liquidthreads.php
+++ b/wmf-config/liquidthreads.php
@@ -1,7 +1,7 @@
<?php
# WARNING: This file is publically viewable on the web. Do not put private
data here.
-require_once( "$IP/extensions/LiquidThreads/LiquidThreads.php" );
+require_once "$IP/extensions/LiquidThreads/LiquidThreads.php" ;
$extName = 'LiquidThreads';
$wgLiquidThreadsExtensionName = $extName;
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 28e2a0d..d2a9541 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -78,5 +78,5 @@
}
if ( $wmfRealm === 'labs' ) {
- require_once( __DIR__ . '/mobile-labs.php' );
+ require_once __DIR__ . '/mobile-labs.php' ;
}
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 299ce90..2dec143 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -4,7 +4,7 @@
use MediaWiki\Logger\LoggerFactory;
-require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
+require_once "$IP/extensions/LdapAuthentication/LdapAuthentication.php" ;
$wgAuthManagerAutoConfig['primaryauth'] += [
LdapPrimaryAuthenticationProvider::class => [
'class' => LdapPrimaryAuthenticationProvider::class,
@@ -64,7 +64,7 @@
] );
}
-require_once( "$IP/extensions/OpenStackManager/OpenStackManager.php" );
+require_once "$IP/extensions/OpenStackManager/OpenStackManager.php" ;
switch( $wgDBname ) {
case 'labswiki' :
$wgOpenStackManagerNovaIdentityURI =
'http://labcontrol1001.wikimedia.org:35357/v2.0';
@@ -164,5 +164,5 @@
# This must be loaded AFTER OSM, to overwrite it's defaults
# Except when we're not an OSM host and we're running like a maintenance
script.
if ( file_exists( '/etc/mediawiki/WikitechPrivateSettings.php' ) ) {
- require_once( '/etc/mediawiki/WikitechPrivateSettings.php' );
+ require_once '/etc/mediawiki/WikitechPrivateSettings.php' ;
}
--
To view, visit https://gerrit.wikimedia.org/r/366494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9310f590e88f97ef9d9f3390426e8c023a09eda8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
