From a611ebf1ff364477699e105f9d46943030e56ef5 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 17 Jan 2015 14:48:00 -0800 Subject: [PATCH] Changed FileBackend exceptions to subclass Exception Change-Id: Ic7d4d6cf0dde3e93ef78758b1a6b03f78c9bcdba --- includes/filebackend/FileBackend.php | 2 +- includes/filebackend/filejournal/FileJournal.php | 4 ++-- .../filebackend/lockmanager/LockManagerGroup.php | 16 ++++++++-------- .../filebackend/lockmanager/MemcLockManager.php | 4 ++-- .../filebackend/lockmanager/RedisLockManager.php | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php index 8c0a61a1e6..95041125ce 100644 --- a/includes/filebackend/FileBackend.php +++ b/includes/filebackend/FileBackend.php @@ -1491,7 +1491,7 @@ abstract class FileBackend { * @ingroup FileBackend * @since 1.23 */ -class FileBackendException extends MWException { +class FileBackendException extends Exception { } /** diff --git a/includes/filebackend/filejournal/FileJournal.php b/includes/filebackend/filejournal/FileJournal.php index c06514858f..4ee5222007 100644 --- a/includes/filebackend/filejournal/FileJournal.php +++ b/includes/filebackend/filejournal/FileJournal.php @@ -57,14 +57,14 @@ abstract class FileJournal { * * @param array $config * @param string $backend A registered file backend name - * @throws MWException + * @throws Exception * @return FileJournal */ final public static function factory( array $config, $backend ) { $class = $config['class']; $jrn = new $class( $config ); if ( !$jrn instanceof self ) { - throw new MWException( "Class given is not an instance of FileJournal." ); + throw new Exception( "Class given is not an instance of FileJournal." ); } $jrn->backend = $backend; diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php index 19fc4fef43..c72863eda3 100644 --- a/includes/filebackend/lockmanager/LockManagerGroup.php +++ b/includes/filebackend/lockmanager/LockManagerGroup.php @@ -78,17 +78,17 @@ class LockManagerGroup { * Register an array of file lock manager configurations * * @param array $configs - * @throws MWException + * @throws Exception */ protected function register( array $configs ) { foreach ( $configs as $config ) { $config['domain'] = $this->domain; if ( !isset( $config['name'] ) ) { - throw new MWException( "Cannot register a lock manager with no name." ); + throw new Exception( "Cannot register a lock manager with no name." ); } $name = $config['name']; if ( !isset( $config['class'] ) ) { - throw new MWException( "Cannot register lock manager `{$name}` with no class." ); + throw new Exception( "Cannot register lock manager `{$name}` with no class." ); } $class = $config['class']; unset( $config['class'] ); // lock manager won't need this @@ -105,11 +105,11 @@ class LockManagerGroup { * * @param string $name * @return LockManager - * @throws MWException + * @throws Exception */ public function get( $name ) { if ( !isset( $this->managers[$name] ) ) { - throw new MWException( "No lock manager defined with the name `$name`." ); + throw new Exception( "No lock manager defined with the name `$name`." ); } // Lazy-load the actual lock manager instance if ( !isset( $this->managers[$name]['instance'] ) ) { @@ -126,11 +126,11 @@ class LockManagerGroup { * * @param string $name * @return array - * @throws MWException + * @throws Exception */ public function config( $name ) { if ( !isset( $this->managers[$name] ) ) { - throw new MWException( "No lock manager defined with the name `$name`." ); + throw new Exception( "No lock manager defined with the name `$name`." ); } $class = $this->managers[$name]['class']; @@ -155,7 +155,7 @@ class LockManagerGroup { * Throws an exception if no lock manager could be found. * * @return LockManager - * @throws MWException + * @throws Exception */ public function getAny() { return isset( $this->managers['default'] ) diff --git a/includes/filebackend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php index 16d3de1528..24d96e024b 100644 --- a/includes/filebackend/lockmanager/MemcLockManager.php +++ b/includes/filebackend/lockmanager/MemcLockManager.php @@ -61,7 +61,7 @@ class MemcLockManager extends QuorumLockManager { * each having an odd-numbered list of server names (peers) as values. * - memcConfig : Configuration array for ObjectCache::newFromParams. [optional] * If set, this must use one of the memcached classes. - * @throws MWException + * @throws Exception */ public function __construct( array $config ) { parent::__construct( $config ); @@ -80,7 +80,7 @@ class MemcLockManager extends QuorumLockManager { if ( $cache instanceof MemcachedBagOStuff ) { $this->bagOStuffs[$name] = $cache; } else { - throw new MWException( + throw new Exception( 'Only MemcachedBagOStuff classes are supported by MemcLockManager.' ); } } diff --git a/includes/filebackend/lockmanager/RedisLockManager.php b/includes/filebackend/lockmanager/RedisLockManager.php index 90e058177d..90e62e6907 100644 --- a/includes/filebackend/lockmanager/RedisLockManager.php +++ b/includes/filebackend/lockmanager/RedisLockManager.php @@ -62,7 +62,7 @@ class RedisLockManager extends QuorumLockManager { * - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0, * each having an odd-numbered list of server names (peers) as values. * - redisConfig : Configuration for RedisConnectionPool::__construct(). - * @throws MWException + * @throws Exception */ public function __construct( array $config ) { parent::__construct( $config ); -- 2.20.1