wikimedia / mediawiki

includes/user/BotPassword.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	/**
 	 * Get a database connection for the bot passwords database
 	 * @param int $db Index of the connection to get, e.g. DB_MASTER or DB_SLAVE.
-	 * @return DatabaseBase
+	 * @return DBConnRef
 	 */
 	public static function getDB( $db ) {
 		global $wgBotPasswordsCluster, $wgBotPasswordsDatabase;

includes/user/User.php

Doc Comments +8 added lines, -8 removed lines

@@ -1135,7 +1135,7 @@ 
 	/**
 	 * Load user data from the session.
 	 *
-	 * @return bool True if the user is logged in, false otherwise.
+	 * @return null|boolean True if the user is logged in, false otherwise.
 	 */
 	private function loadFromSession() {
 		// Deprecated hook
@@ -2708,7 +2708,7 @@ 
 	 * resetting it if it's empty (and saving changes).
 	 *
 	 * @param string $oname The option name to retrieve the token from
-	 * @return string|bool User's current value for the option, or false if this option is disabled.
+	 * @return false|string User's current value for the option, or false if this option is disabled.
 	 * @see resetTokenFromOption()
 	 * @see getOption()
 	 * @deprecated 1.26 Applications should use the OAuth extension
@@ -2737,7 +2737,7 @@ 
 	 * *Does not* save user's preferences (similarly to setOption()).
 	 *
 	 * @param string $oname The option name to reset the token in
-	 * @return string|bool New token value, or false if this option is disabled.
+	 * @return false|string New token value, or false if this option is disabled.
 	 * @see getTokenFromOption()
 	 * @see setOption()
 	 */
@@ -2773,7 +2773,7 @@ 
 	 * new option kind is added.
 	 *
 	 * @see User::getOptionKinds
-	 * @return array Option kinds
+	 * @return string[] Option kinds
 	 */
 	public static function listOptionKinds() {
 		return array(
@@ -3889,7 +3889,7 @@ 
 
 	/**
 	 * Get whether the user is explicitly blocked from account creation.
-	 * @return bool|Block
+	 * @return Block
 	 */
 	public function isBlockedFromCreateAccount() {
 		$this->getBlockedStatus();
@@ -4410,7 +4410,7 @@ 
 	/**
 	 * Get the timestamp of account creation.
 	 *
-	 * @return string|bool|null Timestamp of account creation, false for
+	 * @return false|string Timestamp of account creation, false for
 	 *  non-existent/anonymous user accounts, or null if existing account
 	 *  but information is not in database.
 	 */
@@ -4425,7 +4425,7 @@ 
 	/**
 	 * Get the timestamp of the first edit
 	 *
-	 * @return string|bool Timestamp of first edit, or false for
+	 * @return false|string Timestamp of first edit, or false for
 	 *  non-existent/anonymous user accounts.
 	 */
 	public function getFirstEditTimestamp() {
@@ -5219,7 +5219,7 @@ 
 	/**
 	 * Return the list of user fields that should be selected to create
 	 * a new user object.
-	 * @return array
+	 * @return string[]
 	 */
 	public static function selectFields() {
 		return array(

includes/user/UserNamePrefixSearch.php

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Do a prefix search of user names and return a list of matching user names.
 	 *
-	 * @param string|User $audience The string 'public' or a user object to show the search for
+	 * @param string $audience The string 'public' or a user object to show the search for
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset How many results to offset from the beginning

includes/user/UserRightsProxy.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	 *
 	 * @param string $database
 	 * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases
-	 * @return IDatabase|null If invalid selection
+	 * @return DatabaseBase|null If invalid selection
 	 */
 	public static function getDB( $database, $ignoreInvalidDB = false ) {
 		global $wgDBname;

includes/utils/AutoloadGenerator.php

Doc Comments +4 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 	 * Updates the AutoloadClasses field at the given
 	 * filename.
 	 *
-	 * @param {string} $filename Filename of JSON
+	 * @param string $filename Filename of JSON
 	 *  extension/skin registration file
 	 */
 	protected function generateJsonAutoload( $filename ) {
@@ -157,8 +157,8 @@ 
 	/**
 	 * Generates a PHP file setting up autoload information.
 	 *
-	 * @param {string} $commandName Command name to include in comment
-	 * @param {string} $filename of PHP file to put autoload information in.
+	 * @param string $commandName Command name to include in comment
+	 * @param string $filename of PHP file to put autoload information in.
 	 */
 	protected function generatePHPAutoload( $commandName, $filename ) {
 		// No existing JSON file found; update/generate PHP file
@@ -278,6 +278,7 @@ 
 
 	/**
 	 * @var string $code PHP code (including <?php) to detect class names from
+	 * @param string $code
 	 * @return array List of FQCN detected within the tokens
 	 */
 	public function getClasses( $code ) {

includes/utils/AvroValidator.php

Doc Comments +6 added lines

@@ -171,10 +171,16 @@
 		return is_object( $datum ) ? get_class( $datum ) : gettype( $datum );
 	}
 
+	/**
+	 * @param string $expected
+	 */
 	public static function wrongType( $expected, $datum ) {
 		return "Expected $expected, but recieved " . self::typeOf( $datum );
 	}
 
+	/**
+	 * @param integer $datum
+	 */
 	public static function outOfRange( $min, $max, $datum ) {
 		return "Expected value between $min and $max, but recieved $datum";
 	}

includes/utils/BatchRowIterator.php

Doc Comments +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	}
 
 	/**
-	 * @param array $condition Query conditions suitable for use with
+	 * @param array $conditions Query conditions suitable for use with
 	 *  IDatabase::select
 	 */
 	public function addConditions( array $conditions ) {
@@ -105,7 +105,7 @@ 
 	}
 
 	/**
-	 * @param array $condition Query join conditions suitable for use
+	 * @param array $conditions Query join conditions suitable for use
 	 *  with IDatabase::select
 	 */
 	public function addJoinConditions( array $conditions ) {

includes/utils/IP.php

Doc Comments +3 added lines, -3 removed lines

@@ -299,7 +299,7 @@ 
 	 *
 	 * @param string $host
 	 * @param int $port
-	 * @param bool|int $defaultPort
+	 * @param integer $defaultPort
 	 * @return string
 	 */
 	public static function combineHostAndPort( $host, $port, $defaultPort = false ) {
@@ -402,7 +402,7 @@ 
 	 * hexadecimal string which sorts after the IPv4 addresses.
 	 *
 	 * @param string $ip Quad dotted/octet IP address.
-	 * @return string|bool False on failure
+	 * @return string|false False on failure
 	 */
 	public static function toHex( $ip ) {
 		if ( self::isIPv6( $ip ) ) {
@@ -435,7 +435,7 @@ 
 	 * Given an IPv6 address in octet notation, returns a pure hex string.
 	 *
 	 * @param string $ip Octet ipv6 IP address.
-	 * @return string|bool Pure hex (uppercase); false on failure
+	 * @return false|string Pure hex (uppercase); false on failure
 	 */
 	private static function IPv6ToRawHex( $ip ) {
 		$ip = self::sanitizeIP( $ip );

includes/utils/MWCryptRand.php

Doc Comments +2 added lines

@@ -216,6 +216,7 @@ 
 
 	/**
 	 * @see self::generate()
+	 * @param integer $bytes
 	 */
 	public function realGenerate( $bytes, $forceStrong = false ) {
 
@@ -351,6 +352,7 @@ 
 
 	/**
 	 * @see self::generateHex()
+	 * @param integer $chars
 	 */
 	public function realGenerateHex( $chars, $forceStrong = false ) {
 		// hex strings are 2x the length of raw binary so we divide the length in half