From 9fb2b16dc08484d3ace89c3dc9c2d2cd046daa97 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 1 Sep 2010 18:10:02 +0000
Subject: [PATCH] Reduce some duplication, just implement stub in parent

---
 includes/installer/DatabaseInstaller.php | 8 ++++++--
 includes/installer/OracleInstaller.php   | 9 ---------
 includes/installer/PostgresInstaller.php | 8 --------
 includes/installer/SqliteInstaller.php   | 8 --------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index d9241e529b..986d68f279 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -80,7 +80,9 @@ abstract class DatabaseInstaller {
 	 * If the DB type has no settings beyond those already configured with 
 	 * getConnectForm(), this should return false.
 	 */
-	public abstract function getSettingsForm();
+	public function getSettingsForm() {
+		return false;
+	}
 
 	/**
 	 * Set variables based on the request array, assuming it was submitted via
@@ -88,7 +90,9 @@ abstract class DatabaseInstaller {
 	 * 
 	 * @return Status
 	 */
-	public abstract function submitSettingsForm();
+	public function submitSettingsForm() {
+		return Status::newGood();
+	}
 
 	/**
 	 * Connect to the database using the administrative user/password currently
diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index f6057f57a5..789ccfffbe 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -88,15 +88,6 @@ class OracleInstaller extends DatabaseInstaller {
 		return $status;
 	}
 
-
-	public function getSettingsForm() {
-		// TODO
-	}
-	
-	public function submitSettingsForm() {
-		// TODO
-	}
-
 	public function getConnection() {
 		// TODO
 	}
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index c5af5bbe93..8e9fdb4661 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -112,14 +112,6 @@ class PostgresInstaller extends DatabaseInstaller {
 		return $status;
 	}
 
-	function getSettingsForm() {
-		return false;
-	}
-
-	function submitSettingsForm() {
-		return Status::newGood();
-	}
-
 	function setupDatabase() {
 	}
 
diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index e4b7526330..68fc6e36c8 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -122,14 +122,6 @@ class SqliteInstaller extends DatabaseInstaller {
 		return parent::needsUpgrade();
 	}
 
-	public function getSettingsForm() {
-		return false;
-	}
-
-	public function submitSettingsForm() {
-		return Status::newGood();
-	}
-
 	public function setupDatabase() {
 		$dir = $this->getVar( 'wgSQLiteDataDir' );
 
-- 
2.20.1