Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367831 )
Change subject: phpcs on multiversion
......................................................................
phpcs on multiversion
Stop excluding so many files
Bug: T171509
Change-Id: I763caa650a6a34bfbd81dda20d8333e671720892
---
M multiversion/MWMultiVersion.php
M multiversion/MWRealm.php
M multiversion/MWScript.php
M multiversion/MWWikiversions.php
M multiversion/defines.php
M phpcs.xml
M tests/multiversion/MWMultiVersionTest.php
M tests/multiversion/MWRealmTest.php
8 files changed, 194 insertions(+), 194 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/31/367831/1
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 305fcf5..02331e1 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -1,7 +1,7 @@
<?php
-require_once( __DIR__ . '/defines.php' );
-require_once( __DIR__ . '/MWRealm.php' );
-require_once( __DIR__ . '/vendor/autoload.php' );
+require_once __DIR__ . '/defines.php';
+require_once __DIR__ . '/MWRealm.php';
+require_once __DIR__ . '/vendor/autoload.php';
/**
* Class to handle basic information related to what
@@ -33,8 +33,10 @@
* @see getInstanceForWiki
* @see getInstanceForUploadWiki
*/
- private function __construct() {}
- private function __clone() {}
+ private function __construct() {
+ }
+ private function __clone() {
+ }
/**
* Create a multiversion object based on a dbname
@@ -120,8 +122,8 @@
* internal error.
*/
public static function destroySingleton() {
- if( PHP_SAPI !== 'cli' ) {
- self::error('Can not destroy singleton instance when
used ' .
+ if ( PHP_SAPI !== 'cli' ) {
+ self::error( 'Can not destroy singleton instance when
used ' .
'with non-CLI interface' );
}
self::$instance = null;
@@ -132,9 +134,9 @@
* @param string $serverName the ServerName for this wiki --
$_SERVER['SERVER_NAME']
*/
private function setSiteInfoForWiki( $serverName ) {
- $matches = array();
+ $matches = [];
- $staticMappings = array(
+ $staticMappings = [
// Production
'wikimediafoundation.org' => 'foundation',
'test.wikidata.org' => 'testwikidata',
@@ -150,7 +152,7 @@
// Labs
'beta.wmflabs.org' => 'deployment',
'wikidata.beta.wmflabs.org' => 'wikidata',
- );
+ ];
$lang = null;
$site = "wikipedia";
@@ -181,10 +183,10 @@
if ( $matches[2] !== 'wikimedia'
|| ( $matches[2] === 'wikimedia' && in_array(
$lang,
- array(
+ [
'ar', 'bd', 'be', 'br', 'ca',
'cn', 'co', 'dk', 'ec', 'et', 'fi', 'il', 'mai', 'mk', 'mx', 'nl',
'noboard-chapters', 'no',
'nyc', 'nz', 'pa-us', 'pl', 'pt', 'rs', 'ru', 'se', 'tr', 'ua', 'uk', 've', 'wb'
- )
+ ]
) ) ) {
// wikimedia (non chapters) sites stay as wiki
$site = $matches[2];
@@ -299,7 +301,7 @@
$phpFilename = MEDIAWIKI_DEPLOYMENT_DIR .
'/wikiversions.php';
}
- $wikiversions = include( $phpFilename );
+ $wikiversions = include $phpFilename;
if ( !is_array( $wikiversions ) ) {
self::error( "Unable to open $phpFilename.\n" );
@@ -362,7 +364,7 @@
$msg = (string)$msg;
if ( PHP_SAPI !== 'cli' ) {
$msg = htmlspecialchars( $msg );
- switch( $httpError ) {
+ switch ( $httpError ) {
case 400:
$httpMsg = 'Bad Request';
break;
@@ -417,7 +419,7 @@
# Wiki doesn't exist yet?
if ( $multiVersion->isMissing() ) {
header( "Cache-control: no-cache" ); // same hack as
CommonSettings.php
- include( MEDIAWIKI_DEPLOYMENT_DIR .
'/wmf-config/missing.php' );
+ include MEDIAWIKI_DEPLOYMENT_DIR .
'/wmf-config/missing.php';
exit;
}
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 3f1b139..e7f421c 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -1,15 +1,15 @@
<?php
-require_once( __DIR__ . '/MWWikiversions.php' );
+require_once __DIR__ . '/MWWikiversions.php';
global $wmfCluster, $wmfDatacenter, $wmfRealm;
$wmfCluster = trim( file_get_contents( '/etc/wikimedia-cluster' ) );
if ( $wmfCluster === 'labs' ) {
- $wmfRealm = 'labs';
- $wmfDatacenter = 'eqiad';
+ $wmfRealm = 'labs';
+ $wmfDatacenter = 'eqiad';
} else {
- $wmfRealm = 'production';
- $wmfDatacenter = $wmfCluster;
+ $wmfRealm = 'production';
+ $wmfDatacenter = $wmfCluster;
}
/**
@@ -40,10 +40,10 @@
// Test existence of the following file suffix and return
// immediately whenever found:
- // - {realm}-{datacenter}
- // - {realm}
- // - {datacenter}
- // - {}
+ // - {realm}-{datacenter}
+ // - {realm}
+ // - {datacenter}
+ // - {}
//
// Please update /README whenever changing code below.
diff --git a/multiversion/MWScript.php b/multiversion/MWScript.php
index 209c3a2..869c587 100644
--- a/multiversion/MWScript.php
+++ b/multiversion/MWScript.php
@@ -29,7 +29,7 @@
$gids = posix_getgroups();
foreach ( $gids as $gid ) {
$info = posix_getgrgid( $gid );
- if ( $info && in_array( $info['name'], array( 'sudo',
'wikidev', 'root' ) ) ) {
+ if ( $info && in_array( $info['name'], [ 'sudo', 'wikidev',
'root' ] ) ) {
fwrite( STDERR, "Cannot run a MediaWiki script as a
user in the " .
"group {$info['name']}\n" );
fwrite( STDERR, <<<EOT
@@ -51,7 +51,7 @@
# If no MW directory is given then assume this is a /maintenance script
if ( strpos( $relFile, '/' ) === false ) {
$relFile = "maintenance/$relFile"; // convenience
- } elseif( getenv( 'MEDIAWIKI_MAINT_INIT_ONLY' ) ) {
+ } elseif ( getenv( 'MEDIAWIKI_MAINT_INIT_ONLY' ) ) {
$relFile = 'maintenance/commandLine.inc';
}
@@ -64,7 +64,7 @@
# For addwiki.php, the wiki DB doesn't yet exist, and for some
# other maintenance scripts we don't care what wiki DB is used...
- $wikiless = array(
+ $wikiless = [
'maintenance/purgeList.php',
'extensions/WikimediaMaintenance/addWiki.php', // 1.19
'extensions/WikimediaMaintenance/dumpInterwiki.php', // 1.19
@@ -73,14 +73,14 @@
'extensions/WikimediaMaintenance/filebackend/setZoneAccess.php',
'maintenance/mctest.php',
'maintenance/mcc.php',
- );
+ ];
# Check if a --wiki param was given...
# Maintenance.php will treat $argv[1] as the wiki if it doesn't start
'-'
if ( !isset( $argv[1] ) || !preg_match( '/^([^-]|--wiki(=|$))/',
$argv[1] ) ) {
if ( in_array( $relFile, $wikiless ) ) {
# Assume aawiki as Maintenance.php does.
- $argv = array_merge( array( $argv[0], "--wiki=aawiki"
), array_slice( $argv, 1 ) );
+ $argv = array_merge( [ $argv[0], "--wiki=aawiki" ],
array_slice( $argv, 1 ) );
}
}
@@ -96,4 +96,4 @@
}
# Run the script!
-require_once( getMWScriptWithArgs() );
+require_once getMWScriptWithArgs();
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 45645b7..88aba4e 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -1,5 +1,5 @@
<?php
-require_once( __DIR__ . '/defines.php' );
+require_once __DIR__ . '/defines.php';
/**
* Helper class for reading the wikiversions.json file
@@ -25,7 +25,7 @@
/**
* @param string $path Path to wikiversions.json
- * @param array $wikis Array of wikis array( dbname => version )
+ * @param array $wikis Array of wikis [ dbname => version ]
*/
public static function writeWikiVersionsFile( $path, $wikis ) {
// 448 == JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES |
JSON_UNESCAPED_UNICODE,
@@ -79,7 +79,7 @@
throw new Exception( __METHOD__ . "(): unable to read
$dblist.\n" );
}
- $dbs = array();
+ $dbs = [];
foreach ( $lines as $line ) {
// Strip comments ('#' to end-of-line) and trim
whitespace.
$line = trim( substr( $line, 0, strcspn( $line, '#' ) )
);
@@ -100,6 +100,6 @@
* @return array List of wiki versions
*/
public static function getAvailableBranchDirs() {
- return glob( MEDIAWIKI_DEPLOYMENT_DIR . '/php-*', GLOB_ONLYDIR
) ?: array();
+ return glob( MEDIAWIKI_DEPLOYMENT_DIR . '/php-*', GLOB_ONLYDIR
) ?: [];
}
}
diff --git a/multiversion/defines.php b/multiversion/defines.php
index 1fd562d..7a8a7a1 100644
--- a/multiversion/defines.php
+++ b/multiversion/defines.php
@@ -5,5 +5,5 @@
define( 'MEDIAWIKI_STAGING_DIR', '/srv/mediawiki-staging' );
define( 'MEDIAWIKI_DBLIST_DIR', '/srv/mediawiki/dblists' );
define( 'MEDIAWIKI_DEPLOYMENT_DIR', '/srv/mediawiki' );
-define( 'MEDIAWIKI_VERSION_REGEX', '(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)');
-define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/');
+define( 'MEDIAWIKI_VERSION_REGEX', '(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)' );
+define( 'MEDIAWIKI_DIRECTORY_REGEX', '/^php-'.MEDIAWIKI_VERSION_REGEX.'$/' );
diff --git a/phpcs.xml b/phpcs.xml
index 7242971..03dbc95 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -38,7 +38,5 @@
<exclude-pattern>\.git/</exclude-pattern>
<exclude-pattern>vendor/</exclude-pattern>
- <exclude-pattern>multiversion/</exclude-pattern>
<exclude-pattern>wmf-config/PrivateSettings.php</exclude-pattern>
- <exclude-pattern>docroot/foundation</exclude-pattern>
</ruleset>
diff --git a/tests/multiversion/MWMultiVersionTest.php
b/tests/multiversion/MWMultiVersionTest.php
index 0fb9257..e299218 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -22,133 +22,133 @@
function provideServerNameAndDocRoot() {
$root = '/srv/mediawiki/docroot';
- return array(
+ return [
// (expected DB, server name [, message]]
- array( 'enwiki', 'en.wikipedia.org' ),
- array( 'enwiktionary', 'en.wiktionary.org' ),
- array( 'enwikibooks', 'en.wikibooks.org' ),
- array( 'enwikinews', 'en.wikinews.org' ),
- array( 'enwikiquote', 'en.wikiquote.org' ),
- array( 'enwikisource', 'en.wikisource.org' ),
- array( 'enwikiversity', 'en.wikiversity.org' ),
- array( 'enwikivoyage', 'en.wikivoyage.org' ),
+ [ 'enwiki', 'en.wikipedia.org' ],
+ [ 'enwiktionary', 'en.wiktionary.org' ],
+ [ 'enwikibooks', 'en.wikibooks.org' ],
+ [ 'enwikinews', 'en.wikinews.org' ],
+ [ 'enwikiquote', 'en.wikiquote.org' ],
+ [ 'enwikisource', 'en.wikisource.org' ],
+ [ 'enwikiversity', 'en.wikiversity.org' ],
+ [ 'enwikivoyage', 'en.wikivoyage.org' ],
- array( 'advisorywiki', 'advisory.wikimedia.org' ),
- array( 'arbcom_dewiki', 'arbcom-de.wikipedia.org' ),
- array( 'arbcom_enwiki', 'arbcom-en.wikipedia.org' ),
- array( 'arbcom_fiwiki', 'arbcom-fi.wikipedia.org' ),
- array( 'arbcom_nlwiki', 'arbcom-nl.wikipedia.org' ),
- array( 'arwikimedia', 'ar.wikimedia.org' ),
- array( 'auditcomwiki', 'auditcom.wikimedia.org' ),
- array( 'boardgovcomwiki', 'boardgovcom.wikimedia.org' ),
- array( 'boardwiki', 'board.wikimedia.org' ),
- array( 'brwikimedia', 'br.wikimedia.org' ),
- array( 'chairwiki', 'chair.wikimedia.org' ),
- array( 'chapcomwiki', 'chapcom.wikimedia.org' ),
- array( 'checkuserwiki', 'checkuser.wikimedia.org' ),
- array( 'collabwiki', 'collab.wikimedia.org' ),
- array( 'commonswiki', 'commons.wikimedia.org' ),
- array( 'donatewiki', 'donate.wikimedia.org' ),
- array( 'execwiki', 'exec.wikimedia.org' ),
- array( 'fdcwiki', 'fdc.wikimedia.org' ),
- array( 'foundationwiki', 'wikimediafoundation.org' ),
- array( 'grantswiki', 'grants.wikimedia.org' ),
- array( 'iegcomwiki', 'iegcom.wikimedia.org' ),
- array( 'incubatorwiki', 'incubator.wikimedia.org' ),
- array( 'internalwiki', 'internal.wikimedia.org' ),
- array( 'legalteamwiki', 'legalteam.wikimedia.org' ),
- array( 'loginwiki', 'login.wikimedia.org' ),
- array( 'mediawikiwiki', 'www.mediawiki.org' ),
- array( 'metawiki', 'meta.wikimedia.org' ),
- array( 'movementroleswiki',
'movementroles.wikimedia.org' ),
- array( 'mxwikimedia', 'mx.wikimedia.org' ),
- array( 'noboard_chapterswikimedia',
'noboard-chapters.wikimedia.org' ),
- array( 'nycwikimedia', 'nyc.wikimedia.org' ),
- array( 'officewiki', 'office.wikimedia.org' ),
- array( 'ombudsmenwiki', 'ombudsmen.wikimedia.org' ),
- array( 'otrs_wikiwiki', 'otrs-wiki.wikimedia.org' ),
- array( 'outreachwiki', 'outreach.wikimedia.org' ),
- array( 'pa_uswikimedia', 'pa-us.wikimedia.org' ),
- array( 'qualitywiki', 'quality.wikimedia.org' ),
- array( 'searchcomwiki', 'searchcom.wikimedia.org' ),
- array( 'sourceswiki', 'wikisource.org' ),
- array( 'spcomwiki', 'spcom.wikimedia.org' ),
- array( 'specieswiki', 'species.wikimedia.org' ),
- array( 'stewardwiki', 'steward.wikimedia.org' ),
- array( 'strategywiki', 'strategy.wikimedia.org' ),
- array( 'tenwiki', 'ten.wikipedia.org' ),
- array( 'testwiki', 'test.wikipedia.org' ),
- array( 'testwikidatawiki', 'test.wikidata.org' ),
- array( 'transitionteamwiki',
'transitionteam.wikimedia.org' ),
- array( 'usabilitywiki', 'usability.wikimedia.org' ),
- array( 'votewiki', 'vote.wikimedia.org' ),
- array( 'wg_enwiki', 'wg-en.wikipedia.org' ),
- array( 'wikidatawiki', 'www.wikidata.org' ),
- array( 'wikimania2005wiki',
'wikimania2005.wikimedia.org' ),
- array( 'wikimania2006wiki',
'wikimania2006.wikimedia.org' ),
- array( 'wikimania2007wiki',
'wikimania2007.wikimedia.org' ),
- array( 'wikimania2008wiki',
'wikimania2008.wikimedia.org' ),
- array( 'wikimania2009wiki',
'wikimania2009.wikimedia.org' ),
- array( 'wikimania2010wiki',
'wikimania2010.wikimedia.org' ),
- array( 'wikimania2011wiki',
'wikimania2011.wikimedia.org' ),
- array( 'wikimania2012wiki',
'wikimania2012.wikimedia.org' ),
- array( 'wikimania2013wiki',
'wikimania2013.wikimedia.org' ),
- array( 'wikimania2014wiki',
'wikimania2014.wikimedia.org' ),
- array( 'wikimaniateamwiki',
'wikimaniateam.wikimedia.org' ),
- array( 'zerowiki', 'zero.wikimedia.org' ),
+ [ 'advisorywiki', 'advisory.wikimedia.org' ],
+ [ 'arbcom_dewiki', 'arbcom-de.wikipedia.org' ],
+ [ 'arbcom_enwiki', 'arbcom-en.wikipedia.org' ],
+ [ 'arbcom_fiwiki', 'arbcom-fi.wikipedia.org' ],
+ [ 'arbcom_nlwiki', 'arbcom-nl.wikipedia.org' ],
+ [ 'arwikimedia', 'ar.wikimedia.org' ],
+ [ 'auditcomwiki', 'auditcom.wikimedia.org' ],
+ [ 'boardgovcomwiki', 'boardgovcom.wikimedia.org' ],
+ [ 'boardwiki', 'board.wikimedia.org' ],
+ [ 'brwikimedia', 'br.wikimedia.org' ],
+ [ 'chairwiki', 'chair.wikimedia.org' ],
+ [ 'chapcomwiki', 'chapcom.wikimedia.org' ],
+ [ 'checkuserwiki', 'checkuser.wikimedia.org' ],
+ [ 'collabwiki', 'collab.wikimedia.org' ],
+ [ 'commonswiki', 'commons.wikimedia.org' ],
+ [ 'donatewiki', 'donate.wikimedia.org' ],
+ [ 'execwiki', 'exec.wikimedia.org' ],
+ [ 'fdcwiki', 'fdc.wikimedia.org' ],
+ [ 'foundationwiki', 'wikimediafoundation.org' ],
+ [ 'grantswiki', 'grants.wikimedia.org' ],
+ [ 'iegcomwiki', 'iegcom.wikimedia.org' ],
+ [ 'incubatorwiki', 'incubator.wikimedia.org' ],
+ [ 'internalwiki', 'internal.wikimedia.org' ],
+ [ 'legalteamwiki', 'legalteam.wikimedia.org' ],
+ [ 'loginwiki', 'login.wikimedia.org' ],
+ [ 'mediawikiwiki', 'www.mediawiki.org' ],
+ [ 'metawiki', 'meta.wikimedia.org' ],
+ [ 'movementroleswiki', 'movementroles.wikimedia.org' ],
+ [ 'mxwikimedia', 'mx.wikimedia.org' ],
+ [ 'noboard_chapterswikimedia',
'noboard-chapters.wikimedia.org' ],
+ [ 'nycwikimedia', 'nyc.wikimedia.org' ],
+ [ 'officewiki', 'office.wikimedia.org' ],
+ [ 'ombudsmenwiki', 'ombudsmen.wikimedia.org' ],
+ [ 'otrs_wikiwiki', 'otrs-wiki.wikimedia.org' ],
+ [ 'outreachwiki', 'outreach.wikimedia.org' ],
+ [ 'pa_uswikimedia', 'pa-us.wikimedia.org' ],
+ [ 'qualitywiki', 'quality.wikimedia.org' ],
+ [ 'searchcomwiki', 'searchcom.wikimedia.org' ],
+ [ 'sourceswiki', 'wikisource.org' ],
+ [ 'spcomwiki', 'spcom.wikimedia.org' ],
+ [ 'specieswiki', 'species.wikimedia.org' ],
+ [ 'stewardwiki', 'steward.wikimedia.org' ],
+ [ 'strategywiki', 'strategy.wikimedia.org' ],
+ [ 'tenwiki', 'ten.wikipedia.org' ],
+ [ 'testwiki', 'test.wikipedia.org' ],
+ [ 'testwikidatawiki', 'test.wikidata.org' ],
+ [ 'transitionteamwiki', 'transitionteam.wikimedia.org'
],
+ [ 'usabilitywiki', 'usability.wikimedia.org' ],
+ [ 'votewiki', 'vote.wikimedia.org' ],
+ [ 'wg_enwiki', 'wg-en.wikipedia.org' ],
+ [ 'wikidatawiki', 'www.wikidata.org' ],
+ [ 'wikimania2005wiki', 'wikimania2005.wikimedia.org' ],
+ [ 'wikimania2006wiki', 'wikimania2006.wikimedia.org' ],
+ [ 'wikimania2007wiki', 'wikimania2007.wikimedia.org' ],
+ [ 'wikimania2008wiki', 'wikimania2008.wikimedia.org' ],
+ [ 'wikimania2009wiki', 'wikimania2009.wikimedia.org' ],
+ [ 'wikimania2010wiki', 'wikimania2010.wikimedia.org' ],
+ [ 'wikimania2011wiki', 'wikimania2011.wikimedia.org' ],
+ [ 'wikimania2012wiki', 'wikimania2012.wikimedia.org' ],
+ [ 'wikimania2013wiki', 'wikimania2013.wikimedia.org' ],
+ [ 'wikimania2014wiki', 'wikimania2014.wikimedia.org' ],
+ [ 'wikimaniateamwiki', 'wikimaniateam.wikimedia.org' ],
+ [ 'zerowiki', 'zero.wikimedia.org' ],
- array( 'arwikimedia', 'ar.wikimedia.org' ),
- array( 'bdwikimedia', 'bd.wikimedia.org' ),
- array( 'bewikimedia', 'be.wikimedia.org' ),
- array( 'brwikimedia', 'br.wikimedia.org' ),
- array( 'cawikimedia', 'ca.wikimedia.org' ),
- array( 'cowikimedia', 'co.wikimedia.org' ),
- array( 'dkwikimedia', 'dk.wikimedia.org' ),
- array( 'etwikimedia', 'et.wikimedia.org' ),
- array( 'fiwikimedia', 'fi.wikimedia.org' ),
- array( 'ilwikimedia', 'il.wikimedia.org' ),
- array( 'mkwikimedia', 'mk.wikimedia.org' ),
- array( 'mxwikimedia', 'mx.wikimedia.org' ),
- array( 'nlwikimedia', 'nl.wikimedia.org' ),
- array( 'nowikimedia', 'no.wikimedia.org' ),
- array( 'nycwikimedia', 'nyc.wikimedia.org' ),
- array( 'nzwikimedia', 'nz.wikimedia.org' ),
- array( 'plwikimedia', 'pl.wikimedia.org' ),
- array( 'rswikimedia', 'rs.wikimedia.org' ),
- array( 'ruwikimedia', 'ru.wikimedia.org' ),
- array( 'sewikimedia', 'se.wikimedia.org' ),
- array( 'trwikimedia', 'tr.wikimedia.org' ),
- array( 'uawikimedia', 'ua.wikimedia.org' ),
+ [ 'arwikimedia', 'ar.wikimedia.org' ],
+ [ 'bdwikimedia', 'bd.wikimedia.org' ],
+ [ 'bewikimedia', 'be.wikimedia.org' ],
+ [ 'brwikimedia', 'br.wikimedia.org' ],
+ [ 'cawikimedia', 'ca.wikimedia.org' ],
+ [ 'cowikimedia', 'co.wikimedia.org' ],
+ [ 'dkwikimedia', 'dk.wikimedia.org' ],
+ [ 'etwikimedia', 'et.wikimedia.org' ],
+ [ 'fiwikimedia', 'fi.wikimedia.org' ],
+ [ 'ilwikimedia', 'il.wikimedia.org' ],
+ [ 'mkwikimedia', 'mk.wikimedia.org' ],
+ [ 'mxwikimedia', 'mx.wikimedia.org' ],
+ [ 'nlwikimedia', 'nl.wikimedia.org' ],
+ [ 'nowikimedia', 'no.wikimedia.org' ],
+ [ 'nycwikimedia', 'nyc.wikimedia.org' ],
+ [ 'nzwikimedia', 'nz.wikimedia.org' ],
+ [ 'plwikimedia', 'pl.wikimedia.org' ],
+ [ 'rswikimedia', 'rs.wikimedia.org' ],
+ [ 'ruwikimedia', 'ru.wikimedia.org' ],
+ [ 'sewikimedia', 'se.wikimedia.org' ],
+ [ 'trwikimedia', 'tr.wikimedia.org' ],
+ [ 'uawikimedia', 'ua.wikimedia.org' ],
// labs stuffs taken from /wikiversions-labs.dat
- array( 'aawiki', 'aa.wikipedia.beta.wmflabs.org' ),
- array( 'arwiki', 'ar.wikipedia.beta.wmflabs.org' ),
- array( 'commonswiki',
'commons.wikimedia.beta.wmflabs.org' ),
- array( 'deploymentwiki',
'deployment.wikimedia.beta.wmflabs.org' ),
- array( 'dewiki', 'de.wikipedia.beta.wmflabs.org' ),
- array( 'dewikivoyage', 'de.wikivoyage.beta.wmflabs.org'
),
+ [ 'aawiki', 'aa.wikipedia.beta.wmflabs.org' ],
+ [ 'arwiki', 'ar.wikipedia.beta.wmflabs.org' ],
+ [ 'commonswiki', 'commons.wikimedia.beta.wmflabs.org' ],
+ [ 'deploymentwiki',
'deployment.wikimedia.beta.wmflabs.org' ],
+ [ 'dewiki', 'de.wikipedia.beta.wmflabs.org' ],
+ [ 'dewikivoyage', 'de.wikivoyage.beta.wmflabs.org' ],
- array( 'enwiki', 'en.wikipedia.beta.wmflabs.org' ),
- array( 'en_rtlwiki',
'en-rtl.wikipedia.beta.wmflabs.org' ),
- array( 'enwikibooks', 'en.wikibooks.beta.wmflabs.org' ),
- array( 'enwikinews', 'en.wikinews.beta.wmflabs.org' ),
- array( 'enwikiquote', 'en.wikiquote.beta.wmflabs.org' ),
- array( 'enwikisource', 'en.wikisource.beta.wmflabs.org'
),
- array( 'enwikiversity',
'en.wikiversity.beta.wmflabs.org' ),
- array( 'enwikivoyage', 'en.wikivoyage.beta.wmflabs.org'
),
- array( 'enwiktionary', 'en.wiktionary.beta.wmflabs.org'
),
+ [ 'enwiki', 'en.wikipedia.beta.wmflabs.org' ],
+ [ 'en_rtlwiki', 'en-rtl.wikipedia.beta.wmflabs.org' ],
+ [ 'enwikibooks', 'en.wikibooks.beta.wmflabs.org' ],
+ [ 'enwikinews', 'en.wikinews.beta.wmflabs.org' ],
+ [ 'enwikiquote', 'en.wikiquote.beta.wmflabs.org' ],
+ [ 'enwikisource', 'en.wikisource.beta.wmflabs.org' ],
+ [ 'enwikiversity', 'en.wikiversity.beta.wmflabs.org' ],
+ [ 'enwikivoyage', 'en.wikivoyage.beta.wmflabs.org' ],
+ [ 'enwiktionary', 'en.wiktionary.beta.wmflabs.org' ],
- array( 'eowiki', 'eo.wikipedia.beta.wmflabs.org' ),
- array( 'hewiki', 'he.wikipedia.beta.wmflabs.org' ),
+ [ 'eowiki', 'eo.wikipedia.beta.wmflabs.org' ],
+ [ 'hewiki', 'he.wikipedia.beta.wmflabs.org' ],
- array( 'loginwiki', 'login.wikimedia.beta.wmflabs.org'
),
- array( 'metawiki', 'meta.wikimedia.beta.wmflabs.org' ),
+ [ 'loginwiki', 'login.wikimedia.beta.wmflabs.org' ],
+ [ 'metawiki', 'meta.wikimedia.beta.wmflabs.org' ],
- array( 'simplewiki',
'simple.wikipedia.beta.wmflabs.org' ),
- array( 'sqwiki', 'sq.wikipedia.beta.wmflabs.org' ),
- array( 'testwiki', 'test.wikipedia.beta.wmflabs.org' ),
+ [ 'simplewiki', 'simple.wikipedia.beta.wmflabs.org' ],
+ [ 'sqwiki', 'sq.wikipedia.beta.wmflabs.org' ],
+ [ 'testwiki', 'test.wikipedia.beta.wmflabs.org' ],
- array( 'wikidatawiki', 'wikidata.beta.wmflabs.org' ),
- );
+ [ 'wikidatawiki', 'wikidata.beta.wmflabs.org' ],
+ ];
}
}
diff --git a/tests/multiversion/MWRealmTest.php
b/tests/multiversion/MWRealmTest.php
index aaffbc6..0f4a861 100644
--- a/tests/multiversion/MWRealmTest.php
+++ b/tests/multiversion/MWRealmTest.php
@@ -4,17 +4,16 @@
class MWRealmTests extends PHPUnit_Framework_TestCase {
- static $fixturesDir;
- static $fixturesFiles = array();
+ private static $fixturesDir;
+ private static $fixturesFiles = [];
static function setupBeforeClass() {
-
self::$fixturesDir = sys_get_temp_dir() . "/" . __CLASS__;
- if( !is_dir( self::$fixturesDir ) ) {
+ if ( !is_dir( self::$fixturesDir ) ) {
mkdir( self::$fixturesDir."/" );
}
- $filenames = array(
+ $filenames = [
'general.ext',
'realm-production.ext',
'realm.ext',
@@ -28,8 +27,8 @@
'mc.php',
'langlist',
'langlist-labs',
- );
- foreach( $filenames as $filename ) {
+ ];
+ foreach ( $filenames as $filename ) {
$fullname = self::$fixturesDir . "/$filename";
# Record filename for future deletion
@@ -39,12 +38,11 @@
}
static function tearDownAfterClass() {
- foreach( self::$fixturesFiles as $fixture ) {
+ foreach ( self::$fixturesFiles as $fixture ) {
unlink( $fixture );
}
@rmdir( self::$fixturesDir );
}
-
/**
* @dataProvider provideFilenames
@@ -56,8 +54,10 @@
$old['realm'] = $wmfRealm;
$old['datacenter'] = $wmfDatacenter;
- if( $realm !== null ) { $wmfRealm = $realm; }
- if( $datacenter !== null ) { $wmfDatacenter = $datacenter; }
+ if ( $realm !== null ) { $wmfRealm = $realm;
+ }
+ if ( $datacenter !== null ) { $wmfDatacenter = $datacenter;
+ }
# The function requires a real path:
$basePath = self::$fixturesDir . "/";
@@ -73,61 +73,61 @@
}
function provideFilenames() {
- return array(
+ return [
// (expected, filename [, realm[, datacenter]])
// general file is common to any realm and datacenter
- array( 'general.ext', 'general.ext' ),
- array( 'general.ext', 'general.ext', 'production' ),
- array( 'general.ext', 'general.ext', 'production',
'eqiad' ),
- array( 'general.ext', 'general.ext', 'labs' ),
- array( 'general.ext', 'general.ext', 'labs', 'tmtpa' ),
+ [ 'general.ext', 'general.ext' ],
+ [ 'general.ext', 'general.ext', 'production' ],
+ [ 'general.ext', 'general.ext', 'production', 'eqiad' ],
+ [ 'general.ext', 'general.ext', 'labs' ],
+ [ 'general.ext', 'general.ext', 'labs', 'tmtpa' ],
/**
* realm file only vary per realm
*/
- array( 'realm-production.ext', 'realm.ext',
'production' ),
- array( 'realm-production.ext', 'realm.ext',
'production', 'eqiad' ),
- array( 'realm-production.ext', 'realm.ext',
'production', 'UNKNOWN_DC' ),
+ [ 'realm-production.ext', 'realm.ext', 'production' ],
+ [ 'realm-production.ext', 'realm.ext', 'production',
'eqiad' ],
+ [ 'realm-production.ext', 'realm.ext', 'production',
'UNKNOWN_DC' ],
- array( 'realm.ext', 'realm.ext', 'UNKNOWN_REALM' ),
- array( 'realm.ext', 'realm.ext', 'UNKNOWN_REALM',
'eqiad' ),
+ [ 'realm.ext', 'realm.ext', 'UNKNOWN_REALM' ],
+ [ 'realm.ext', 'realm.ext', 'UNKNOWN_REALM', 'eqiad' ],
# realm-labs.ext is not in the fixtures, so should
fallback to default
- array( 'realm.ext', 'realm.ext', 'labs' ),
+ [ 'realm.ext', 'realm.ext', 'labs' ],
/**
* dc file only vary per datacenter
*/
// array( 'dc.ext', 'dc.ext', 'labs', 'eqiad' ), //
-'dc.ext' +'dc-eqiad.ext'
// array( 'dc.ext', 'dc.ext', 'production', 'eqiad' ),
// -'dc.ext' +'dc-eqiad.ext'
- array( 'dc-eqiad.ext', 'dc.ext', 'labs', 'eqiad' ),
- array( 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad'
),
+ [ 'dc-eqiad.ext', 'dc.ext', 'labs', 'eqiad' ],
+ [ 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad' ],
- array( 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad'
),
+ [ 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad' ],
/**
* dc_and_realm vary by both realm and datacenter
*/
- array( 'dc_and_realm.ext', 'dc_and_realm.ext', 'labs',
'eqiad' ),
- //array( 'dc_and_realm.ext', 'dc_and_realm.ext',
'production', 'eqiad' ), // -'dc_and_realm.ext'
+'dc_and_realm-production-eqiad.ext'
+ [ 'dc_and_realm.ext', 'dc_and_realm.ext', 'labs',
'eqiad' ],
+ // array( 'dc_and_realm.ext', 'dc_and_realm.ext',
'production', 'eqiad' ), // -'dc_and_realm.ext'
+'dc_and_realm-production-eqiad.ext'
# Get the filename when both realm and prod are set :)
- array( 'dc_and_realm-production-eqiad.ext',
'dc_and_realm.ext',
- 'production', 'eqiad' ),
+ [ 'dc_and_realm-production-eqiad.ext',
'dc_and_realm.ext',
+ 'production', 'eqiad' ],
# datacenter takes precedence over realm
- array( 'mc-eqiad.php', 'mc.php', 'labs', 'eqiad' ),
- array( 'mc.php', 'mc.php', 'labs', 'UNKNOWN_DC' ),
+ [ 'mc-eqiad.php', 'mc.php', 'labs', 'eqiad' ],
+ [ 'mc.php', 'mc.php', 'labs', 'UNKNOWN_DC' ],
- array( 'mc-eqiad.php', 'mc.php', 'UNKNOWN_REALM',
'eqiad' ),
+ [ 'mc-eqiad.php', 'mc.php', 'UNKNOWN_REALM', 'eqiad' ],
- array( 'mc-production.php', 'mc.php', 'production',
'UNKNOWN_DC' ),
- array( 'mc-production.php', 'mc.php', 'production',
'eqiad' ),
+ [ 'mc-production.php', 'mc.php', 'production',
'UNKNOWN_DC' ],
+ [ 'mc-production.php', 'mc.php', 'production', 'eqiad'
],
- array( 'langlist-labs', 'langlist', 'labs', 'eqiad' ),
- array( 'langlist', 'langlist', 'production', 'eqiad' ),
- );
+ [ 'langlist-labs', 'langlist', 'labs', 'eqiad' ],
+ [ 'langlist', 'langlist', 'production', 'eqiad' ],
+ ];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/367831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I763caa650a6a34bfbd81dda20d8333e671720892
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
