Changed FileBackend exceptions to subclass Exception

Change-Id: Ic7d4d6cf0dde3e93ef78758b1a6b03f78c9bcdba
This commit is contained in:
Aaron Schulz 2015-01-17 14:48:00 -08:00
parent 4edddd9677
commit a611ebf1ff
5 changed files with 14 additions and 14 deletions

View file

@ -1491,7 +1491,7 @@ abstract class FileBackend {
* @ingroup FileBackend
* @since 1.23
*/
class FileBackendException extends MWException {
class FileBackendException extends Exception {
}
/**

View file

@ -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;

View file

@ -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'] )

View file

@ -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.' );
}
}

View file

@ -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 );