wikimedia / mediawiki

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

includes/utils/UIDGenerator.php

Doc Comments +3 added lines, -3 removed lines

@@ -510,8 +510,8 @@ 
 	 * Wait till the current timestamp reaches $time and return the current
 	 * timestamp. This returns false if it would have to wait more than 10ms.
 	 *
-	 * @param array $time Result of UIDGenerator::millitime()
-	 * @return array|bool UIDGenerator::millitime() result or false
+	 * @param integer[] $time Result of UIDGenerator::millitime()
+	 * @return resource UIDGenerator::millitime() result or false
 	 */
 	protected function timeWaitUntil( array $time ) {
 		do {
@@ -571,7 +571,7 @@ 
 	}
 
 	/**
-	 * @return array (current time in seconds, milliseconds since then)
+	 * @return integer[] (current time in seconds, milliseconds since then)
 	 */
 	protected static function millitime() {
 		list( $msec, $sec ) = explode( ' ', microtime() );

includes/utils/ZipDirectoryReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 
 	/**
 	 * Throw an error, and log a debug message
-	 * @param mixed $code
+	 * @param string $code
 	 * @param string $debugMessage
 	 * @throws ZipDirectoryReaderError
 	 */

includes/WebResponse.php

Doc Comments +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 	 * Set the browser cookie
 	 * @param string $name The name of the cookie.
 	 * @param string $value The value to be stored in the cookie.
-	 * @param int|null $expire Unix timestamp (in seconds) when the cookie should expire.
+	 * @param integer $expire Unix timestamp (in seconds) when the cookie should expire.
 	 *        0 (the default) causes it to expire $wgCookieExpiration seconds from now.
 	 *        null causes it to be a session cookie.
 	 * @param array $options Assoc of additional cookie options:
@@ -227,7 +227,7 @@ 
 	/**
 	 * Get the HTTP response code, null if not set
 	 *
-	 * @return int|null
+	 * @return integer
 	 */
 	public function getStatusCode() {
 		return $this->code;
@@ -236,7 +236,7 @@ 
 	/**
 	 * @param string $name The name of the cookie.
 	 * @param string $value The value to be stored in the cookie.
-	 * @param int|null $expire Ignored in this faux subclass.
+	 * @param integer $expire Ignored in this faux subclass.
 	 * @param array $options Ignored in this faux subclass.
 	 */
 	public function setCookie( $name, $value, $expire = 0, $options = array() ) {