From f36b73e96c6bb178314122666ef8fcb3a270c24b Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 24 Oct 2015 14:54:10 -0700 Subject: [PATCH] Move some memcached classes to /libs Also removed a few MW dependencies from MemcachedPeclBagOStuff. It still uses an IP class method, so it has to stay for now. Change-Id: I8c5c83046c58fb58091d6ce11b2385208262460f --- autoload.php | 8 ++++---- includes/{ => libs}/objectcache/MemcachedBagOStuff.php | 0 includes/{ => libs}/objectcache/MemcachedClient.php | 0 .../{ => libs}/objectcache/MemcachedPhpBagOStuff.php | 2 +- includes/objectcache/MemcachedPeclBagOStuff.php | 10 +++++++--- 5 files changed, 12 insertions(+), 8 deletions(-) rename includes/{ => libs}/objectcache/MemcachedBagOStuff.php (100%) rename includes/{ => libs}/objectcache/MemcachedClient.php (100%) rename includes/{ => libs}/objectcache/MemcachedPhpBagOStuff.php (97%) diff --git a/autoload.php b/autoload.php index b32824d5c7..9b5e10f868 100644 --- a/autoload.php +++ b/autoload.php @@ -720,7 +720,7 @@ $wgAutoloadLocalClasses = array( 'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php', 'MWHookException' => __DIR__ . '/includes/Hooks.php', 'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php', - 'MWMemcached' => __DIR__ . '/includes/objectcache/MemcachedClient.php', + 'MWMemcached' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php', 'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php', 'MWNamespace' => __DIR__ . '/includes/MWNamespace.php', 'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php', @@ -778,11 +778,11 @@ $wgAutoloadLocalClasses = array( 'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php', 'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php', 'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php', - 'MemCachedClientforWiki' => __DIR__ . '/includes/objectcache/MemcachedClient.php', + 'MemCachedClientforWiki' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php', 'MemcLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MemcLockManager.php', - 'MemcachedBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedBagOStuff.php', + 'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php', 'MemcachedPeclBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPeclBagOStuff.php', - 'MemcachedPhpBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPhpBagOStuff.php', + 'MemcachedPhpBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPhpBagOStuff.php', 'MemoizedCallable' => __DIR__ . '/includes/libs/MemoizedCallable.php', 'MemoryFileBackend' => __DIR__ . '/includes/filebackend/MemoryFileBackend.php', 'MergeHistoryPager' => __DIR__ . '/includes/specials/SpecialMergeHistory.php', diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/libs/objectcache/MemcachedBagOStuff.php similarity index 100% rename from includes/objectcache/MemcachedBagOStuff.php rename to includes/libs/objectcache/MemcachedBagOStuff.php diff --git a/includes/objectcache/MemcachedClient.php b/includes/libs/objectcache/MemcachedClient.php similarity index 100% rename from includes/objectcache/MemcachedClient.php rename to includes/libs/objectcache/MemcachedClient.php diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/libs/objectcache/MemcachedPhpBagOStuff.php similarity index 97% rename from includes/objectcache/MemcachedPhpBagOStuff.php rename to includes/libs/objectcache/MemcachedPhpBagOStuff.php index 6f0ba58820..bbb09fe717 100644 --- a/includes/objectcache/MemcachedPhpBagOStuff.php +++ b/includes/libs/objectcache/MemcachedPhpBagOStuff.php @@ -45,7 +45,7 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff { parent::__construct( $params ); $params = $this->applyDefaultParams( $params ); - $this->client = new MemCachedClientforWiki( $params ); + $this->client = new MWMemcached( $params ); $this->client->set_servers( $params['servers'] ); $this->client->set_debug( $params['debug'] ); } diff --git a/includes/objectcache/MemcachedPeclBagOStuff.php b/includes/objectcache/MemcachedPeclBagOStuff.php index e6df9007bf..b7d1eaf045 100644 --- a/includes/objectcache/MemcachedPeclBagOStuff.php +++ b/includes/objectcache/MemcachedPeclBagOStuff.php @@ -100,13 +100,17 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff { break; case 'igbinary': if ( !Memcached::HAVE_IGBINARY ) { - throw new MWException( __CLASS__ . ': the igbinary extension is not available ' . - 'but igbinary serialization was requested.' ); + throw new InvalidArgumentException( + __CLASS__ . ': the igbinary extension is not available ' . + 'but igbinary serialization was requested.' + ); } $this->client->setOption( Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_IGBINARY ); break; default: - throw new MWException( __CLASS__ . ': invalid value for serializer parameter' ); + throw new InvalidArgumentException( + __CLASS__ . ': invalid value for serializer parameter' + ); } $servers = array(); foreach ( $params['servers'] as $host ) { -- 2.20.1