From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 23 Apr 2014 09:30:40 +0000 (+0200)
Subject: Fixed some @params documentation (includes/[Export.php|Import.php])
X-Git-Tag: 1.31.0-rc.0~16066^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=192a9d021c512c99261bb15526cc6981178cb44b;p=lhc%2Fweb%2Fwiklou.git

Fixed some @params documentation (includes/[Export.php|Import.php])

Swapped some "$var type" to "type $var" or added missing types
before the $var. Changed some other types to match the more common
spelling. Makes beginning of some text in captial.

Change-Id: I32ed752d23088f6203462134b2af57c6f06a4de5
---

diff --git a/includes/Export.php b/includes/Export.php
index 0ebdb7868b..7295a761af 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -97,7 +97,7 @@ class WikiExporter {
 	 * various row objects and XML output for filtering. Filters
 	 * can be chained or used as callbacks.
 	 *
-	 * @param $sink mixed
+	 * @param DumpOutput $sink
 	 */
 	public function setOutputSink( &$sink ) {
 		$this->sink =& $sink;
@@ -125,7 +125,7 @@ class WikiExporter {
 	/**
 	 * Dumps a series of page and revision records for those pages
 	 * in the database falling within the page_id range given.
-	 * @param int $start inclusive lower limit (this id is included)
+	 * @param int $start Inclusive lower limit (this id is included)
 	 * @param int $end Exclusive upper limit (this id is not included)
 	 *   If 0, no upper limit.
 	 */
@@ -140,7 +140,7 @@ class WikiExporter {
 	/**
 	 * Dumps a series of page and revision records for those pages
 	 * in the database with revisions falling within the rev_id range given.
-	 * @param int $start inclusive lower limit (this id is included)
+	 * @param int $start Inclusive lower limit (this id is included)
 	 * @param int $end Exclusive upper limit (this id is not included)
 	 *   If 0, no upper limit.
 	 */
@@ -153,7 +153,7 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $title Title
+	 * @param Title $title
 	 */
 	public function pageByTitle( $title ) {
 		$this->dumpFrom(
@@ -162,7 +162,7 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $name string
+	 * @param string $name
 	 * @throws MWException
 	 */
 	public function pageByName( $name ) {
@@ -175,7 +175,7 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $names array
+	 * @param array $names
 	 */
 	public function pagesByName( $names ) {
 		foreach ( $names as $name ) {
@@ -188,8 +188,8 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $start int
-	 * @param $end int
+	 * @param int $start
+	 * @param int $end
 	 */
 	public function logsByRange( $start, $end ) {
 		$condition = 'log_id >= ' . intval( $start );
@@ -204,7 +204,7 @@ class WikiExporter {
 	 * Not called by default (depends on $this->list_authors)
 	 * Can be set by Special:Export when not exporting whole history
 	 *
-	 * @param $cond
+	 * @param array $cond
 	 */
 	protected function do_list_authors( $cond ) {
 		wfProfileIn( __METHOD__ );
@@ -237,7 +237,7 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $cond string
+	 * @param string $cond
 	 * @throws MWException
 	 * @throws Exception
 	 */
@@ -426,7 +426,7 @@ class WikiExporter {
 	 * separate database connection not managed by LoadBalancer; some
 	 * blob storage types will make queries to pull source data.
 	 *
-	 * @param $resultset ResultWrapper
+	 * @param ResultWrapper $resultset
 	 */
 	protected function outputPageStream( $resultset ) {
 		$last = null;
@@ -461,7 +461,7 @@ class WikiExporter {
 	}
 
 	/**
-	 * @param $resultset array
+	 * @param array $resultset
 	 */
 	protected function outputLogStream( $resultset ) {
 		foreach ( $resultset as $row ) {
@@ -591,7 +591,7 @@ class XmlDumpWriter {
 	 * Opens a "<page>" section on the output stream, with data
 	 * from the given database row.
 	 *
-	 * @param $row object
+	 * @param object $row
 	 * @return string
 	 */
 	public function openPage( $row ) {
@@ -634,7 +634,7 @@ class XmlDumpWriter {
 	 * Dumps a "<revision>" section on the output stream, with
 	 * data filled in from the given database row.
 	 *
-	 * @param $row object
+	 * @param object $row
 	 * @return string
 	 * @access private
 	 */
@@ -723,7 +723,7 @@ class XmlDumpWriter {
 	 * Dumps a "<logitem>" section on the output stream, with
 	 * data filled in from the given database row.
 	 *
-	 * @param $row object
+	 * @param object $row
 	 * @return string
 	 * @access private
 	 */
@@ -767,7 +767,7 @@ class XmlDumpWriter {
 	}
 
 	/**
-	 * @param $timestamp string
+	 * @param string $timestamp
 	 * @param string $indent Default to six spaces
 	 * @return string
 	 */
@@ -777,8 +777,8 @@ class XmlDumpWriter {
 	}
 
 	/**
-	 * @param $id
-	 * @param $text string
+	 * @param int $id
+	 * @param string $text
 	 * @param string $indent Default to six spaces
 	 * @return string
 	 */
@@ -796,8 +796,8 @@ class XmlDumpWriter {
 
 	/**
 	 * Warning! This data is potentially inconsistent. :(
-	 * @param $row
-	 * @param $dumpContents bool
+	 * @param object $row
+	 * @param bool $dumpContents
 	 * @return string
 	 */
 	function writeUploads( $row, $dumpContents = false ) {
@@ -817,7 +817,7 @@ class XmlDumpWriter {
 
 	/**
 	 * @param File $file
-	 * @param $dumpContents bool
+	 * @param bool $dumpContents
 	 * @return string
 	 */
 	function writeUpload( $file, $dumpContents = false ) {
@@ -891,45 +891,45 @@ class XmlDumpWriter {
 class DumpOutput {
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeOpenStream( $string ) {
 		$this->write( $string );
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeCloseStream( $string ) {
 		$this->write( $string );
 	}
 
 	/**
-	 * @param $page
-	 * @param $string string
+	 * @param object $page
+	 * @param string $string
 	 */
 	function writeOpenPage( $page, $string ) {
 		$this->write( $string );
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeClosePage( $string ) {
 		$this->write( $string );
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeRevision( $rev, $string ) {
 		$this->write( $string );
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeLogItem( $rev, $string ) {
 		$this->write( $string );
@@ -937,7 +937,7 @@ class DumpOutput {
 
 	/**
 	 * Override to write to a different stream type.
-	 * @param $string string
+	 * @param string $string
 	 * @return bool
 	 */
 	function write( $string ) {
@@ -949,7 +949,7 @@ class DumpOutput {
 	 * 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 $newname mixed File name. May be a string or an array with one element
+	 * @param string|array $newname File name. May be a string or an array with one element
 	 */
 	function closeRenameAndReopen( $newname ) {
 	}
@@ -958,7 +958,7 @@ class DumpOutput {
 	 * 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 $newname mixed File name. May be a string or an array with one element
+	 * @param string|array $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)
 	 */
@@ -983,7 +983,7 @@ class DumpFileOutput extends DumpOutput {
 	protected $handle = false, $filename;
 
 	/**
-	 * @param $file
+	 * @param string $file
 	 */
 	function __construct( $file ) {
 		$this->handle = fopen( $file, "wt" );
@@ -991,7 +991,7 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeCloseStream( $string ) {
 		parent::writeCloseStream( $string );
@@ -1002,21 +1002,21 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function write( $string ) {
 		fputs( $this->handle, $string );
 	}
 
 	/**
-	 * @param $newname
+	 * @param string $newname
 	 */
 	function closeRenameAndReopen( $newname ) {
 		$this->closeAndRename( $newname, true );
 	}
 
 	/**
-	 * @param $newname
+	 * @param string $newname
 	 * @throws MWException
 	 */
 	function renameOrException( $newname ) {
@@ -1026,8 +1026,8 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	/**
-	 * @param $newname array
-	 * @return mixed
+	 * @param array $newname
+	 * @return string
 	 * @throws MWException
 	 */
 	function checkRenameArgCount( $newname ) {
@@ -1042,8 +1042,8 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	/**
-	 * @param $newname mixed
-	 * @param $open bool
+	 * @param string $newname
+	 * @param bool $open
 	 */
 	function closeAndRename( $newname, $open = false ) {
 		$newname = $this->checkRenameArgCount( $newname );
@@ -1078,8 +1078,8 @@ class DumpPipeOutput extends DumpFileOutput {
 	protected $procOpenResource = false;
 
 	/**
-	 * @param $command
-	 * @param $file null
+	 * @param string $command
+	 * @param string $file
 	 */
 	function __construct( $command, $file = null ) {
 		if ( !is_null( $file ) ) {
@@ -1092,7 +1092,7 @@ class DumpPipeOutput extends DumpFileOutput {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeCloseStream( $string ) {
 		parent::writeCloseStream( $string );
@@ -1103,7 +1103,7 @@ class DumpPipeOutput extends DumpFileOutput {
 	}
 
 	/**
-	 * @param $command
+	 * @param string $command
 	 */
 	function startCommand( $command ) {
 		$spec = array(
@@ -1115,15 +1115,15 @@ class DumpPipeOutput extends DumpFileOutput {
 	}
 
 	/**
-	 * @param mixed $newname
+	 * @param string $newname
 	 */
 	function closeRenameAndReopen( $newname ) {
 		$this->closeAndRename( $newname, true );
 	}
 
 	/**
-	 * @param $newname mixed
-	 * @param $open bool
+	 * @param string $newname
+	 * @param bool $open
 	 */
 	function closeAndRename( $newname, $open = false ) {
 		$newname = $this->checkRenameArgCount( $newname );
@@ -1154,7 +1154,7 @@ class DumpPipeOutput extends DumpFileOutput {
 class DumpGZipOutput extends DumpPipeOutput {
 
 	/**
-	 * @param $file string
+	 * @param string $file
 	 */
 	function __construct( $file ) {
 		parent::__construct( "gzip", $file );
@@ -1168,7 +1168,7 @@ class DumpGZipOutput extends DumpPipeOutput {
 class DumpBZip2Output extends DumpPipeOutput {
 
 	/**
-	 * @param $file string
+	 * @param string $file
 	 */
 	function __construct( $file ) {
 		parent::__construct( "bzip2", $file );
@@ -1182,7 +1182,7 @@ class DumpBZip2Output extends DumpPipeOutput {
 class Dump7ZipOutput extends DumpPipeOutput {
 
 	/**
-	 * @param $file string
+	 * @param string $file
 	 */
 	function __construct( $file ) {
 		$command = $this->setup7zCommand( $file );
@@ -1191,7 +1191,7 @@ class Dump7ZipOutput extends DumpPipeOutput {
 	}
 
 	/**
-	 * @param $file string
+	 * @param string $file
 	 * @return string
 	 */
 	function setup7zCommand( $file ) {
@@ -1203,8 +1203,8 @@ class Dump7ZipOutput extends DumpPipeOutput {
 	}
 
 	/**
-	 * @param $newname string
-	 * @param $open bool
+	 * @param string $newname
+	 * @param bool $open
 	 */
 	function closeAndRename( $newname, $open = false ) {
 		$newname = $this->checkRenameArgCount( $newname );
@@ -1241,29 +1241,29 @@ class DumpFilter {
 	protected $sendingThisPage;
 
 	/**
-	 * @param $sink DumpOutput
+	 * @param DumpOutput $sink
 	 */
 	function __construct( &$sink ) {
 		$this->sink =& $sink;
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeOpenStream( $string ) {
 		$this->sink->writeOpenStream( $string );
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeCloseStream( $string ) {
 		$this->sink->writeCloseStream( $string );
 	}
 
 	/**
-	 * @param $page
-	 * @param $string string
+	 * @param object $page
+	 * @param string $string
 	 */
 	function writeOpenPage( $page, $string ) {
 		$this->sendingThisPage = $this->pass( $page, $string );
@@ -1273,7 +1273,7 @@ class DumpFilter {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeClosePage( $string ) {
 		if ( $this->sendingThisPage ) {
@@ -1283,8 +1283,8 @@ class DumpFilter {
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeRevision( $rev, $string ) {
 		if ( $this->sendingThisPage ) {
@@ -1293,23 +1293,23 @@ class DumpFilter {
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeLogItem( $rev, $string ) {
 		$this->sink->writeRevision( $rev, $string );
 	}
 
 	/**
-	 * @param $newname string
+	 * @param string $newname
 	 */
 	function closeRenameAndReopen( $newname ) {
 		$this->sink->closeRenameAndReopen( $newname );
 	}
 
 	/**
-	 * @param $newname string
-	 * @param $open bool
+	 * @param string $newname
+	 * @param bool $open
 	 */
 	function closeAndRename( $newname, $open = false ) {
 		$this->sink->closeAndRename( $newname, $open );
@@ -1324,7 +1324,7 @@ class DumpFilter {
 
 	/**
 	 * Override for page-based filter types.
-	 * @param $page
+	 * @param object $page
 	 * @return bool
 	 */
 	function pass( $page ) {
@@ -1339,7 +1339,7 @@ class DumpFilter {
 class DumpNotalkFilter extends DumpFilter {
 
 	/**
-	 * @param $page
+	 * @param object $page
 	 * @return bool
 	 */
 	function pass( $page ) {
@@ -1356,8 +1356,8 @@ class DumpNamespaceFilter extends DumpFilter {
 	var $namespaces = array();
 
 	/**
-	 * @param $sink DumpOutput
-	 * @param $param
+	 * @param DumpOutput $sink
+	 * @param array $param
 	 * @throws MWException
 	 */
 	function __construct( &$sink, $param ) {
@@ -1403,7 +1403,7 @@ class DumpNamespaceFilter extends DumpFilter {
 	}
 
 	/**
-	 * @param $page
+	 * @param object $page
 	 * @return bool
 	 */
 	function pass( $page ) {
@@ -1420,8 +1420,8 @@ class DumpLatestFilter extends DumpFilter {
 	var $page, $pageString, $rev, $revString;
 
 	/**
-	 * @param $page
-	 * @param $string string
+	 * @param object $page
+	 * @param string $string
 	 */
 	function writeOpenPage( $page, $string ) {
 		$this->page = $page;
@@ -1429,7 +1429,7 @@ class DumpLatestFilter extends DumpFilter {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeClosePage( $string ) {
 		if ( $this->rev ) {
@@ -1444,8 +1444,8 @@ class DumpLatestFilter extends DumpFilter {
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeRevision( $rev, $string ) {
 		if ( $rev->rev_id == $this->page->page_latest ) {
@@ -1462,7 +1462,7 @@ class DumpLatestFilter extends DumpFilter {
 class DumpMultiWriter {
 
 	/**
-	 * @param $sinks
+	 * @param array $sinks
 	 */
 	function __construct( $sinks ) {
 		$this->sinks = $sinks;
@@ -1470,7 +1470,7 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeOpenStream( $string ) {
 		for ( $i = 0; $i < $this->count; $i++ ) {
@@ -1479,7 +1479,7 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $string string
+	 * @param string $string
 	 */
 	function writeCloseStream( $string ) {
 		for ( $i = 0; $i < $this->count; $i++ ) {
@@ -1488,8 +1488,8 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $page
-	 * @param $string string
+	 * @param object $page
+	 * @param string $string
 	 */
 	function writeOpenPage( $page, $string ) {
 		for ( $i = 0; $i < $this->count; $i++ ) {
@@ -1498,7 +1498,7 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $string
+	 * @param string $string
 	 */
 	function writeClosePage( $string ) {
 		for ( $i = 0; $i < $this->count; $i++ ) {
@@ -1507,8 +1507,8 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $rev
-	 * @param $string
+	 * @param object $rev
+	 * @param string $string
 	 */
 	function writeRevision( $rev, $string ) {
 		for ( $i = 0; $i < $this->count; $i++ ) {
@@ -1517,14 +1517,14 @@ class DumpMultiWriter {
 	}
 
 	/**
-	 * @param $newnames
+	 * @param array $newnames
 	 */
 	function closeRenameAndReopen( $newnames ) {
 		$this->closeAndRename( $newnames, true );
 	}
 
 	/**
-	 * @param $newnames array
+	 * @param array $newnames
 	 * @param bool $open
 	 */
 	function closeAndRename( $newnames, $open = false ) {
@@ -1547,7 +1547,7 @@ class DumpMultiWriter {
 }
 
 /**
- * @param $string string
+ * @param string $string
  * @return string
  */
 function xmlsafe( $string ) {
diff --git a/includes/Import.php b/includes/Import.php
index 6150ae194c..f6e9032a94 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -40,7 +40,7 @@ class WikiImporter {
 
 	/**
 	 * Creates an ImportXMLReader drawing from the source provided
-	 * @param $source
+	 * @param string $source
 	 */
 	function __construct( $source ) {
 		$this->reader = new XMLReader();
@@ -88,7 +88,7 @@ class WikiImporter {
 
 	/**
 	 * Set debug mode...
-	 * @param $debug bool
+	 * @param bool $debug
 	 */
 	function setDebug( $debug ) {
 		$this->mDebug = $debug;
@@ -96,7 +96,7 @@ class WikiImporter {
 
 	/**
 	 * Set 'no updates' mode. In this mode, the link tables will not be updated by the importer
-	 * @param $noupdates bool
+	 * @param bool $noupdates
 	 */
 	function setNoUpdates( $noupdates ) {
 		$this->mNoUpdates = $noupdates;
@@ -184,7 +184,7 @@ class WikiImporter {
 
 	/**
 	 * Set a target namespace to override the defaults
-	 * @param $namespace
+	 * @param null|int $namespace
 	 * @return bool
 	 */
 	public function setTargetNamespace( $namespace ) {
@@ -201,8 +201,8 @@ class WikiImporter {
 
 	/**
 	 * Set a target root page under which all pages are imported
-	 * @param $rootpage
-	 * @return status object
+	 * @param null|string $rootpage
+	 * @return Status
 	 */
 	public function setTargetRootPage( $rootpage ) {
 		$status = Status::newGood();
@@ -233,14 +233,14 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $dir
+	 * @param string $dir
 	 */
 	public function setImageBasePath( $dir ) {
 		$this->mImageBasePath = $dir;
 	}
 
 	/**
-	 * @param $import
+	 * @param bool $import
 	 */
 	public function setImportUploads( $import ) {
 		$this->mImportUploads = $import;
@@ -248,7 +248,7 @@ class WikiImporter {
 
 	/**
 	 * Default per-revision callback, performs the import.
-	 * @param $revision WikiRevision
+	 * @param WikiRevision $revision
 	 * @return bool
 	 */
 	public function importRevision( $revision ) {
@@ -278,7 +278,7 @@ class WikiImporter {
 
 	/**
 	 * Default per-revision callback, performs the import.
-	 * @param $rev WikiRevision
+	 * @param WikiRevision $rev
 	 * @return bool
 	 */
 	public function importLogItem( $rev ) {
@@ -288,7 +288,7 @@ class WikiImporter {
 
 	/**
 	 * Dummy for now...
-	 * @param $revision
+	 * @param WikiRevision $revision
 	 * @return bool
 	 */
 	public function importUpload( $revision ) {
@@ -298,11 +298,11 @@ class WikiImporter {
 
 	/**
 	 * Mostly for hook use
-	 * @param $title
-	 * @param $origTitle
-	 * @param $revCount
-	 * @param $sRevCount
-	 * @param $pageInfo
+	 * @param Title $title
+	 * @param string $origTitle
+	 * @param int $revCount
+	 * @param int $sRevCount
+	 * @param array $pageInfo
 	 * @return
 	 */
 	public function finishImportPage( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) {
@@ -312,7 +312,7 @@ class WikiImporter {
 
 	/**
 	 * Alternate per-revision callback, for debugging.
-	 * @param $revision WikiRevision
+	 * @param WikiRevision $revision
 	 */
 	public function debugRevisionHandler( &$revision ) {
 		$this->debug( "Got revision:" );
@@ -329,7 +329,7 @@ class WikiImporter {
 
 	/**
 	 * Notify the callback function when a new "<page>" is reached.
-	 * @param $title Title
+	 * @param Title $title
 	 */
 	function pageCallback( $title ) {
 		if ( isset( $this->mPageCallback ) ) {
@@ -339,11 +339,11 @@ class WikiImporter {
 
 	/**
 	 * Notify the callback function when a "</page>" is closed.
-	 * @param $title Title
-	 * @param $origTitle Title
-	 * @param $revCount Integer
-	 * @param int $sucCount number of revisions for which callback returned true
-	 * @param array $pageInfo associative array of page information
+	 * @param Title $title
+	 * @param Title $origTitle
+	 * @param int $revCount
+	 * @param int $sucCount Number of revisions for which callback returned true
+	 * @param array $pageInfo Associative array of page information
 	 */
 	private function pageOutCallback( $title, $origTitle, $revCount, $sucCount, $pageInfo ) {
 		if ( isset( $this->mPageOutCallback ) ) {
@@ -354,7 +354,7 @@ class WikiImporter {
 
 	/**
 	 * Notify the callback function of a revision
-	 * @param $revision WikiRevision object
+	 * @param WikiRevision $revision
 	 * @return bool|mixed
 	 */
 	private function revisionCallback( $revision ) {
@@ -368,7 +368,7 @@ class WikiImporter {
 
 	/**
 	 * Notify the callback function of a new log item
-	 * @param $revision WikiRevision object
+	 * @param WikiRevision $revision
 	 * @return bool|mixed
 	 */
 	private function logItemCallback( $revision ) {
@@ -551,7 +551,7 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $logInfo
+	 * @param array $logInfo
 	 * @return bool|mixed
 	 */
 	private function processLogItem( $logInfo ) {
@@ -634,7 +634,7 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $pageInfo array
+	 * @param array $pageInfo
 	 */
 	private function handleRevision( &$pageInfo ) {
 		$this->debug( "Enter revision handler" );
@@ -673,8 +673,8 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $pageInfo
-	 * @param $revisionInfo
+	 * @param array $pageInfo
+	 * @param array $revisionInfo
 	 * @return bool|mixed
 	 */
 	private function processRevision( $pageInfo, $revisionInfo ) {
@@ -719,7 +719,7 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $pageInfo
+	 * @param array $pageInfo
 	 * @return mixed
 	 */
 	private function handleUpload( &$pageInfo ) {
@@ -774,7 +774,7 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $contents
+	 * @param string $contents
 	 * @return string
 	 */
 	private function dumpTemp( $contents ) {
@@ -784,8 +784,8 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $pageInfo
-	 * @param $uploadInfo
+	 * @param array $pageInfo
+	 * @param array $uploadInfo
 	 * @return mixed
 	 */
 	private function processUpload( $pageInfo, $uploadInfo ) {
@@ -846,8 +846,8 @@ class WikiImporter {
 	}
 
 	/**
-	 * @param $text string
-	 * @return Array or false
+	 * @param string $text
+	 * @return array|bool
 	 */
 	private function processTitle( $text ) {
 		global $wgCommandLineMode;
@@ -900,7 +900,7 @@ class UploadSourceAdapter {
 	private $mPosition;
 
 	/**
-	 * @param $source
+	 * @param string $source
 	 * @return string
 	 */
 	static function registerSource( $source ) {
@@ -912,10 +912,10 @@ class UploadSourceAdapter {
 	}
 
 	/**
-	 * @param $path
-	 * @param $mode
-	 * @param $options
-	 * @param $opened_path
+	 * @param string $path
+	 * @param string $mode
+	 * @param array $options
+	 * @param string $opened_path
 	 * @return bool
 	 */
 	function stream_open( $path, $mode, $options, &$opened_path ) {
@@ -932,7 +932,7 @@ class UploadSourceAdapter {
 	}
 
 	/**
-	 * @param $count
+	 * @param int $count
 	 * @return string
 	 */
 	function stream_read( $count ) {
@@ -961,7 +961,7 @@ class UploadSourceAdapter {
 	}
 
 	/**
-	 * @param $data
+	 * @param string $data
 	 * @return bool
 	 */
 	function stream_write( $data ) {
@@ -1062,7 +1062,7 @@ class WikiRevision {
 	private $mNoUpdates = false;
 
 	/**
-	 * @param $title
+	 * @param Title $title
 	 * @throws MWException
 	 */
 	function setTitle( $title ) {
@@ -1076,14 +1076,14 @@ class WikiRevision {
 	}
 
 	/**
-	 * @param $id
+	 * @param int $id
 	 */
 	function setID( $id ) {
 		$this->id = $id;
 	}
 
 	/**
-	 * @param $ts
+	 * @param string $ts
 	 */
 	function setTimestamp( $ts ) {
 		# 2003-08-05T18:30:02Z
@@ -1091,64 +1091,64 @@ class WikiRevision {
 	}
 
 	/**
-	 * @param $user
+	 * @param string $user
 	 */
 	function setUsername( $user ) {
 		$this->user_text = $user;
 	}
 
 	/**
-	 * @param $ip
+	 * @param string $ip
 	 */
 	function setUserIP( $ip ) {
 		$this->user_text = $ip;
 	}
 
 	/**
-	 * @param $model
+	 * @param string $model
 	 */
 	function setModel( $model ) {
 		$this->model = $model;
 	}
 
 	/**
-	 * @param $format
+	 * @param string $format
 	 */
 	function setFormat( $format ) {
 		$this->format = $format;
 	}
 
 	/**
-	 * @param $text
+	 * @param string $text
 	 */
 	function setText( $text ) {
 		$this->text = $text;
 	}
 
 	/**
-	 * @param $text
+	 * @param string $text
 	 */
 	function setComment( $text ) {
 		$this->comment = $text;
 	}
 
 	/**
-	 * @param $minor
+	 * @param bool $minor
 	 */
 	function setMinor( $minor ) {
 		$this->minor = (bool)$minor;
 	}
 
 	/**
-	 * @param $src
+	 * @param mixed $src
 	 */
 	function setSrc( $src ) {
 		$this->src = $src;
 	}
 
 	/**
-	 * @param $src
-	 * @param $isTemp
+	 * @param string $src
+	 * @param bool $isTemp
 	 */
 	function setFileSrc( $src, $isTemp ) {
 		$this->fileSrc = $src;
@@ -1156,56 +1156,56 @@ class WikiRevision {
 	}
 
 	/**
-	 * @param $sha1base36
+	 * @param string $sha1base36
 	 */
 	function setSha1Base36( $sha1base36 ) {
 		$this->sha1base36 = $sha1base36;
 	}
 
 	/**
-	 * @param $filename
+	 * @param string $filename
 	 */
 	function setFilename( $filename ) {
 		$this->filename = $filename;
 	}
 
 	/**
-	 * @param $archiveName
+	 * @param string $archiveName
 	 */
 	function setArchiveName( $archiveName ) {
 		$this->archiveName = $archiveName;
 	}
 
 	/**
-	 * @param $size
+	 * @param int $size
 	 */
 	function setSize( $size ) {
 		$this->size = intval( $size );
 	}
 
 	/**
-	 * @param $type
+	 * @param string $type
 	 */
 	function setType( $type ) {
 		$this->type = $type;
 	}
 
 	/**
-	 * @param $action
+	 * @param string $action
 	 */
 	function setAction( $action ) {
 		$this->action = $action;
 	}
 
 	/**
-	 * @param $params
+	 * @param array $params
 	 */
 	function setParams( $params ) {
 		$this->params = $params;
 	}
 
 	/**
-	 * @param $noupdates
+	 * @param bool $noupdates
 	 */
 	public function setNoUpdates( $noupdates ) {
 		$this->mNoUpdates = $noupdates;
@@ -1268,7 +1268,7 @@ class WikiRevision {
 	}
 
 	/**
-	 * @return String
+	 * @return string
 	 */
 	function getModel() {
 		if ( is_null( $this->model ) ) {
@@ -1279,7 +1279,7 @@ class WikiRevision {
 	}
 
 	/**
-	 * @return String
+	 * @return string
 	 */
 	function getFormat() {
 		if ( is_null( $this->model ) ) {
@@ -1311,7 +1311,7 @@ class WikiRevision {
 	}
 
 	/**
-	 * @return bool|String
+	 * @return bool|string
 	 */
 	function getSha1() {
 		if ( $this->sha1base36 ) {
@@ -1648,7 +1648,7 @@ class ImportStreamSource {
 	}
 
 	/**
-	 * @param $filename string
+	 * @param string $filename
 	 * @return Status
 	 */
 	static function newFromFile( $filename ) {
@@ -1662,7 +1662,7 @@ class ImportStreamSource {
 	}
 
 	/**
-	 * @param $fieldname string
+	 * @param string $fieldname
 	 * @return Status
 	 */
 	static function newFromUpload( $fieldname = "xmlimport" ) {
@@ -1694,8 +1694,8 @@ class ImportStreamSource {
 	}
 
 	/**
-	 * @param $url
-	 * @param $method string
+	 * @param string $url
+	 * @param string $method
 	 * @return Status
 	 */
 	static function newFromURL( $url, $method = 'GET' ) {
@@ -1717,11 +1717,11 @@ class ImportStreamSource {
 	}
 
 	/**
-	 * @param $interwiki
-	 * @param $page
-	 * @param $history bool
-	 * @param $templates bool
-	 * @param $pageLinkDepth int
+	 * @param string $interwiki
+	 * @param string $page
+	 * @param bool $history
+	 * @param bool $templates
+	 * @param int $pageLinkDepth
 	 * @return Status
 	 */
 	public static function newFromInterwiki( $interwiki, $page, $history = false, $templates = false, $pageLinkDepth = 0 ) {