jenkins-bot has submitted this change and it was merged.
Change subject: Remove underscore from classes LCStore_*
......................................................................
Remove underscore from classes LCStore_*
iPart of program to remove underscores from class names. Checked core and
600+ extensions for occurrences. All uses are in core, and are updated in
this change.
Change-Id: I432dc249d22053728013ae7d0d56c3c398021c5e
---
M includes/AutoLoader.php
M includes/cache/LocalisationCache.php
M maintenance/doMaintenance.php
M maintenance/dumpIterator.php
M maintenance/update.php
M tests/phpunit/phpunit.php
6 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index ac6f716..6afd164 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -128,10 +128,10 @@
'IndexPager' => 'includes/Pager.php',
'Interwiki' => 'includes/interwiki/Interwiki.php',
'LCStore' => 'includes/cache/LocalisationCache.php',
- 'LCStore_Accel' => 'includes/cache/LocalisationCache.php',
- 'LCStore_CDB' => 'includes/cache/LocalisationCache.php',
- 'LCStore_DB' => 'includes/cache/LocalisationCache.php',
- 'LCStore_Null' => 'includes/cache/LocalisationCache.php',
+ 'LCStoreAccel' => 'includes/cache/LocalisationCache.php',
+ 'LCStoreCDB' => 'includes/cache/LocalisationCache.php',
+ 'LCStoreDB' => 'includes/cache/LocalisationCache.php',
+ 'LCStoreNull' => 'includes/cache/LocalisationCache.php',
'License' => 'includes/Licenses.php',
'Licenses' => 'includes/Licenses.php',
'Linker' => 'includes/Linker.php',
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index 2d017b3..3838c9b 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -195,16 +195,16 @@
switch ( $conf['store'] ) {
case 'files':
case 'file':
- $storeClass = 'LCStore_CDB';
+ $storeClass = 'LCStoreCDB';
break;
case 'db':
- $storeClass = 'LCStore_DB';
+ $storeClass = 'LCStoreDB';
break;
case 'accel':
- $storeClass = 'LCStore_Accel';
+ $storeClass = 'LCStoreAccel';
break;
case 'detect':
- $storeClass = $wgCacheDirectory ?
'LCStore_CDB' : 'LCStore_DB';
+ $storeClass = $wgCacheDirectory ?
'LCStoreCDB' : 'LCStoreDB';
break;
default:
throw new MWException(
@@ -404,7 +404,7 @@
$deps = $this->store->get( $code, 'deps' );
$keys = $this->store->get( $code, 'list' );
$preload = $this->store->get( $code, 'preload' );
- // Different keys may expire separately, at least in
LCStore_Accel
+ // Different keys may expire separately, at least in
LCStoreAccel
if ( $deps === null || $keys === null || $preload === null ) {
wfDebug( __METHOD__ . "($code): cache missing, need to
make one\n" );
@@ -901,7 +901,7 @@
# Clear out the MessageBlobStore
# HACK: If using a null (i.e. disabled) storage backend, we
# can't write to the MessageBlobStore either
- if ( !$this->store instanceof LCStore_Null ) {
+ if ( !$this->store instanceof LCStoreNull ) {
MessageBlobStore::clear();
}
@@ -966,7 +966,7 @@
* Disable the storage backend
*/
public function disableBackend() {
- $this->store = new LCStore_Null;
+ $this->store = new LCStoreNull;
$this->manualRecache = false;
}
}
@@ -1021,7 +1021,7 @@
* This will work if one of XCache, WinCache or APC cacher is configured.
* (See ObjectCache.php)
*/
-class LCStore_Accel implements LCStore {
+class LCStoreAccel implements LCStore {
var $currentLang;
var $keys;
@@ -1070,7 +1070,7 @@
* LCStore implementation which uses the standard DB functions to store data.
* This will work on any MediaWiki installation.
*/
-class LCStore_DB implements LCStore {
+class LCStoreDB implements LCStore {
var $currentLang;
var $writesDone = false;
@@ -1173,7 +1173,7 @@
*
* See Cdb.php and http://cr.yp.to/cdb.html
*/
-class LCStore_CDB implements LCStore {
+class LCStoreCDB implements LCStore {
var $readers, $writer, $currentLang, $directory;
function __construct( $conf = array() ) {
@@ -1254,7 +1254,7 @@
/**
* Null store backend, used to avoid DB errors during install
*/
-class LCStore_Null implements LCStore {
+class LCStoreNull implements LCStore {
public function get( $code, $key ) {
return null;
}
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 3bd508c..3157318 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -98,7 +98,7 @@
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
if ( $wgLocalisationCacheConf['storeClass'] === false && (
$wgLocalisationCacheConf['store'] == 'db' || (
$wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) ) {
- $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
+ $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
}
$maintenance->finalSetup();
diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php
index dd468a9..73296b7 100644
--- a/maintenance/dumpIterator.php
+++ b/maintenance/dumpIterator.php
@@ -97,7 +97,7 @@
if ( $this->getDbType() == Maintenance::DB_NONE ) {
global $wgUseDatabaseMessages,
$wgLocalisationCacheConf, $wgHooks;
$wgUseDatabaseMessages = false;
- $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
+ $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
$wgHooks['InterwikiLoadPrefix'][] =
'DumpIterator::disableInterwikis';
}
}
diff --git a/maintenance/update.php b/maintenance/update.php
index 5c93964..e39661a 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -180,7 +180,7 @@
# cache from $wgExtensionFunctions (bug 20471)
$wgLocalisationCacheConf = array(
'class' => 'LocalisationCache',
- 'storeClass' => 'LCStore_Null',
+ 'storeClass' => 'LCStoreNull',
'storeDirectory' => false,
'manualRecache' => false,
);
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 1d65e52..401b8a8 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -49,7 +49,7 @@
// Assume UTC for testing purposes
$wgLocaltimezone = 'UTC';
- $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
+ $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
// Bug 44192 Do not attempt to send a real e-mail
Hooks::clear( 'AlternateUserMailer' );
--
To view, visit https://gerrit.wikimedia.org/r/95949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I432dc249d22053728013ae7d0d56c3c398021c5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
