wikimedia / mediawiki

includes/filerepo/file/ForeignAPIFile.php

Doc Comments +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
 	protected $repoClass = 'ForeignApiRepo';
 
 	/**
-	 * @param Title|string|bool $title
+	 * @param Title|null $title
 	 * @param ForeignApiRepo $repo
 	 * @param array $info
 	 * @param bool $exists
@@ -151,7 +151,7 @@ 
 
 	/**
 	 * @param int $page
-	 * @return int|number
+	 * @return integer
 	 */
 	public function getWidth( $page = 1 ) {
 		return isset( $this->mInfo['width'] ) ? intval( $this->mInfo['width'] ) : 0;
@@ -166,7 +166,7 @@ 
 	}
 
 	/**
-	 * @return bool|null|string
+	 * @return string|null
 	 */
 	public function getMetadata() {
 		if ( isset( $this->mInfo['metadata'] ) ) {
@@ -205,7 +205,7 @@ 
 	}
 
 	/**
-	 * @return bool|int|null
+	 * @return integer|null
 	 */
 	public function getSize() {
 		return isset( $this->mInfo['size'] ) ? intval( $this->mInfo['size'] ) : null;
@@ -268,7 +268,7 @@ 
 	}
 
 	/**
-	 * @return bool|string
+	 * @return string|false
 	 */
 	function getTimestamp() {
 		return wfTimestamp( TS_MW,

includes/filerepo/file/LocalFile.php

Doc Comments +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
 
 	/**
 	 * Fields in the image table
-	 * @return array
+	 * @return string[]
 	 */
 	static function selectFields() {
 		return array(
@@ -1112,7 +1112,7 @@ 
 	 * @param string $comment Upload description
 	 * @param string $pageText Text to use for the new description page,
 	 *   if a new description page is created
-	 * @param int|bool $flags Flags for publish()
+	 * @param integer $flags Flags for publish()
 	 * @param array|bool $props File properties, if known. This can be used to
 	 *   reduce the upload time when uploading virtual URLs for which the file
 	 *   info is already known
@@ -1786,7 +1786,7 @@ 
 	 * it skips the parser cache.
 	 *
 	 * @param Language $lang What language to get description in (Optional)
-	 * @return bool|mixed
+	 * @return false|string
 	 */
 	function getDescriptionText( $lang = null ) {
 		$revision = Revision::newFromTitle( $this->title, false, Revision::READ_NORMAL );
@@ -1821,7 +1821,7 @@ 
 	}
 
 	/**
-	 * @return bool|string
+	 * @return string
 	 */
 	function getTimestamp() {
 		$this->load();
@@ -1830,7 +1830,7 @@ 
 	}
 
 	/**
-	 * @return bool|string
+	 * @return string|false
 	 */
 	public function getDescriptionTouched() {
 		// The DB lookup might return false, e.g. if the file was just deleted, or the shared DB repo

includes/filerepo/file/OldLocalFile.php

Doc Comments +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 
 	/**
 	 * Fields in the oldimage table
-	 * @return array
+	 * @return string[]
 	 */
 	static function selectFields() {
 		return array(
@@ -232,7 +232,7 @@ 
 
 	/**
 	 * @param string $prefix
-	 * @return array
+	 * @return string[]
 	 */
 	function getCacheFields( $prefix = 'img_' ) {
 		$fields = parent::getCacheFields( $prefix );

includes/filerepo/file/UnregisteredLocalFile.php

Doc Comments +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
 	}
 
 	/**
-	 * @return bool
+	 * @return boolean|string
 	 */
 	function getMetadata() {
 		if ( !isset( $this->metadata ) ) {
@@ -193,7 +193,7 @@ 
 	}
 
 	/**
-	 * @return bool|string
+	 * @return string|false
 	 */
 	function getURL() {
 		if ( $this->repo ) {

includes/filerepo/FileRepo.php

Doc Comments +4 added lines, -4 removed lines

@@ -220,7 +220,7 @@ 
 	 * Get an explanatory message if this repo is read-only.
 	 * This checks if an administrator disabled writes to the backend.
 	 *
-	 * @return string|bool Returns false if the repo is not read-only
+	 * @return string|false Returns false if the repo is not read-only
 	 */
 	public function getReadOnlyReason() {
 		return $this->backend->getReadOnlyReason();
@@ -716,7 +716,7 @@ 
 	 *
 	 * @param string $query Query string to append
 	 * @param string $entry Entry point; defaults to index
-	 * @return string|bool False on failure
+	 * @return string|false False on failure
 	 */
 	public function makeUrl( $query = '', $entry = 'index' ) {
 		if ( isset( $this->scriptDirUrl ) ) {
@@ -797,7 +797,7 @@ 
 	/**
 	 * Get the URL of the stylesheet to apply to description pages
 	 *
-	 * @return string|bool False on failure
+	 * @return string|false False on failure
 	 */
 	public function getDescriptionStylesheetUrl() {
 		if ( isset( $this->scriptDirUrl ) ) {
@@ -958,7 +958,7 @@ 
 	 *
 	 * @param string $src Source file system path, storage path, or virtual URL
 	 * @param string $dst Virtual URL or storage path
-	 * @param array|string|null $options An array consisting of a key named headers
+	 * @param string $options An array consisting of a key named headers
 	 *   listing extra headers. If a string, taken as content-disposition header.
 	 *   (Support for array of options new in 1.23)
 	 * @return FileRepoStatus

includes/filerepo/ForeignAPIRepo.php

Doc Comments +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
 	}
 
 	/**
-	 * @param array $data
+	 * @param string $data
 	 * @return bool|array
 	 */
 	function getImageInfo( $data ) {
@@ -546,7 +546,7 @@ 
 	 * @param string $target Used in cache key creation, mostly
 	 * @param array $query The query parameters for the API request
 	 * @param int $cacheTTL Time to live for the memcached caching
-	 * @return null
+	 * @return string
 	 */
 	public function httpGetCached( $target, $query, $cacheTTL = 3600 ) {
 		if ( $this->mApiBase ) {

includes/filerepo/ForeignDBViaLBRepo.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 * Get a key on the primary cache for this repository.
 	 * Returns false if the repository's cache is not accessible at this site.
 	 * The parameters are the parts of the key, as for wfMemcKey().
-	 * @return bool|string
+	 * @return string|false
 	 */
 	function getSharedCacheKey( /*...*/ ) {
 		if ( $this->hasSharedCache() ) {

includes/filerepo/RepoGroup.php

Doc Comments +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 	 * Search repositories for an image.
 	 * You can also use wfFindFile() to do this.
 	 *
-	 * @param Title|string $title Title object or string
+	 * @param string $title Title object or string
 	 * @param array $options Associative array of options:
 	 *   time:           requested time for an archived image, or false for the
 	 *                   current version. An image object will be returned which was
@@ -315,7 +315,7 @@ 
 	/**
 	 * Get the repo instance with a given key.
 	 * @param string|int $index
-	 * @return bool|LocalRepo
+	 * @return string
 	 */
 	function getRepo( $index ) {
 		if ( !$this->reposInitialised ) {

includes/ForkController.php

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
 	 */
 	const RESTART_ON_ERROR = 1;
 
+	/**
+	 * @param integer $numProcs
+	 */
 	public function __construct( $numProcs, $flags = 0 ) {
 		if ( PHP_SAPI != 'cli' ) {
 			throw new MWException( "ForkController cannot be used from the web." );