From 73208791845927d192c919686412f7a61a08dead Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 30 Nov 2010 19:06:28 +0000
Subject: [PATCH] Few braces and spaces

Fixing up documentation
---
 includes/CategoryPage.php     | 6 ++++--
 includes/GlobalFunctions.php  | 2 +-
 includes/PageQueryPage.php    | 7 ++++---
 includes/User.php             | 4 ++--
 includes/db/Database.php      | 2 +-
 includes/memcached-client.php | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 42e6ff4c74..682dda3360 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -23,11 +23,13 @@ class CategoryPage extends Article {
 		$diff = $wgRequest->getVal( 'diff' );
 		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
 
-		if ( isset( $diff ) && $diffOnly )
+		if ( isset( $diff ) && $diffOnly ) {
 			return parent::view();
+		}
 
-		if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) )
+		if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) {
 			return;
+		}
 
 		if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
 			$this->openShowCategory();
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 43c8932aa6..9dbfde1f36 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3206,7 +3206,7 @@ function wfFindFile( $title, $options = array() ) {
 /**
  * Get an object referring to a locally registered file.
  * Returns a valid placeholder object if the file does not exist.
- * @param $title Either a string or Title object
+ * @param $title Title|String
  * @return File, or null if passed an invalid Title
  */
 function wfLocalFile( $title ) {
diff --git a/includes/PageQueryPage.php b/includes/PageQueryPage.php
index a2091e8b46..892ff259f3 100644
--- a/includes/PageQueryPage.php
+++ b/includes/PageQueryPage.php
@@ -18,8 +18,9 @@ class PageQueryPage extends QueryPage {
 		global $wgContLang;
 		$title = Title::makeTitleSafe( $row->namespace, $row->title );
 		$text = $row->title;
-		if ($title instanceof Title)
-			$text = $wgContLang->convert( $title->getPrefixedText() ); 
-		return $skin->link( $title, htmlspecialchars($text), array(), array(), array('known', 'noclasses') );
+		if ( $title instanceof Title ) {
+			$text = $wgContLang->convert( $title->getPrefixedText() );
+		}
+		return $skin->link( $title, htmlspecialchars( $text ), array(), array(), array('known', 'noclasses') );
 	}
 }
diff --git a/includes/User.php b/includes/User.php
index 7e77986157..bd56fc1606 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3207,7 +3207,7 @@ class User {
 	 * Return the set of defined explicit groups.
 	 * The implicit groups (by default *, 'user' and 'autoconfirmed')
 	 * are not included, as they are defined automatically, not in the database.
-	 * @return \type{\arrayof{\string}} Array of internal group names
+	 * @return Array of internal group names
 	 */
 	static function getAllGroups() {
 		global $wgGroupPermissions, $wgRevokePermissions;
@@ -3219,7 +3219,7 @@ class User {
 
 	/**
 	 * Get a list of all available permissions.
-	 * @return \type{\arrayof{\string}} Array of permission names
+	 * @return Array of permission names
 	 */
 	static function getAllRights() {
 		if ( self::$mAllRights === false ) {
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8f19635032..3ff4145ec7 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -604,7 +604,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *     comment (you can use __METHOD__ or add some extra info)
 	 * @param  $tempIgnore Boolean:   Whether to avoid throwing an exception on errors...
 	 *     maybe best to catch the exception instead?
-	 * @return true for a successful write query, ResultWrapper object for a successful read query,
+	 * @return boolean|ResultWrapper true for a successful write query, ResultWrapper object for a successful read query,
 	 *     or false on failure if $tempIgnore set
 	 * @throws DBQueryError Thrown when the database returns an error of any kind
 	 */
diff --git a/includes/memcached-client.php b/includes/memcached-client.php
index a23fd9c51d..53f0324f7e 100644
--- a/includes/memcached-client.php
+++ b/includes/memcached-client.php
@@ -240,7 +240,7 @@ class MWMemcached {
 	/**
 	 * Memcache initializer
 	 *
-	 * @param $args Associative array of settings
+	 * @param $args Array Associative array of settings
 	 *
 	 * @return  mixed
 	 */
-- 
2.20.1