Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 10 insertions, 12 deletions

diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php
index 9aff2415..19fc4fef 100644
--- a/includes/filebackend/lockmanager/LockManagerGroup.php
+++ b/includes/filebackend/lockmanager/LockManagerGroup.php
@@ -29,12 +29,12 @@
  * @since 1.19
  */
 class LockManagerGroup {
-	/** @var Array (domain => LockManager) */
+	/** @var array (domain => LockManager) */
 	protected static $instances = array();
 
 	protected $domain; // string; domain (usually wiki ID)
 
-	/** @var Array of (name => ('class' => ..., 'config' => ..., 'instance' => ...)) */
+	/** @var array Array of (name => ('class' => ..., 'config' => ..., 'instance' => ...)) */
 	protected $managers = array();
 
 	/**
@@ -45,7 +45,7 @@ class LockManagerGroup {
 	}
 
 	/**
-	 * @param string $domain Domain (usually wiki ID)
+	 * @param bool|string $domain Domain (usually wiki ID). Default: false.
 	 * @return LockManagerGroup
 	 */
 	public static function singleton( $domain = false ) {
@@ -54,13 +54,12 @@ class LockManagerGroup {
 			self::$instances[$domain] = new self( $domain );
 			self::$instances[$domain]->initFromGlobals();
 		}
+
 		return self::$instances[$domain];
 	}
 
 	/**
 	 * Destroy the singleton instances
-	 *
-	 * @return void
 	 */
 	public static function destroySingletons() {
 		self::$instances = array();
@@ -68,8 +67,6 @@ class LockManagerGroup {
 
 	/**
 	 * Register lock managers from the global variables
-	 *
-	 * @return void
 	 */
 	protected function initFromGlobals() {
 		global $wgLockManagers;
@@ -80,8 +77,7 @@ class LockManagerGroup {
 	/**
 	 * Register an array of file lock manager configurations
 	 *
-	 * @param $configs Array
-	 * @return void
+	 * @param array $configs
 	 * @throws MWException
 	 */
 	protected function register( array $configs ) {
@@ -107,7 +103,7 @@ class LockManagerGroup {
 	/**
 	 * Get the lock manager object with a given name
 	 *
-	 * @param $name string
+	 * @param string $name
 	 * @return LockManager
 	 * @throws MWException
 	 */
@@ -121,14 +117,15 @@ class LockManagerGroup {
 			$config = $this->managers[$name]['config'];
 			$this->managers[$name]['instance'] = new $class( $config );
 		}
+
 		return $this->managers[$name]['instance'];
 	}
 
 	/**
 	 * Get the config array for a lock manager object with a given name
 	 *
-	 * @param $name string
-	 * @return Array
+	 * @param string $name
+	 * @return array
 	 * @throws MWException
 	 */
 	public function config( $name ) {
@@ -136,6 +133,7 @@ class LockManagerGroup {
 			throw new MWException( "No lock manager defined with the name `$name`." );
 		}
 		$class = $this->managers[$name]['class'];
+
 		return array( 'class' => $class ) + $this->managers[$name]['config'];
 	}