From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 16 Jul 2012 17:56:00 +0000 (+0200)
Subject: [Database] mark some methods as explicitly public
X-Git-Tag: 1.31.0-rc.0~23028^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=a021ffc9cecff9a0dcadde4ea78345df6469ca8c;p=lhc%2Fweb%2Fwiklou.git

[Database] mark some methods as explicitly public

Change-Id: I95fca6d346ae812c22b88b577477be02b5a0676b
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index a3faebf974..cc4ffafe0a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -271,7 +271,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool|null previous value of the flag
 	 */
-	function debug( $debug = null ) {
+	public function debug( $debug = null ) {
 		return wfSetBit( $this->mFlags, DBO_DEBUG, $debug );
 	}
 
@@ -297,7 +297,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return null|bool The previous value of the flag
 	 */
-	function bufferResults( $buffer = null ) {
+	public function bufferResults( $buffer = null ) {
 		if ( is_null( $buffer ) ) {
 			return !(bool)( $this->mFlags & DBO_NOBUFFER );
 		} else {
@@ -316,7 +316,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool The previous value of the flag.
 	 */
-	function ignoreErrors( $ignoreErrors = null ) {
+	public function ignoreErrors( $ignoreErrors = null ) {
 		return wfSetBit( $this->mFlags, DBO_IGNORE, $ignoreErrors );
 	}
 
@@ -329,7 +329,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $level int An integer (0 or 1), or omitted to leave it unchanged.
 	 * @return int The previous value
 	 */
-	function trxLevel( $level = null ) {
+	public function trxLevel( $level = null ) {
 		return wfSetVar( $this->mTrxLevel, $level );
 	}
 
@@ -338,7 +338,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $count int The count to set, or omitted to leave it unchanged.
 	 * @return int The error count
 	 */
-	function errorCount( $count = null ) {
+	public function errorCount( $count = null ) {
 		return wfSetVar( $this->mErrorCount, $count );
 	}
 
@@ -347,7 +347,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $prefix string The table prefix to set, or omitted to leave it unchanged.
 	 * @return string The previous table prefix.
 	 */
-	function tablePrefix( $prefix = null ) {
+	public function tablePrefix( $prefix = null ) {
 		return wfSetVar( $this->mTablePrefix, $prefix );
 	}
 
@@ -360,7 +360,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return LoadBalancer|null
 	 */
-	function getLBInfo( $name = null ) {
+	public function getLBInfo( $name = null ) {
 		if ( is_null( $name ) ) {
 			return $this->mLBInfo;
 		} else {
@@ -380,7 +380,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $name
 	 * @param $value
 	 */
-	function setLBInfo( $name, $value = null ) {
+	public function setLBInfo( $name, $value = null ) {
 		if ( is_null( $value ) ) {
 			$this->mLBInfo = $name;
 		} else {
@@ -393,7 +393,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $lag int
 	 */
-	function setFakeSlaveLag( $lag ) {
+	public function setFakeSlaveLag( $lag ) {
 		$this->mFakeSlaveLag = $lag;
 	}
 
@@ -402,7 +402,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $enabled bool
 	 */
-	function setFakeMaster( $enabled = true ) {
+	public function setFakeMaster( $enabled = true ) {
 		$this->mFakeMaster = $enabled;
 	}
 
@@ -411,7 +411,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function cascadingDeletes() {
+	public function cascadingDeletes() {
 		return false;
 	}
 
@@ -420,7 +420,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function cleanupTriggers() {
+	public function cleanupTriggers() {
 		return false;
 	}
 
@@ -430,7 +430,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function strictIPs() {
+	public function strictIPs() {
 		return false;
 	}
 
@@ -439,7 +439,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	*/
-	function realTimestamps() {
+	public function realTimestamps() {
 		return false;
 	}
 
@@ -448,7 +448,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function implicitGroupby() {
+	public function implicitGroupby() {
 		return true;
 	}
 
@@ -458,7 +458,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function implicitOrderby() {
+	public function implicitOrderby() {
 		return true;
 	}
 
@@ -478,7 +478,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function searchableIPs() {
+	public function searchableIPs() {
 		return false;
 	}
 
@@ -487,7 +487,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function functionalIndexes() {
+	public function functionalIndexes() {
 		return false;
 	}
 
@@ -495,7 +495,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * Return the last query that went through DatabaseBase::query()
 	 * @return String
 	 */
-	function lastQuery() {
+	public function lastQuery() {
 		return $this->mLastQuery;
 	}
 
@@ -505,7 +505,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function doneWrites() {
+	public function doneWrites() {
 		return $this->mDoneWrites;
 	}
 
@@ -513,7 +513,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * Is a connection to the database open?
 	 * @return Boolean
 	 */
-	function isOpen() {
+	public function isOpen() {
 		return $this->mOpened;
 	}
 
@@ -529,7 +529,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *       and removes it in command line mode
 	 *   - DBO_PERSISTENT: use persistant database connection
 	 */
-	function setFlag( $flag ) {
+	public function setFlag( $flag ) {
 		global $wgDebugDBTransactions;
 		$this->mFlags |= $flag;
 		if ( ( $flag & DBO_TRX) & $wgDebugDBTransactions ) {
@@ -542,7 +542,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $flag: same as setFlag()'s $flag param
 	 */
-	function clearFlag( $flag ) {
+	public function clearFlag( $flag ) {
 		global $wgDebugDBTransactions;
 		$this->mFlags &= ~$flag;
 		if ( ( $flag & DBO_TRX ) && $wgDebugDBTransactions ) {
@@ -556,7 +556,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $flag: same as setFlag()'s $flag param
 	 * @return Boolean
 	 */
-	function getFlag( $flag ) {
+	public function getFlag( $flag ) {
 		return !!( $this->mFlags & $flag );
 	}
 
@@ -567,14 +567,14 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function getProperty( $name ) {
+	public function getProperty( $name ) {
 		return $this->$name;
 	}
 
 	/**
 	 * @return string
 	 */
-	function getWikiID() {
+	public function getWikiID() {
 		if ( $this->mTablePrefix ) {
 			return "{$this->mDBname}-{$this->mTablePrefix}";
 		} else {
@@ -811,7 +811,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function isWriteQuery( $sql ) {
+	public function isWriteQuery( $sql ) {
 		return !preg_match( '/^(?:SELECT|BEGIN|ROLLBACK|COMMIT|SET|SHOW|EXPLAIN|\(SELECT)\b/i', $sql );
 	}
 
@@ -957,7 +957,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $fname String
 	 * @param $tempIgnore Boolean
 	 */
-	function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
+	public function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
 		# Ignore errors during error handling to avoid infinite recursion
 		$ignore = $this->ignoreErrors( true );
 		++$this->mErrorCount;
@@ -1013,7 +1013,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return ResultWrapper
 	 */
-	function execute( $prepared, $args = null ) {
+	public function execute( $prepared, $args = null ) {
 		if ( !is_array( $args ) ) {
 			# Pull the var args
 			$args = func_get_args();
@@ -1060,7 +1060,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $args Array of arguments to fill it with
 	 * @return string executable SQL
 	 */
-	function fillPrepared( $preparedQuery, $args ) {
+	public function fillPrepared( $preparedQuery, $args ) {
 		reset( $args );
 		$this->preparedArgs =& $args;
 
@@ -1147,7 +1147,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool|mixed The value from the field, or false on failure.
 	 */
-	function selectField( $table, $var, $cond = '', $fname = 'DatabaseBase::selectField',
+	public function selectField( $table, $var, $cond = '', $fname = 'DatabaseBase::selectField',
 		$options = array() )
 	{
 		if ( !is_array( $options ) ) {
@@ -1180,7 +1180,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return Array
 	 * @see DatabaseBase::select()
 	 */
-	function makeSelectOptions( $options ) {
+	public function makeSelectOptions( $options ) {
 		$preLimitTail = $postLimitTail = '';
 		$startOpts = '';
 
@@ -1405,7 +1405,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *   DBQueryError exception will be thrown, except if the "ignore errors"
 	 *   option was set, in which case false will be returned.
 	 */
-	function select( $table, $vars, $conds = '', $fname = 'DatabaseBase::select',
+	public function select( $table, $vars, $conds = '', $fname = 'DatabaseBase::select',
 		$options = array(), $join_conds = array() ) {
 		$sql = $this->selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds );
 
@@ -1426,7 +1426,9 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return string SQL query string.
 	 * @see DatabaseBase::select()
 	 */
-	function selectSQLText( $table, $vars, $conds = '', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) {
+	public function selectSQLText( $table, $vars, $conds = '', $fname = 'DatabaseBase::select',
+		$options = array(), $join_conds = array() )
+	{
 		if ( is_array( $vars ) ) {
 			$vars = implode( ',', $vars );
 		}
@@ -1491,7 +1493,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return object|bool
 	 */
-	function selectRow( $table, $vars, $conds, $fname = 'DatabaseBase::selectRow',
+	public function selectRow( $table, $vars, $conds, $fname = 'DatabaseBase::selectRow',
 		$options = array(), $join_conds = array() )
 	{
 		$options = (array)$options;
@@ -1581,7 +1583,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $fname String: calling function name (optional)
 	 * @return Boolean: whether $table has filed $field
 	 */
-	function fieldExists( $table, $field, $fname = 'DatabaseBase::fieldExists' ) {
+	public function fieldExists( $table, $field, $fname = 'DatabaseBase::fieldExists' ) {
 		$info = $this->fieldInfo( $table, $field );
 
 		return (bool)$info;
@@ -1598,7 +1600,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool|null
 	 */
-	function indexExists( $table, $index, $fname = 'DatabaseBase::indexExists' ) {
+	public function indexExists( $table, $index, $fname = 'DatabaseBase::indexExists' ) {
 		$info = $this->indexInfo( $table, $index, $fname );
 		if ( is_null( $info ) ) {
 			return null;
@@ -1615,7 +1617,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function tableExists( $table, $fname = __METHOD__ ) {
+	public function tableExists( $table, $fname = __METHOD__ ) {
 		$table = $this->tableName( $table );
 		$old = $this->ignoreErrors( true );
 		$res = $this->query( "SELECT 1 FROM $table LIMIT 1", $fname );
@@ -1630,7 +1632,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $index
 	 * @return string
 	 */
-	function fieldType( $res, $index ) {
+	public function fieldType( $res, $index ) {
 		if ( $res instanceof ResultWrapper ) {
 			$res = $res->result;
 		}
@@ -1646,7 +1648,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function indexUnique( $table, $index ) {
+	public function indexUnique( $table, $index ) {
 		$indexInfo = $this->indexInfo( $table, $index );
 
 		if ( !$indexInfo ) {
@@ -1699,7 +1701,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function insert( $table, $a, $fname = 'DatabaseBase::insert', $options = array() ) {
+	public function insert( $table, $a, $fname = 'DatabaseBase::insert', $options = array() ) {
 		# No rows to insert, easy just return now
 		if ( !count( $a ) ) {
 			return true;
@@ -1813,7 +1815,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function makeList( $a, $mode = LIST_COMMA ) {
+	public function makeList( $a, $mode = LIST_COMMA ) {
 		if ( !is_array( $a ) ) {
 			throw new DBUnexpectedError( $this, 'DatabaseBase::makeList called with incorrect parameters' );
 		}
@@ -1878,7 +1880,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $subKey String: field name to match the sub-level keys to (eg 'pl_title')
 	 * @return Mixed: string SQL fragment, or false if no items in array.
 	 */
-	function makeWhereFrom2d( $data, $baseKey, $subKey ) {
+	public function makeWhereFrom2d( $data, $baseKey, $subKey ) {
 		$conds = array();
 
 		foreach ( $data as $base => $sub ) {
@@ -1905,7 +1907,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $field
 	 * @return string
 	 */
-	function bitNot( $field ) {
+	public function bitNot( $field ) {
 		return "(~$field)";
 	}
 
@@ -1914,7 +1916,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $fieldRight
 	 * @return string
 	 */
-	function bitAnd( $fieldLeft, $fieldRight ) {
+	public function bitAnd( $fieldLeft, $fieldRight ) {
 		return "($fieldLeft & $fieldRight)";
 	}
 
@@ -1923,7 +1925,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param  $fieldRight
 	 * @return string
 	 */
-	function bitOr( $fieldLeft, $fieldRight ) {
+	public function bitOr( $fieldLeft, $fieldRight ) {
 		return "($fieldLeft | $fieldRight)";
 	}
 
@@ -1936,7 +1938,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool Success or failure
 	 */
-	function selectDB( $db ) {
+	public function selectDB( $db ) {
 		# Stub.  Shouldn't cause serious problems if it's not overridden, but
 		# if your database engine supports a concept similar to MySQL's
 		# databases you may as well.
@@ -1947,14 +1949,14 @@ abstract class DatabaseBase implements DatabaseType {
 	/**
 	 * Get the current DB name
 	 */
-	function getDBname() {
+	public function getDBname() {
 		return $this->mDBname;
 	}
 
 	/**
 	 * Get the server hostname or IP address
 	 */
-	function getServer() {
+	public function getServer() {
 		return $this->mServer;
 	}
 
@@ -1975,7 +1977,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *   raw - Do not add identifier quotes to the table name
 	 * @return String: full database name
 	 */
-	function tableName( $name, $format = 'quoted' ) {
+	public function tableName( $name, $format = 'quoted' ) {
 		global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
 		# Skip the entire process when we have a string quoted on both ends.
 		# Note that we check the end so that we will still quote any use of
@@ -2209,7 +2211,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function addQuotes( $s ) {
+	public function addQuotes( $s ) {
 		if ( $s === null ) {
 			return 'NULL';
 		} else {
@@ -2301,7 +2303,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @since 1.16
 	 * @return String: fully built LIKE statement
 	 */
-	function buildLike() {
+	public function buildLike() {
 		$params = func_get_args();
 
 		if ( count( $params ) > 0 && is_array( $params[0] ) ) {
@@ -2326,7 +2328,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return LikeMatch
 	 */
-	function anyChar() {
+	public function anyChar() {
 		return new LikeMatch( '_' );
 	}
 
@@ -2335,7 +2337,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return LikeMatch
 	 */
-	function anyString() {
+	public function anyString() {
 		return new LikeMatch( '%' );
 	}
 
@@ -2350,7 +2352,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $seqName string
 	 * @return null
 	 */
-	function nextSequenceValue( $seqName ) {
+	public function nextSequenceValue( $seqName ) {
 		return null;
 	}
 
@@ -2364,7 +2366,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $index
 	 * @return string
 	 */
-	function useIndexClause( $index ) {
+	public function useIndexClause( $index ) {
 		return '';
 	}
 
@@ -2390,7 +2392,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *    a field name or an array of field names
 	 * @param $fname String: Calling function name (use __METHOD__) for logs/profiling
 	 */
-	function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseBase::replace' ) {
+	public function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseBase::replace' ) {
 		$quotedTable = $this->tableName( $table );
 
 		if ( count( $rows ) == 0 ) {
@@ -2491,7 +2493,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $fname      String: Calling function name (use __METHOD__) for
 	 *                    logs/profiling
 	 */
-	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds,
+	public function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds,
 		$fname = 'DatabaseBase::deleteJoin' )
 	{
 		if ( !$conds ) {
@@ -2518,7 +2520,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return int
 	 */
-	function textFieldSize( $table, $field ) {
+	public function textFieldSize( $table, $field ) {
 		$table = $this->tableName( $table );
 		$sql = "SHOW COLUMNS FROM $table LIKE \"$field\";";
 		$res = $this->query( $sql, 'DatabaseBase::textFieldSize' );
@@ -2543,7 +2545,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return string Returns the text of the low priority option if it is
 	 *   supported, or a blank string otherwise
 	 */
-	function lowPriorityOption() {
+	public function lowPriorityOption() {
 		return '';
 	}
 
@@ -2557,7 +2559,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function delete( $table, $conds, $fname = 'DatabaseBase::delete' ) {
+	public function delete( $table, $conds, $fname = 'DatabaseBase::delete' ) {
 		if ( !$conds ) {
 			throw new DBUnexpectedError( $this, 'DatabaseBase::delete() called with no conditions' );
 		}
@@ -2598,7 +2600,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return ResultWrapper
 	 */
-	function insertSelect( $destTable, $srcTable, $varMap, $conds,
+	public function insertSelect( $destTable, $srcTable, $varMap, $conds,
 		$fname = 'DatabaseBase::insertSelect',
 		$insertOptions = array(), $selectOptions = array() )
 	{
@@ -2656,7 +2658,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function limitResult( $sql, $limit, $offset = false ) {
+	public function limitResult( $sql, $limit, $offset = false ) {
 		if ( !is_numeric( $limit ) ) {
 			throw new DBUnexpectedError( $this, "Invalid non-numeric limit passed to limitResult()\n" );
 		}
@@ -2680,7 +2682,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * within the UNION construct.
 	 * @return Boolean
 	 */
-	function unionSupportsOrderAndLimit() {
+	public function unionSupportsOrderAndLimit() {
 		return true; // True for almost every DB supported
 	}
 
@@ -2692,7 +2694,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $all Boolean: use UNION ALL
 	 * @return String: SQL fragment
 	 */
-	function unionQueries( $sqls, $all ) {
+	public function unionQueries( $sqls, $all ) {
 		$glue = $all ? ') UNION ALL (' : ') UNION (';
 		return '(' . implode( $glue, $sqls ) . ')';
 	}
@@ -2706,7 +2708,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $falseVal String: SQL expression to return if false
 	 * @return String: SQL fragment
 	 */
-	function conditional( $cond, $trueVal, $falseVal ) {
+	public function conditional( $cond, $trueVal, $falseVal ) {
 		return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
 	}
 
@@ -2720,7 +2722,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function strreplace( $orig, $old, $new ) {
+	public function strreplace( $orig, $old, $new ) {
 		return "REPLACE({$orig}, {$old}, {$new})";
 	}
 
@@ -2730,7 +2732,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return int
 	 */
-	function getServerUptime() {
+	public function getServerUptime() {
 		return 0;
 	}
 
@@ -2740,7 +2742,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function wasDeadlock() {
+	public function wasDeadlock() {
 		return false;
 	}
 
@@ -2750,7 +2752,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function wasLockTimeout() {
+	public function wasLockTimeout() {
 		return false;
 	}
 
@@ -2761,7 +2763,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function wasErrorReissuable() {
+	public function wasErrorReissuable() {
 		return false;
 	}
 
@@ -2771,7 +2773,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function wasReadOnlyError() {
+	public function wasReadOnlyError() {
 		return false;
 	}
 
@@ -2793,8 +2795,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool
 	 */
-	function deadlockLoop() {
-
+	public function deadlockLoop() {
 		$this->begin( __METHOD__ );
 		$args = func_get_args();
 		$function = array_shift( $args );
@@ -2846,7 +2847,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *   greater than zero if we waited for some period of time, less than
 	 *   zero if we timed out.
 	 */
-	function masterPosWait( DBMasterPos $pos, $timeout ) {
+	public function masterPosWait( DBMasterPos $pos, $timeout ) {
 		wfProfileIn( __METHOD__ );
 
 		if ( !is_null( $this->mFakeSlaveLag ) ) {
@@ -2879,7 +2880,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return DBMasterPos, or false if this is not a slave.
 	 */
-	function getSlavePos() {
+	public function getSlavePos() {
 		if ( !is_null( $this->mFakeSlaveLag ) ) {
 			$pos = new MySQLMasterPos( 'fake', microtime( true ) - $this->mFakeSlaveLag );
 			wfDebug( __METHOD__ . ": fake slave pos = $pos\n" );
@@ -2895,7 +2896,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return DBMasterPos, or false if this is not a master
 	 */
-	function getMasterPos() {
+	public function getMasterPos() {
 		if ( $this->mFakeMaster ) {
 			return new MySQLMasterPos( 'fake', microtime( true ) );
 		} else {
@@ -2908,7 +2909,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $fname string
 	 */
-	function begin( $fname = 'DatabaseBase::begin' ) {
+	public function begin( $fname = 'DatabaseBase::begin' ) {
 		$this->query( 'BEGIN', $fname );
 		$this->mTrxLevel = 1;
 	}
@@ -2918,7 +2919,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $fname string
 	 */
-	function commit( $fname = 'DatabaseBase::commit' ) {
+	public function commit( $fname = 'DatabaseBase::commit' ) {
 		if ( $this->mTrxLevel ) {
 			$this->query( 'COMMIT', $fname );
 			$this->mTrxLevel = 0;
@@ -2931,7 +2932,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $fname string
 	 */
-	function rollback( $fname = 'DatabaseBase::rollback' ) {
+	public function rollback( $fname = 'DatabaseBase::rollback' ) {
 		if ( $this->mTrxLevel ) {
 			$this->query( 'ROLLBACK', $fname, true );
 			$this->mTrxLevel = 0;
@@ -2952,7 +2953,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $fname String: calling function name
 	 * @return Boolean: true if operation was successful
 	 */
-	function duplicateTableStructure( $oldName, $newName, $temporary = false,
+	public function duplicateTableStructure( $oldName, $newName, $temporary = false,
 		$fname = 'DatabaseBase::duplicateTableStructure' )
 	{
 		throw new MWException(
@@ -2980,7 +2981,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function timestamp( $ts = 0 ) {
+	public function timestamp( $ts = 0 ) {
 		return wfTimestamp( TS_MW, $ts );
 	}
 
@@ -2997,7 +2998,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return string
 	 */
-	function timestampOrNull( $ts = null ) {
+	public function timestampOrNull( $ts = null ) {
 		if ( is_null( $ts ) ) {
 			return null;
 		} else {
@@ -3020,7 +3021,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool|ResultWrapper
 	 */
-	function resultObject( $result ) {
+	public function resultObject( $result ) {
 		if ( empty( $result ) ) {
 			return false;
 		} elseif ( $result instanceof ResultWrapper ) {
@@ -3050,7 +3051,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return bool Success or failure
 	 */
-	function ping() {
+	public function ping() {
 		# Stub.  Not essential to override.
 		return true;
 	}
@@ -3064,7 +3065,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @return int Database replication lag in seconds
 	 */
-	function getLag() {
+	public function getLag() {
 		return intval( $this->mFakeSlaveLag );
 	}
 
@@ -3085,7 +3086,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $b string
 	 * @return string
 	 */
-	function encodeBlob( $b ) {
+	public function encodeBlob( $b ) {
 		return $b;
 	}
 
@@ -3096,7 +3097,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @param $b string
 	 * @return string
 	 */
-	function decodeBlob( $b ) {
+	public function decodeBlob( $b ) {
 		return $b;
 	}
 
@@ -3137,7 +3138,9 @@ abstract class DatabaseBase implements DatabaseType {
 	 *      generated dynamically using $filename
 	 * @return bool|string
 	 */
-	function sourceFile( $filename, $lineCallback = false, $resultCallback = false, $fname = false ) {
+	public function sourceFile(
+		$filename, $lineCallback = false, $resultCallback = false, $fname = false
+	) {
 		wfSuppressWarnings();
 		$fp = fopen( $filename, 'r' );
 		wfRestoreWarnings();
@@ -3189,7 +3192,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $vars bool|array mapping variable name to value.
 	 */
-	function setSchemaVars( $vars ) {
+	public function setSchemaVars( $vars ) {
 		$this->mSchemaVars = $vars;
 	}
 
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 8ce6e70a45..e1b3a9a839 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -810,7 +810,7 @@ class DatabaseOracle extends DatabaseBase {
 	/**
 	 * Return aggregated value function call
 	 */
-	function aggregateValue ( $valuedata, $valuename = 'value' ) {
+	public function aggregateValue( $valuedata, $valuename = 'value' ) {
 		return $valuedata;
 	}
 
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 763ca52099..2b7521f21f 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1037,7 +1037,7 @@ __INDEXATTR__;
 	/**
 	 * Return aggregated value function call
 	 */
-	function aggregateValue( $valuedata, $valuename = 'value' ) {
+	public function aggregateValue( $valuedata, $valuename = 'value' ) {
 		return $valuedata;
 	}