From 1e3888de006861f7c4b8b6396f95d1dbb2eb14a5 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 25 Feb 2015 00:22:50 -0800 Subject: [PATCH] Start moving objectcache into libs/ The base BagOStuff class and some of the implementations are not dependent on MediaWiki and can be in the libs folder. Change-Id: I299f9abb778abc65a70461a2aff3015c02a1f04d --- autoload.php | 12 ++++++------ includes/{ => libs}/objectcache/APCBagOStuff.php | 0 includes/{ => libs}/objectcache/BagOStuff.php | 2 +- includes/{ => libs}/objectcache/EmptyBagOStuff.php | 0 includes/{ => libs}/objectcache/HashBagOStuff.php | 0 .../{ => libs}/objectcache/WinCacheBagOStuff.php | 0 includes/{ => libs}/objectcache/XCacheBagOStuff.php | 0 includes/objectcache/MultiWriteBagOStuff.php | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename includes/{ => libs}/objectcache/APCBagOStuff.php (100%) rename includes/{ => libs}/objectcache/BagOStuff.php (99%) rename includes/{ => libs}/objectcache/EmptyBagOStuff.php (100%) rename includes/{ => libs}/objectcache/HashBagOStuff.php (100%) rename includes/{ => libs}/objectcache/WinCacheBagOStuff.php (100%) rename includes/{ => libs}/objectcache/XCacheBagOStuff.php (100%) diff --git a/autoload.php b/autoload.php index 705f5bda4e..a7b36a6d48 100644 --- a/autoload.php +++ b/autoload.php @@ -4,7 +4,7 @@ global $wgAutoloadLocalClasses; $wgAutoloadLocalClasses = array( - 'APCBagOStuff' => __DIR__ . '/includes/objectcache/APCBagOStuff.php', + 'APCBagOStuff' => __DIR__ . '/includes/libs/objectcache/APCBagOStuff.php', 'AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php', 'Action' => __DIR__ . '/includes/actions/Action.php', 'ActiveUsersPager' => __DIR__ . '/includes/specials/SpecialActiveusers.php', @@ -147,7 +147,7 @@ $wgAutoloadLocalClasses = array( 'BackupDumper' => __DIR__ . '/maintenance/backup.inc', 'BackupReader' => __DIR__ . '/maintenance/importDump.php', 'BadTitleError' => __DIR__ . '/includes/exception/BadTitleError.php', - 'BagOStuff' => __DIR__ . '/includes/objectcache/BagOStuff.php', + 'BagOStuff' => __DIR__ . '/includes/libs/objectcache/BagOStuff.php', 'BaseDump' => __DIR__ . '/maintenance/backupPrefetch.inc', 'BaseTemplate' => __DIR__ . '/includes/skins/BaseTemplate.php', 'BatchedQueryRunner' => __DIR__ . '/maintenance/runBatchedQuery.php', @@ -365,7 +365,7 @@ $wgAutoloadLocalClasses = array( 'EmailInvalidation' => __DIR__ . '/includes/specials/SpecialConfirmemail.php', 'EmailNotification' => __DIR__ . '/includes/mail/EmailNotification.php', 'EmaillingJob' => __DIR__ . '/includes/jobqueue/jobs/EmaillingJob.php', - 'EmptyBagOStuff' => __DIR__ . '/includes/objectcache/EmptyBagOStuff.php', + 'EmptyBagOStuff' => __DIR__ . '/includes/libs/objectcache/EmptyBagOStuff.php', 'EmptyBloomCache' => __DIR__ . '/includes/cache/bloom/BloomCache.php', 'EncryptedPassword' => __DIR__ . '/includes/password/EncryptedPassword.php', 'EnhancedChangesList' => __DIR__ . '/includes/changes/EnhancedChangesList.php', @@ -494,7 +494,7 @@ $wgAutoloadLocalClasses = array( 'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/HTMLTextAreaField.php', 'HTMLTextField' => __DIR__ . '/includes/htmlform/HTMLTextField.php', 'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php', - 'HashBagOStuff' => __DIR__ . '/includes/objectcache/HashBagOStuff.php', + 'HashBagOStuff' => __DIR__ . '/includes/libs/objectcache/HashBagOStuff.php', 'HashConfig' => __DIR__ . '/includes/config/HashConfig.php', 'HashRing' => __DIR__ . '/includes/libs/HashRing.php', 'HashtableReplacer' => __DIR__ . '/includes/libs/replacers/HashtableReplacer.php', @@ -1328,12 +1328,12 @@ $wgAutoloadLocalClasses = array( 'WikiStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php', 'WikitextContent' => __DIR__ . '/includes/content/WikitextContent.php', 'WikitextContentHandler' => __DIR__ . '/includes/content/WikitextContentHandler.php', - 'WinCacheBagOStuff' => __DIR__ . '/includes/objectcache/WinCacheBagOStuff.php', + 'WinCacheBagOStuff' => __DIR__ . '/includes/libs/objectcache/WinCacheBagOStuff.php', 'WithoutInterwikiPage' => __DIR__ . '/includes/specials/SpecialWithoutinterwiki.php', 'WordLevelDiff' => __DIR__ . '/includes/diff/DairikiDiff.php', 'WrapOldPasswords' => __DIR__ . '/maintenance/wrapOldPasswords.php', 'XCFHandler' => __DIR__ . '/includes/media/XCF.php', - 'XCacheBagOStuff' => __DIR__ . '/includes/objectcache/XCacheBagOStuff.php', + 'XCacheBagOStuff' => __DIR__ . '/includes/libs/objectcache/XCacheBagOStuff.php', 'XMLRCFeedFormatter' => __DIR__ . '/includes/rcfeed/XMLRCFeedFormatter.php', 'XMPInfo' => __DIR__ . '/includes/media/XMPInfo.php', 'XMPReader' => __DIR__ . '/includes/media/XMP.php', diff --git a/includes/objectcache/APCBagOStuff.php b/includes/libs/objectcache/APCBagOStuff.php similarity index 100% rename from includes/objectcache/APCBagOStuff.php rename to includes/libs/objectcache/APCBagOStuff.php diff --git a/includes/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php similarity index 99% rename from includes/objectcache/BagOStuff.php rename to includes/libs/objectcache/BagOStuff.php index 5f0b4e2dbf..0b791e5a0b 100644 --- a/includes/objectcache/BagOStuff.php +++ b/includes/libs/objectcache/BagOStuff.php @@ -166,7 +166,7 @@ abstract class BagOStuff implements LoggerAwareInterface { * @return bool Success */ protected function cas( $casToken, $key, $value, $exptime = 0 ) { - throw new MWException( "CAS is not implemented in " . __CLASS__ ); + throw new Exception( "CAS is not implemented in " . __CLASS__ ); } /** diff --git a/includes/objectcache/EmptyBagOStuff.php b/includes/libs/objectcache/EmptyBagOStuff.php similarity index 100% rename from includes/objectcache/EmptyBagOStuff.php rename to includes/libs/objectcache/EmptyBagOStuff.php diff --git a/includes/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php similarity index 100% rename from includes/objectcache/HashBagOStuff.php rename to includes/libs/objectcache/HashBagOStuff.php diff --git a/includes/objectcache/WinCacheBagOStuff.php b/includes/libs/objectcache/WinCacheBagOStuff.php similarity index 100% rename from includes/objectcache/WinCacheBagOStuff.php rename to includes/libs/objectcache/WinCacheBagOStuff.php diff --git a/includes/objectcache/XCacheBagOStuff.php b/includes/libs/objectcache/XCacheBagOStuff.php similarity index 100% rename from includes/objectcache/XCacheBagOStuff.php rename to includes/libs/objectcache/XCacheBagOStuff.php diff --git a/includes/objectcache/MultiWriteBagOStuff.php b/includes/objectcache/MultiWriteBagOStuff.php index 896eaf009a..be54e4d3cd 100644 --- a/includes/objectcache/MultiWriteBagOStuff.php +++ b/includes/objectcache/MultiWriteBagOStuff.php @@ -40,12 +40,12 @@ class MultiWriteBagOStuff extends BagOStuff { * the documentation of $wgObjectCaches for more detail. * * @param array $params - * @throws MWException + * @throws InvalidArgumentException */ public function __construct( $params ) { parent::__construct( $params ); if ( !isset( $params['caches'] ) ) { - throw new MWException( __METHOD__ . ': the caches parameter is required' ); + throw new InvalidArgumentException( __METHOD__ . ': the caches parameter is required' ); } $this->caches = array(); -- 2.20.1