wikimedia / mediawiki

includes/export/DumpOutput.php

Doc Comments +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 	/**
 	 * Override to write to a different stream type.
 	 * @param string $string
-	 * @return bool
+	 * @return boolean|null
 	 */
 	function write( $string ) {
 		print $string;
@@ -87,7 +87,7 @@ 
 	 * and reopen new file with the old name. Use this
 	 * for writing out a file in multiple pieces
 	 * at specified checkpoints (e.g. every n hours).
-	 * @param string|array $newname File name. May be a string or an array with one element
+	 * @param string $newname File name. May be a string or an array with one element
 	 */
 	function closeRenameAndReopen( $newname ) {
 	}
@@ -96,7 +96,7 @@ 
 	 * Close the old file, and move it to a specified name.
 	 * Use this for the last piece of a file written out
 	 * at specified checkpoints (e.g. every n hours).
-	 * @param string|array $newname File name. May be a string or an array with one element
+	 * @param string $newname File name. May be a string or an array with one element
 	 * @param bool $open If true, a new file with the old filename will be opened
 	 *   again for writing (default: false)
 	 */

includes/export/WikiExporter.php

Doc Comments +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
 	 * Not called by default (depends on $this->list_authors)
 	 * Can be set by Special:Export when not exporting whole history
 	 *
-	 * @param array $cond
+	 * @param string $cond
 	 */
 	protected function do_list_authors( $cond ) {
 		$this->author_list = "<contributors>";

includes/Fallback.php

Doc Comments +3 added lines, -3 removed lines

@@ -131,7 +131,7 @@ 
 	 * Fallback implementation of mb_strpos, hardcoded to UTF-8.
 	 * @param string $haystack
 	 * @param string $needle
-	 * @param string $offset Optional start position
+	 * @param integer $offset Optional start position
 	 * @param string $encoding Optional encoding; ignored
 	 * @return int
 	 */
@@ -152,9 +152,9 @@ 
 	 * Fallback implementation of mb_strrpos, hardcoded to UTF-8.
 	 * @param string $haystack
 	 * @param string $needle
-	 * @param string $offset Optional start position
+	 * @param integer $offset Optional start position
 	 * @param string $encoding Optional encoding; ignored
-	 * @return int
+	 * @return string|false
 	 */
 	public static function mb_strrpos( $haystack, $needle, $offset = 0, $encoding = '' ) {
 		$needle = preg_quote( $needle, '/' );

includes/FauxRequest.php

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param array $data Array of *non*-urlencoded key => value pairs, the
 	 *   fake GET/POST values
 	 * @param bool $wasPosted Whether to treat the data as POST
-	 * @param MediaWiki\\Session\\Session|array|null $session Session, session
+	 * @param MediaWiki\Session\Session $session Session, session
 	 *  data array, or null
 	 * @param string $protocol 'http' or 'https'
 	 * @throws MWException
@@ -126,7 +126,6 @@ 
 
 	/**
 	 * @since 1.26
-	 * @param string $name Unprefixed name of the cookie to set
 	 * @param string|null $value Value of the cookie to set
 	 * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix
 	 */
@@ -152,6 +151,7 @@ 
 
 	/**
 	 * @since 1.25
+	 * @param string $url
 	 */
 	public function setRequestURL( $url ) {
 		$this->requestUrl = $url;

includes/filebackend/FileBackend.php

Doc Comments +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
 	/**
 	 * Get an explanatory message if this backend is read-only
 	 *
-	 * @return string|bool Returns false if the backend is not read-only
+	 * @return string|false Returns false if the backend is not read-only
 	 */
 	final public function getReadOnlyReason() {
 		return ( $this->readOnly != '' ) ? $this->readOnly : false;
@@ -1392,7 +1392,7 @@ 
 	 * "mwstore://backend/container/...", or null if there is no parent.
 	 *
 	 * @param string $storagePath
-	 * @return string|null
+	 * @return string
 	 */
 	final public static function parentStoragePath( $storagePath ) {
 		$storagePath = dirname( $storagePath );

includes/filebackend/FileBackendStore.php

Doc Comments +4 added lines, -4 removed lines

@@ -753,7 +753,7 @@ 
 	/**
 	 * @see FileBackendStore::getFileSha1Base36()
 	 * @param array $params
-	 * @return bool|string
+	 * @return false|string
 	 */
 	protected function doGetFileSha1Base36( array $params ) {
 		$fsFile = $this->getLocalReference( $params );
@@ -1190,7 +1190,7 @@ 
 	 * @param FileBackendStoreOpHandle[] $fileOpHandles
 	 *
 	 * @throws FileBackendError
-	 * @return array Map of Status objects
+	 * @return Status[] Map of Status objects
 	 */
 	final public function executeOpHandlesInternal( array $fileOpHandles ) {
 		$ps = Profiler::instance()->scopedProfileIn( __METHOD__ . "-{$this->name}" );
@@ -1578,7 +1578,7 @@ 
 	 * Subclasses can override this to be more restrictive.
 	 *
 	 * @param string $container
-	 * @return string|null
+	 * @return string
 	 */
 	protected function resolveContainerName( $container ) {
 		return $container;
@@ -1592,7 +1592,7 @@ 
 	 *
 	 * @param string $container Container name
 	 * @param string $relStoragePath Storage path relative to the container
-	 * @return string|null Path or null if not valid
+	 * @return string Path or null if not valid
 	 */
 	protected function resolveContainerPath( $container, $relStoragePath ) {
 		return $relStoragePath;

includes/filebackend/filejournal/FileJournal.php

Doc Comments +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
 
 	/**
 	 * @see FileJournal::doGetCurrentPosition()
-	 * @return int|bool
+	 * @return boolean
 	 */
 	protected function doGetCurrentPosition() {
 		return false;
@@ -225,7 +225,7 @@ 
 	/**
 	 * @see FileJournal::doGetPositionAtTime()
 	 * @param int|string $time Timestamp
-	 * @return int|bool
+	 * @return boolean
 	 */
 	protected function doGetPositionAtTime( $time ) {
 		return false;

includes/filebackend/FileOp.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	 * Get the value of the parameter with the given name
 	 *
 	 * @param string $name
-	 * @return mixed Returns null if the parameter is not set
+	 * @return string Returns null if the parameter is not set
 	 */
 	final public function getParam( $name ) {
 		return isset( $this->params[$name] ) ? $this->params[$name] : null;

includes/filebackend/FSFile.php

Doc Comments +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * Get the file size in bytes
 	 *
-	 * @return int|bool
+	 * @return integer
 	 */
 	public function getSize() {
 		return filesize( $this->path );
@@ -72,7 +72,7 @@ 
 	/**
 	 * Get the file's last-modified timestamp
 	 *
-	 * @return string|bool TS_MW timestamp or false on failure
+	 * @return string|false TS_MW timestamp or false on failure
 	 */
 	public function getTimestamp() {
 		MediaWiki\suppressWarnings();
@@ -195,7 +195,7 @@ 
 	 * fairly neatly.
 	 *
 	 * @param bool $recache
-	 * @return bool|string False on failure
+	 * @return string|false False on failure
 	 */
 	public function getSha1Base36( $recache = false ) {
 
@@ -248,7 +248,7 @@ 
 	 * fairly neatly.
 	 *
 	 * @param string $path
-	 * @return bool|string False on failure
+	 * @return string|false False on failure
 	 */
 	public static function getSha1Base36FromPath( $path ) {
 		$fsFile = new self( $path );